Merge pull request #677 from tencentcloudstack/fix/cam-role-data-and-node-asg

fix - policy attach data username and node_pool argument mistake

Author: Kagashino

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.59.6 (September 28, 2021)
+
+BUGFIXES:
+
+* Resource `resource_tc_kubernetes_node_pool_test.go` fix termination_policies argument mistake
+
+DEPRECATED:
+
+* DataSource `data_source_tc_cam_user_policy_attachments.go` deprecate `user_id` and replaced by `user_name`
+
 ## 1.59.5 (September 28, 2021)
 
 ENHANCEMENTS:

examples/tencentcloud-cam/main.tf

@@ -30,7 +30,7 @@ resource "tencentcloud_cam_role" "example" {
 
 resource "tencentcloud_cam_group_membership" "example" {
   group_id = tencentcloud_cam_group.example.id
-  user_ids = [tencentcloud_cam_user.example.id]
+  user_names = [tencentcloud_cam_user.example.name]
 }
 
 resource "tencentcloud_cam_role_policy_attachment" "example" {
@@ -39,7 +39,7 @@ resource "tencentcloud_cam_role_policy_attachment" "example" {
 }
 
 resource "tencentcloud_cam_user_policy_attachment" "example" {
-  user_id   = tencentcloud_cam_user.example.id
+  user_name   = tencentcloud_cam_user.example.name
   policy_id = tencentcloud_cam_policy.example.id
 }
 
@@ -75,7 +75,7 @@ data "tencentcloud_cam_group_memberships" "memberships" {
 }
 
 data "tencentcloud_cam_user_policy_attachments" "user_policy_attachments" {
-  user_id = tencentcloud_cam_user_policy_attachment.example.user_id
+  user_name = tencentcloud_cam_user_policy_attachment.example.user_name
 }
 
 data "tencentcloud_cam_role_policy_attachments" "role_policy_attachments" {

tencentcloud/data_source_tc_cam_user_policy_attachments.go

@@ -36,9 +36,17 @@ func dataSourceTencentCloudCamUserPolicyAttachments() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"user_id": {
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
+				AtLeastOneOf: []string{"user_id", "user_name"},
+				Deprecated: "It has been deprecated from version 1.59.6. Use `user_name` instead.",
 				Description: "ID of the attached CAM user to be queried.",
 			},
+			"user_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				AtLeastOneOf: []string{"user_id", "user_name"},
+				Description: "Name of the attached CAM user as unique key to be queried.",
+			},
 			"policy_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -70,8 +78,14 @@ func dataSourceTencentCloudCamUserPolicyAttachments() *schema.Resource {
 						"user_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
+							Deprecated: "It has been deprecated from version 1.59.6. Use `user_name` instead.",
 							Description: "ID of CAM user.",
 						},
+						"user_name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Name of CAM user as unique key.",
+						},
 						"policy_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
