squash all

Author: Tamir

.changelog/30294.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_ami_ids: Add optional `include_deprecated` argument.
+```

internal/service/ec2/ec2_ami_ids_data_source.go

@@ -58,6 +58,11 @@ func DataSourceAMIIDs() *schema.Resource {
 				Default:  false,
 				Optional: true,
 			},
+			"include_deprecated": {
+				Type:     schema.TypeBool,
+				Default:  false,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -67,7 +72,8 @@ func dataSourceAMIIDsRead(ctx context.Context, d *schema.ResourceData, meta inte
 	conn := meta.(*conns.AWSClient).EC2Conn()
 
 	input := &ec2.DescribeImagesInput{
-		Owners: flex.ExpandStringList(d.Get("owners").([]interface{})),
+		Owners:            flex.ExpandStringList(d.Get("owners").([]interface{})),
+		IncludeDeprecated: aws.Bool(d.Get("include_deprecated").(bool)),
 	}
 
 	if v, ok := d.GetOk("executable_users"); ok {

internal/service/ec2/ec2_ami_ids_data_source_test.go

@@ -57,6 +57,25 @@ func TestAccEC2AMIIDsDataSource_sorted(t *testing.T) {
 	})
 }
 
+func TestAccEC2AMIIDsDataSource_includeDeprecated(t *testing.T) {
+	ctx := acctest.Context(t)
+	datasourceName := "data.aws_ami_ids.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, ec2.EndpointsID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAMIIDsDataSourceConfig_includeDeprecated(true),
+				Check: resource.ComposeTestCheckFunc(
+					acctest.CheckResourceAttrGreaterThanValue(datasourceName, "ids.#", "0"),
+				),
+			},
+		},
+	})
+}
+
 const testAccAMIIDsDataSourceConfig_basic = `
 data "aws_ami_ids" "test" {
   owners = ["099720109477"]
@@ -100,3 +119,17 @@ data "aws_ami_ids" "test" {
 }
 `, sortAscending)
 }
+
+func testAccAMIIDsDataSourceConfig_includeDeprecated(includeDeprecated bool) string {
+	return fmt.Sprintf(`
+data "aws_ami_ids" "test" {
+  owners             = ["099720109477"]
+  include_deprecated = %[1]t
+
+  filter {
+    name   = "name"
+    values = ["ubuntu/images/ubuntu-*-*-amd64-server-*"]
+  }
+}
+`, includeDeprecated)
+}

website/docs/d/ami_ids.html.markdown

@@ -40,7 +40,11 @@ This filtering is done locally on what AWS returns, and could have a performance
 impact if the result is large. Combine this with other
 options to narrow down the list AWS returns.
 
-* `sort_ascending`  - (Defaults to `false`) Used to sort AMIs by creation time.
+* `sort_ascending` - (Optional) Used to sort AMIs by creation time.
+If no value is specified, the default value is `false`.
+
+* `include_deprecated` - (Optional) If true, all deprecated AMIs are included in the response.
+If false, no deprecated AMIs are included in the response. If no value is specified, the default value is `false`.
 
 ## Attributes Reference