👽 add support for aws_autoscaling_group filters

.changelog/21966.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_autoscaling_groups: Add support for tag filters ([#3534](https://github.com/hashicorp/terraform-provider-aws/issues/3534))
+```

internal/service/autoscaling/groups_data_source.go

@@ -37,10 +37,9 @@ func DataSourceGroups() *schema.Resource {
 							Required: true,
 						},
 						"values": {
-							Type:     schema.TypeSet,
+							Type:     schema.TypeList,
 							Required: true,
 							Elem:     &schema.Schema{Type: schema.TypeString},
-							Set:      schema.HashString,
 						},
 					},
 				},
@@ -49,6 +48,33 @@ func DataSourceGroups() *schema.Resource {
 	}
 }
 
+func buildFiltersDataSource(set *schema.Set) []*autoscaling.Filter {
+	var filters []*autoscaling.Filter
+	for _, v := range set.List() {
+		m := v.(map[string]interface{})
+		var filterValues []*string
+		for _, e := range m["values"].([]interface{}) {
+			filterValues = append(filterValues, aws.String(e.(string)))
+		}
+
+		// In previous iterations, users were expected to provide "key" and "value" tag names.
+		// With the addition of asgs filters, the signature is "tag-key" and "tag-value", so these conditions prevent breaking changes.
+		// https://docs.aws.amazon.com/sdk-for-go/api/service/autoscaling/#Filter
+		name := m["name"].(string)
+		if name == "key" {
+			name = "tag-key"
+		}
+		if name == "value" {
+			name = "tag-value"
+		}
+		filters = append(filters, &autoscaling.Filter{
+			Name:   aws.String(name),
+			Values: filterValues,
+		})
+	}
+	return filters
+}
+
 func dataSourceGroupsRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*conns.AWSClient).AutoScalingConn
 
@@ -58,47 +84,24 @@ func dataSourceGroupsRead(d *schema.ResourceData, meta interface{}) error {
 	var rawArn []string
 	var err error
 
-	tf := d.Get("filter").(*schema.Set)
-	if tf.Len() > 0 {
-		input := &autoscaling.DescribeTagsInput{
-			Filters: expandAsgTagFilters(tf.List()),
-		}
-		err = conn.DescribeTagsPages(input, func(resp *autoscaling.DescribeTagsOutput, lastPage bool) bool {
-			for _, v := range resp.Tags {
-				rawName = append(rawName, aws.StringValue(v.ResourceId))
-			}
-			return !lastPage
-		})
+	params := autoscaling.DescribeAutoScalingGroupsInput{}
 
-		maxAutoScalingGroupNames := 1600
-		for i := 0; i < len(rawName); i += maxAutoScalingGroupNames {
-			end := i + maxAutoScalingGroupNames
-
-			if end > len(rawName) {
-				end = len(rawName)
-			}
-
-			nameInput := &autoscaling.DescribeAutoScalingGroupsInput{
-				AutoScalingGroupNames: aws.StringSlice(rawName[i:end]),
-				MaxRecords:            aws.Int64(100),
-			}
-
-			err = conn.DescribeAutoScalingGroupsPages(nameInput, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool {
-				for _, group := range resp.AutoScalingGroups {
-					rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN))
-				}
-				return !lastPage
-			})
-		}
-	} else {
-		err = conn.DescribeAutoScalingGroupsPages(&autoscaling.DescribeAutoScalingGroupsInput{}, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool {
-			for _, group := range resp.AutoScalingGroups {
-				rawName = append(rawName, aws.StringValue(group.AutoScalingGroupName))
-				rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN))
-			}
-			return !lastPage
-		})
+	if v, ok := d.GetOk("filter"); ok {
+		params.Filters = buildFiltersDataSource(v.(*schema.Set))
 	}
+
+	if v, ok := d.GetOk("names"); ok {
+		params.AutoScalingGroupNames = flex.ExpandStringList(v.([]interface{}))
+	}
+
+	err = conn.DescribeAutoScalingGroupsPages(&params, func(resp *autoscaling.DescribeAutoScalingGroupsOutput, lastPage bool) bool {
+		for _, group := range resp.AutoScalingGroups {
+			rawName = append(rawName, aws.StringValue(group.AutoScalingGroupName))
+			rawArn = append(rawArn, aws.StringValue(group.AutoScalingGroupARN))
+		}
+		return !lastPage
+	})
+
 	if err != nil {
 		return fmt.Errorf("Error fetching Autoscaling Groups: %w", err)
 	}
@@ -117,19 +120,4 @@ func dataSourceGroupsRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	return nil
-
-}
-
-func expandAsgTagFilters(in []interface{}) []*autoscaling.Filter {
-	out := make([]*autoscaling.Filter, len(in))
-	for i, filter := range in {
-		m := filter.(map[string]interface{})
-		values := flex.ExpandStringSet(m["values"].(*schema.Set))
-
-		out[i] = &autoscaling.Filter{
-			Name:   aws.String(m["name"].(string)),
-			Values: values,
-		}
-	}
-	return out
 }

internal/service/autoscaling/groups_data_source_test.go

@@ -24,11 +24,20 @@ func TestAccAutoScalingGroupsDataSource_basic(t *testing.T) {
 				Config: testAccCheckGroupsConfig(sdkacctest.RandInt(), sdkacctest.RandInt(), sdkacctest.RandInt()),
 			},
 			{
-				Config: testAccCheckGroupsWithDataSourceConfig(sdkacctest.RandInt(), sdkacctest.RandInt(), sdkacctest.RandInt()),
+				Config: testAccCheckGroupsWithDataSourceConfig(),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGroups("data.aws_autoscaling_groups.group_list"),
+					testAccCheckGroups("data.aws_autoscaling_groups.group_list_tag_lookup"),
+					testAccCheckGroups("data.aws_autoscaling_groups.group_list_multiple_filters"),
+					testAccCheckGroups("data.aws_autoscaling_groups.group_list_multiple_values"),
 					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list", "names.#", "3"),
 					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list", "arns.#", "3"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_tag_lookup", "names.#", "3"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_tag_lookup", "arns.#", "3"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_multiple_filters", "names.#", "1"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_multiple_filters", "arns.#", "1"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_multiple_values", "names.#", "2"),
+					resource.TestCheckResourceAttr("data.aws_autoscaling_groups.group_list_multiple_values", "arns.#", "2"),
 				),
 			},
 		},
@@ -116,6 +125,11 @@ resource "aws_autoscaling_group" "bar" {
     value               = "foo-bar"
     propagate_at_launch = true
   }
+  tag {
+    key                 = "some-arbitrary-tag"
+    value               = "some-arbitrary-value"
+    propagate_at_launch = true
+  }
 }
 
 resource "aws_autoscaling_group" "foo" {
@@ -134,6 +148,11 @@ resource "aws_autoscaling_group" "foo" {
     value               = "foo-bar"
     propagate_at_launch = true
   }
+  tag {
+    key                 = "some-arbitrary-tag"
+    value               = "some-other-arbitrary-value"
+    propagate_at_launch = true
+  }
 }
 
 resource "aws_autoscaling_group" "barbaz" {
@@ -152,91 +171,52 @@ resource "aws_autoscaling_group" "barbaz" {
     value               = "foo-bar"
     propagate_at_launch = true
   }
+  tag {
+    key                 = "lorem"
+    value               = "ipsum"
+    propagate_at_launch = true
+  }
 }
 `, rInt1, rInt2, rInt3)
 }
 