@@ -111,7 +125,10 @@ func dataSourceTencentCloudCamUserPolicyAttachmentsRead(d *schema.ResourceData,
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	params := make(map[string]interface{})
-	userId := d.Get("user_id").(string)
+	userId, _, err := getUserId(d)
+	if err != nil {
+		return err
+	}
 	params["user_id"] = userId
 	if v, ok := d.GetOk("policy_id"); ok {
 		policyId, err := strconv.Atoi(v.(string))
@@ -131,7 +148,7 @@ func dataSourceTencentCloudCamUserPolicyAttachmentsRead(d *schema.ResourceData,
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 	var policyOfUsers []*cam.AttachPolicyInfo
-	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		results, e := camService.DescribeUserPolicyAttachmentsByFilter(ctx, params)
 		if e != nil {
 			return retryError(e)
@@ -147,7 +164,8 @@ func dataSourceTencentCloudCamUserPolicyAttachmentsRead(d *schema.ResourceData,
 	ids := make([]string, 0, len(policyOfUsers))
 	for _, policy := range policyOfUsers {
 		mapping := map[string]interface{}{
-			"user_id":     userId,
+			"user_id": 	   userId,
+			"user_name":   userId,
 			"policy_id":   strconv.Itoa(int(*policy.PolicyId)),
 			"create_time": *policy.AddTime,
 			"create_mode": *policy.CreateMode,

tencentcloud/data_source_tc_cam_user_policy_attachments_test.go

@@ -17,7 +17,7 @@ func TestAccTencentCloudCamUserPolicyAttachmentsDataSource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckCamUserPolicyAttachmentExists("tencentcloud_cam_user_policy_attachment.user_policy_attachment"),
 					resource.TestCheckResourceAttr("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.#", "1"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.0.user_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.0.user_name"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.0.policy_id"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.0.policy_name"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_user_policy_attachments.user_policy_attachments", "user_policy_attachment_list.0.create_mode"),
@@ -48,11 +48,11 @@ resource "tencentcloud_cam_policy" "policy" {
 }
 
 resource "tencentcloud_cam_user_policy_attachment" "user_policy_attachment" {
-  user_id   = tencentcloud_cam_user.user.id
+  user_name   = tencentcloud_cam_user.user.name
   policy_id = tencentcloud_cam_policy.policy.id
 }
   
 data "tencentcloud_cam_user_policy_attachments" "user_policy_attachments" {
-  user_id = tencentcloud_cam_user_policy_attachment.user_policy_attachment.user_id
+  user_name = tencentcloud_cam_user_policy_attachment.user_policy_attachment.user_name
 }
 `

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -909,7 +909,7 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 			projectId         = d.Get("scaling_group_project_id").(int)
 			defaultCooldown   = d.Get("default_cooldown").(int)
 			zones             []*string
-			terminationPolicy []*string
+			terminationPolicies []*string
 		)
 
 		if v, ok := d.GetOk("zones"); ok {
@@ -918,14 +918,14 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 			}
 		}
 
-		if v, ok := d.GetOk("termination_policy"); ok {
+		if v, ok := d.GetOk("termination_policies"); ok {
 			for _, policy := range v.([]interface{}) {
-				terminationPolicy = append(terminationPolicy, helper.String(policy.(string)))
+				terminationPolicies = append(terminationPolicies, helper.String(policy.(string)))
 			}
 		}
 
 		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := asService.ModifyScalingGroup(ctx, scalingGroupId, name, projectId, defaultCooldown, zones, terminationPolicy)
+			errRet := asService.ModifyScalingGroup(ctx, scalingGroupId, name, projectId, defaultCooldown, zones, terminationPolicies)
 			if errRet != nil {
 				return retryError(errRet)
 			}

tencentcloud/service_tencentcloud_as.go

@@ -440,7 +440,7 @@ func (me *AsService) DescribeScheduledActionById(ctx context.Context, scheduledA
 	return
 }
 
-func (me *AsService) ModifyScalingGroup(ctx context.Context, id string, name string, projectId int, cooldown int, zones []*string, terminatePolicy []*string) error {
+func (me *AsService) ModifyScalingGroup(ctx context.Context, id string, name string, projectId int, cooldown int, zones []*string, terminationPolicies []*string) error {
 	logId := getLogId(ctx)
 	request := as.NewModifyAutoScalingGroupRequest()
 
@@ -462,8 +462,8 @@ func (me *AsService) ModifyScalingGroup(ctx context.Context, id string, name str
 		request.Zones = zones
 	}
 
-	if len(terminatePolicy) != 0 {
-		request.TerminationPolicies = terminatePolicy[:1]
+	if len(terminationPolicies) != 0 {
+		request.TerminationPolicies = terminationPolicies
 	}
 
 	ratelimit.Check(request.GetAction())

website/docs/d/cam_user_policy_attachments.html.markdown

@@ -30,11 +30,12 @@ data "tencentcloud_cam_user_policy_attachments" "bar" {
 
 The following arguments are supported:
 
-* `user_id` - (Required) ID of the attached CAM user to be queried.
 * `create_mode` - (Optional) Mode of Creation of the CAM user policy attachment. `1` means the CAM policy attachment is created by production, and the others indicate syntax strategy ways.
 * `policy_id` - (Optional) ID of CAM policy to be queried.
 * `policy_type` - (Optional) Type of the policy strategy. 'User' means customer strategy and 'QCS' means preset strategy.
 * `result_output_file` - (Optional) Used to save results.
+* `user_id` - (Optional, **Deprecated**) It has been deprecated from version 1.59.6. Use `user_name` instead. ID of the attached CAM user to be queried.
+* `user_name` - (Optional) Name of the attached CAM user as unique key to be queried.
 
 ## Attributes Reference
 
@@ -46,6 +47,7 @@ In addition to all arguments above, the following attributes are exported:
   * `policy_id` - Name of CAM user.
   * `policy_name` - The name of the policy.
   * `policy_type` - Type of the policy strategy. 'User' means customer strategy and 'QCS' means preset strategy.
-  * `user_id` - ID of CAM user.
+  * `user_id` - (**Deprecated**) It has been deprecated from version 1.59.6. Use `user_name` instead. ID of CAM user.
+  * `user_name` - Name of CAM user as unique key.