Add as scaling group tags support

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 1.20.1 (Unreleased)
+
+ENHANCEMENTS:
+
+* Data Source: `tencentcloud_as_scaling_groups` add optional argument `tags` and attribute `tags` for `scaling_group_list`.
+* Resource: `tencentcloud_as_scaling_group` add optional argument `tags`.
+
 ## 1.20.0 (September 24, 2019)
 
 FEATURES:

examples/tencentcloud-as/main.tf

@@ -48,6 +48,10 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {
   desired_capacity     = "${var.desired_capacity}"
   termination_policies = ["NEWEST_INSTANCE"]
   retry_policy         = "INCREMENTAL_INTERVALS"
+
+  tags = {
+    "test" = "test"
+  }
 }
 
 resource "tencentcloud_as_scaling_policy" "scaling_policy" {
@@ -91,3 +95,7 @@ resource "tencentcloud_as_notification" "notification" {
   notification_types          = ["SCALE_OUT_FAILED"]
   notification_user_group_ids = ["76955"]
 }
+
+data "tencentcloud_as_scaling_groups" "scaling_groups_tags" {
+  tags = "${tencentcloud_as_scaling_group.scaling_group.tags}"
+}

tencentcloud/data_source_tc_as_scaling_groups.go

@@ -40,11 +40,18 @@ func dataSourceTencentCloudAsScalingGroups() *schema.Resource {
 				Optional:    true,
 				Description: "A scaling group name used to query.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tags used to query.",
+			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "Used to save results.",
 			},
+
+			// computed
 			"scaling_group_list": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -183,6 +190,11 @@ func dataSourceTencentCloudAsScalingGroups() *schema.Resource {
 							Computed:    true,
 							Description: "The time when the AS group was created.",
 						},
+						"tags": {
+							Type:        schema.TypeMap,
+							Computed:    true,
+							Description: "Tags of the scaling group.",
+						},
 					},
 				},
 			},
@@ -213,47 +225,55 @@ func dataSourceTencentCloudAsScalingGroupRead(d *schema.ResourceData, meta inter
 		scalingGroupName = v.(string)
 	}
 