-func testAccCheckGroupsWithDataSourceConfig(rInt1, rInt2, rInt3 int) string {
-	return acctest.ConfigAvailableAZsNoOptIn() + fmt.Sprintf(`
-data "aws_ami" "test_ami" {
-  most_recent = true
-  owners      = ["amazon"]
-
+func testAccCheckGroupsWithDataSourceConfig() string {
+	return acctest.ConfigAvailableAZsNoOptIn() + `
+data "aws_autoscaling_groups" "group_list" {
   filter {
-    name   = "name"
-    values = ["amzn-ami-hvm-*-x86_64-gp2"]
+    name   = "key"
+    values = ["Foo"]
   }
-}
 
-resource "aws_launch_configuration" "foobar" {
-  image_id      = data.aws_ami.test_ami.id
-  instance_type = "t1.micro"
-}
-
-resource "aws_autoscaling_group" "bar" {
-  availability_zones = [data.aws_availability_zones.available.names[0]]
-  name               = "test-asg-%d"
-  max_size           = 1
-  min_size           = 0
-  health_check_type  = "EC2"
-  desired_capacity   = 0
-  force_delete       = true
-
-  launch_configuration = aws_launch_configuration.foobar.name
-
-  tag {
-    key                 = "Foo"
-    value               = "foo-bar"
-    propagate_at_launch = true
+  filter {
+    name   = "value"
+    values = ["foo-bar"]
   }
 }
 
-resource "aws_autoscaling_group" "foo" {
-  availability_zones = [data.aws_availability_zones.available.names[1]]
-  name               = "test-asg-%d"
-  max_size           = 1
-  min_size           = 0
-  health_check_type  = "EC2"
-  desired_capacity   = 0
-  force_delete       = true
-
-  launch_configuration = aws_launch_configuration.foobar.name
-
-  tag {
-    key                 = "Foo"
-    value               = "foo-bar"
-    propagate_at_launch = true
+data "aws_autoscaling_groups" "group_list_tag_lookup" {
+  filter {
+    name   = "tag:Foo"
+    values = ["foo-bar"]
   }
 }
 
-resource "aws_autoscaling_group" "barbaz" {
-  availability_zones = [data.aws_availability_zones.available.names[2]]
-  name               = "test-asg-%d"
-  max_size           = 1
-  min_size           = 0
-  health_check_type  = "EC2"
-  desired_capacity   = 0
-  force_delete       = true
-
-  launch_configuration = aws_launch_configuration.foobar.name
-
-  tag {
-    key                 = "Foo"
-    value               = "foo-bar"
-    propagate_at_launch = true
+data "aws_autoscaling_groups" "group_list_multiple_filters" {
+  filter {
+    name   = "tag:Foo"
+    values = ["foo-bar"]
   }
-}
-
-data "aws_autoscaling_groups" "group_list" {
   filter {
     name   = "key"
-    values = ["Foo"]
+    values = ["lorem"]
   }
+}
 
+data "aws_autoscaling_groups" "group_list_multiple_values" {
   filter {
-    name   = "value"
-    values = ["foo-bar"]
+    name   = "tag:some-arbitrary-tag"
+    values = ["some-arbitrary-value", "some-other-arbitrary-value"]
   }
 }
-`, rInt1, rInt2, rInt3)
+`
 }