fix: tke/nodepool - support multi_zone_subnet_policy modify (#1192)

* fix: tke/nodepool - support multi_zone_subnet_policy modify

* Update mr.yml

Co-authored-by: tongyiming <[email protected]>

Author: Kagashino

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -423,7 +423,6 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 			"multi_zone_subnet_policy": {
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 				ValidateFunc: validateAllowedStringValue([]string{MultiZoneSubnetPolicyPriority,
 					MultiZoneSubnetPolicyEquality}),
 				Description: "Multi-availability zone/subnet policy. Valid values: PRIORITY and EQUALITY. Default value: PRIORITY.",
@@ -572,7 +571,7 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 	}
 }
 
-//this function composes every single parameter to a as scale parameter with json string format
+//this function composes every single parameter to an as scale parameter with json string format
 func composeParameterToAsScalingGroupParaSerial(d *schema.ResourceData) (string, error) {
 	var (
 		result string
@@ -1268,6 +1267,7 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 	if d.HasChange("scaling_group_name") ||
 		d.HasChange("zones") ||
 		d.HasChange("scaling_group_project_id") ||
+		d.HasChange("multi_zone_subnet_policy") ||
 		d.HasChange("default_cooldown") ||
 		d.HasChange("termination_policies") {
 
@@ -1277,28 +1277,42 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		}
 
 		var (
-			scalingGroupId      = *nodePool.AutoscalingGroupId
-			name                = d.Get("scaling_group_name").(string)
-			projectId           = d.Get("scaling_group_project_id").(int)
-			defaultCooldown     = d.Get("default_cooldown").(int)
-			zones               []*string
-			terminationPolicies []*string
+			request               = as.NewModifyAutoScalingGroupRequest()
+			scalingGroupId        = *nodePool.AutoscalingGroupId
+			name                  = d.Get("scaling_group_name").(string)
+			projectId             = d.Get("scaling_group_project_id").(int)
+			defaultCooldown       = d.Get("default_cooldown").(int)
+			multiZoneSubnetPolicy = d.Get("multi_zone_subnet_policy").(string)
 		)
 
+		request.AutoScalingGroupId = &scalingGroupId
+
+		if name != "" {
+			request.AutoScalingGroupName = &name
+		}
+
+		if multiZoneSubnetPolicy != "" {
+			request.MultiZoneSubnetPolicy = &multiZoneSubnetPolicy
+		}
+
+		if projectId != 0 {
+			request.ProjectId = helper.IntUint64(projectId)
+		}
+
+		if defaultCooldown != 0 {
+			request.DefaultCooldown = helper.IntUint64(defaultCooldown)
+		}
+
 		if v, ok := d.GetOk("zones"); ok {
-			for _, zone := range v.([]interface{}) {
-				zones = append(zones, helper.String(zone.(string)))
-			}
+			request.Zones = helper.InterfacesStringsPoint(v.([]interface{}))
 		}
 
 		if v, ok := d.GetOk("termination_policies"); ok {
-			for _, policy := range v.([]interface{}) {
-				terminationPolicies = append(terminationPolicies, helper.String(policy.(string)))
-			}
+			request.TerminationPolicies = helper.InterfacesStringsPoint(v.([]interface{}))
 		}
 
 		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := asService.ModifyScalingGroup(ctx, scalingGroupId, name, projectId, defaultCooldown, zones, terminationPolicies)
+			errRet := asService.ModifyAutoScalingGroup(ctx, request)
 			if errRet != nil {
 				return retryError(errRet)
 			}

tencentcloud/resource_tc_kubernetes_node_pool_test.go

@@ -294,6 +294,7 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
   scaling_group_name 	   = "basic_group_test"
   default_cooldown 		   = 350
   termination_policies 	   = ["NEWEST_INSTANCE"]
+  multi_zone_subnet_policy = "EQUALITY"
 
   auto_scaling_config {
     instance_type      = local.final_type

tencentcloud/service_tencentcloud_as.go

@@ -440,40 +440,27 @@ 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, terminationPolicies []*string) error {
+func (me *AsService) ModifyAutoScalingGroup(ctx context.Context, request *as.ModifyAutoScalingGroupRequest) (errRet error) {
 	logId := getLogId(ctx)
-	request := as.NewModifyAutoScalingGroupRequest()
-
-	request.AutoScalingGroupId = helper.String(id)
-
-	if name != "" {
-		request.AutoScalingGroupName = helper.String(name)
-	}
-
-	if projectId != 0 {
-		request.ProjectId = helper.IntUint64(projectId)
-	}
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), errRet.Error())
+		}
+	}()
 
-	if cooldown != 0 {
-		request.DefaultCooldown = helper.IntUint64(cooldown)
-	}
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseAsClient().ModifyAutoScalingGroup(request)
 
-	if len(zones) != 0 {
-		request.Zones = zones
+	if err != nil {
+		errRet = err
+		return
 	}
 
-	if len(terminationPolicies) != 0 {
-		request.TerminationPolicies = terminationPolicies
-	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
-	ratelimit.Check(request.GetAction())
-	_, err := me.client.UseAsClient().ModifyAutoScalingGroup(request)
-	if err != nil {
-		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
-			logId, request.GetAction(), request.ToJsonString(), err.Error())
-		return err
-	}
-	return nil
+	return
 }
 
 func (me *AsService) DeleteScheduledAction(ctx context.Context, scheduledActonId string) error {

website/docs/r/kubernetes_node_pool.html.markdown

@@ -163,7 +163,7 @@ The following arguments are supported:
 * `desired_capacity` - (Optional, Int) Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
 * `enable_auto_scale` - (Optional, Bool) Indicate whether to enable auto scaling or not.
 * `labels` - (Optional, Map) Labels of kubernetes node pool created nodes. The label key name does not exceed 63 characters, only supports English, numbers,'/','-', and does not allow beginning with ('/').
-* `multi_zone_subnet_policy` - (Optional, String, ForceNew) Multi-availability zone/subnet policy. Valid values: PRIORITY and EQUALITY. Default value: PRIORITY.
+* `multi_zone_subnet_policy` - (Optional, String) Multi-availability zone/subnet policy. Valid values: PRIORITY and EQUALITY. Default value: PRIORITY.
 * `node_config` - (Optional, List) Node config.
 * `node_os_type` - (Optional, String) The image version of the node. Valida values are `DOCKER_CUSTOMIZE` and `GENERAL`. Default is `GENERAL`. This parameter will only affect new nodes, not including the existing nodes.
 * `node_os` - (Optional, String) Operating system of the cluster, the available values include: `tlinux2.4x86_64`, `ubuntu18.04.1x86_64`, `ubuntu16.04.1 LTSx86_64`, `centos7.6.0_x64` and `centos7.2x86_64`. Default is 'tlinux2.4x86_64'. This parameter will only affect new nodes, not including the existing nodes.