-	scalingGroups, err := asService.DescribeAutoScalingGroupByFilter(ctx, scalingGroupId, configurationId, scalingGroupName)
+	tags := getTags(d, "tags")
+
+	scalingGroups, err := asService.DescribeAutoScalingGroupByFilter(ctx, scalingGroupId, configurationId, scalingGroupName, tags)
 	if err != nil {
 		return err
 	}
 
 	scalingGroupList := make([]map[string]interface{}, 0, len(scalingGroups))
 	for _, scalingGroup := range scalingGroups {
+		tags := make(map[string]string, len(scalingGroup.Tags))
+		for _, tag := range scalingGroup.Tags {
+			tags[*tag.Key] = *tag.Value
+		}
+
 		mapping := map[string]interface{}{
-			"scaling_group_id":     *scalingGroup.AutoScalingGroupId,
-			"scaling_group_name":   *scalingGroup.AutoScalingGroupName,
-			"configuration_id":     *scalingGroup.LaunchConfigurationId,
-			"status":               *scalingGroup.AutoScalingGroupStatus,
-			"instance_count":       *scalingGroup.InstanceCount,
-			"max_size":             *scalingGroup.MaxSize,
-			"min_size":             *scalingGroup.MinSize,
-			"vpc_id":               *scalingGroup.VpcId,
+			"scaling_group_id":     scalingGroup.AutoScalingGroupId,
+			"scaling_group_name":   scalingGroup.AutoScalingGroupName,
+			"configuration_id":     scalingGroup.LaunchConfigurationId,
+			"status":               scalingGroup.AutoScalingGroupStatus,
+			"instance_count":       scalingGroup.InstanceCount,
+			"max_size":             scalingGroup.MaxSize,
+			"min_size":             scalingGroup.MinSize,
+			"vpc_id":               scalingGroup.VpcId,
 			"subnet_ids":           flattenStringList(scalingGroup.SubnetIdSet),
 			"zones":                flattenStringList(scalingGroup.ZoneSet),
-			"default_cooldown":     *scalingGroup.DefaultCooldown,
-			"desired_capacity":     *scalingGroup.DesiredCapacity,
+			"default_cooldown":     scalingGroup.DefaultCooldown,
+			"desired_capacity":     scalingGroup.DesiredCapacity,
 			"load_balancer_ids":    flattenStringList(scalingGroup.LoadBalancerIdSet),
 			"termination_policies": flattenStringList(scalingGroup.TerminationPolicySet),
-			"retry_policy":         *scalingGroup.RetryPolicy,
-			"create_time":          *scalingGroup.CreatedTime,
+			"retry_policy":         scalingGroup.RetryPolicy,
+			"create_time":          scalingGroup.CreatedTime,
+			"tags":                 tags,
 		}
 		if scalingGroup.ForwardLoadBalancerSet != nil && len(scalingGroup.ForwardLoadBalancerSet) > 0 {
 			forwardLoadBalancers := make([]map[string]interface{}, 0, len(scalingGroup.ForwardLoadBalancerSet))
 			for _, v := range scalingGroup.ForwardLoadBalancerSet {
 				targetAttributes := make([]map[string]interface{}, 0, len(v.TargetAttributes))
 				for _, vv := range v.TargetAttributes {
 					targetAttribute := map[string]interface{}{
-						"port":   *vv.Port,
-						"weight": *vv.Weight,
+						"port":   vv.Port,
+						"weight": vv.Weight,
 					}
 					targetAttributes = append(targetAttributes, targetAttribute)
 				}
 				forwardLoadBalancer := map[string]interface{}{
-					"load_balancer_id":  *v.LoadBalancerId,
-					"listener_id":       *v.ListenerId,
+					"load_balancer_id":  v.LoadBalancerId,
+					"listener_id":       v.ListenerId,
 					"target_attributes": targetAttributes,
-					"location_id":       *v.LocationId,
+					"location_id":       v.LocationId,
 				}
 				forwardLoadBalancers = append(forwardLoadBalancers, forwardLoadBalancer)
 			}

tencentcloud/data_source_tc_as_scaling_groups_test.go

@@ -1,6 +1,7 @@
 package tencentcloud
 
 import (
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -35,6 +36,17 @@ func TestAccTencentCloudAsScalingGroupsDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.subnet_ids.#", "1"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.status"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_name", "scaling_group_list.0.create_time"),
+
+					resource.TestMatchResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.#", regexp.MustCompile(`^[1-9]\d*$`)),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.scaling_group_name"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.configuration_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.max_size"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.min_size"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.vpc_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.subnet_ids.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.status"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.create_time"),
+					resource.TestCheckResourceAttr("data.tencentcloud_as_scaling_groups.scaling_groups_tags", "scaling_group_list.0.tags.test", "test"),
 				),
 			},
 		},
@@ -72,7 +84,7 @@ func TestAccTencentCloudAsScalingGroupsDataSource_full(t *testing.T) {
 	})
 }
 
-//todo
+// todo
 func testAccAsScalingGroupsDataSource_basic() string {
 	return `
 resource "tencentcloud_vpc" "vpc" {
@@ -100,6 +112,10 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {
   min_size           = 0
   vpc_id             = "${tencentcloud_vpc.vpc.id}"
   subnet_ids         = ["${tencentcloud_subnet.subnet.id}"]
+
+  tags = {
+    "test" = "test"
+  }
 }
 
 data "tencentcloud_as_scaling_groups" "scaling_groups" {
@@ -109,6 +125,10 @@ data "tencentcloud_as_scaling_groups" "scaling_groups" {
 data "tencentcloud_as_scaling_groups" "scaling_groups_name" {
   scaling_group_name = "${tencentcloud_as_scaling_group.scaling_group.scaling_group_name}"
 }
+
+data "tencentcloud_as_scaling_groups" "scaling_groups_tags" {
+  tags = "${tencentcloud_as_scaling_group.scaling_group.tags}"
+}
 `
 }