feat: mse cluster resource add version update feature.

feat: mse cluster resource add version update feature.

feat: mse cluster resource add version update feature.

feat: mse cluster resource add version update feature.

Author: YangzeXie

alicloud/resource_alicloud_mse_cluster.go

@@ -13,10 +13,11 @@ import (
 
 func resourceAlicloudMseCluster() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceAlicloudMseClusterCreate,
-		Read:   resourceAlicloudMseClusterRead,
-		Update: resourceAlicloudMseClusterUpdate,
-		Delete: resourceAlicloudMseClusterDelete,
+		Create:        resourceAlicloudMseClusterCreate,
+		Read:          resourceAlicloudMseClusterRead,
+		Update:        resourceAlicloudMseClusterUpdate,
+		Delete:        resourceAlicloudMseClusterDelete,
+		CustomizeDiff: customizeMseClusterDiff,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
@@ -60,6 +61,11 @@ func resourceAlicloudMseCluster() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"version_code": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"connection_type": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -248,6 +254,7 @@ func resourceAlicloudMseClusterRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("net_type", object["NetType"])
 	d.Set("vswitch_id", object["VSwitchId"])
 	d.Set("cluster_version", object["OrderClusterVersion"])
+	d.Set("version_code", object["ClusterVersion"])
 	d.Set("cluster_alias_name", object["ClusterAliasName"])
 	d.Set("connection_type", object["ConnectionType"])
 	d.Set("vpc_id", object["VpcId"])
@@ -497,6 +504,49 @@ func resourceAlicloudMseClusterUpdate(d *schema.ResourceData, meta interface{})
 		d.SetPartial("pub_network_flow")
 	}
 
+	if !d.IsNewResource() && d.HasChange("version_code") {
+		update = true
+		targetVersion := d.Get("version_code").(string)
+		currentVersion := object["ClusterVersion"].(string)
+
+		if currentVersion != targetVersion {
+			updateRequest := map[string]interface{}{
+				"ClusterId":   object["ClusterId"],
+				"VersionCode": targetVersion,
+			}
+
+			action := "UpdateImage"
+			wait := incrementalWait(3*time.Second, 3*time.Second)
+			err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError {
+				response, err = client.RpcPost("mse", "2019-05-31", action, nil, updateRequest, false)
+				if err != nil {
+					if NeedRetry(err) {
+						wait()
+						return resource.RetryableError(err)
+					}
+					return resource.NonRetryableError(err)
+				}
+				addDebug(action, response, updateRequest)
+				return nil
+			})
+			if err != nil {
+				return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
+			}
+			if fmt.Sprint(response["Success"]) == "false" {
+				return WrapErrorf(fmt.Errorf("%s failed, response: %v", action, response), DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
+			}
+
+			stateConf := BuildStateConf([]string{}, []string{"SCALE_SUCCESS"}, d.Timeout(schema.TimeoutUpdate), 60*time.Second, mseService.MseClusterStateRefreshFunc(d.Id(), []string{"INIT_FAILED"}))
+			if _, err := stateConf.WaitForState(); err != nil {
+				return WrapErrorf(err, IdMsg, d.Id())
+			}
+
+			d.SetPartial("version_code")
+		} else {
+			update = false
+		}
+	}
+
 	d.Partial(false)
 	return resourceAlicloudMseClusterRead(d, meta)
 }
@@ -545,6 +595,90 @@ func resourceAlicloudMseClusterDelete(d *schema.ResourceData, meta interface{})
 	return nil
 }
 
+func customizeMseClusterDiff(d *schema.ResourceDiff, meta interface{}) error {
+	if d.Id() == "" {
+		log.Printf("[DEBUG] This is a new resource")
+		return nil
+	}
+
+	client := meta.(*connectivity.AliyunClient)
+
+	queryClusterInfoRequest := map[string]interface{}{
+		"InstanceId": d.Id(),
+	}
+	response, err := client.RpcPost("mse", "2019-05-31", "QueryClusterInfo", nil, queryClusterInfoRequest, false)
+	if err != nil {
+		return WrapErrorf(err, DefaultErrorMsg, d.Id(), "QueryClusterInfo", AlibabaCloudSdkGoERROR)
+	}
+	log.Printf("[DEBUG] QueryClusterInfo response: %#v", response)
+	data, ok := response["Data"].(map[string]interface{})
+	if !ok {
+		return WrapErrorf(fmt.Errorf("failed to get data from response: %v", response), DefaultErrorMsg, d.Id(), "QueryClusterInfo", AlibabaCloudSdkGoERROR)
+	}
+
+	canUpdate, ok := data["CanUpdate"].(bool)
+	if !ok {
+		return WrapErrorf(fmt.Errorf("failed to get canUpdate: %v", data), DefaultErrorMsg, d.Id(), "QueryClusterInfo", AlibabaCloudSdkGoERROR)
+	}
+	if !canUpdate {
+		oldValue, _ := d.GetChange("version_code")
+		d.SetNew("version_code", oldValue)
+		return nil
+	}
+
+	if d.Id() != "" && (d.HasChange("version_code") || d.Get("version_code").(string) == "LATEST") {
+		client := meta.(*connectivity.AliyunClient)
+		mseService := MseService{client}
+
+		object, err := mseService.DescribeMseCluster(d.Id())
+		if err != nil {
+			return WrapError(err)
+		}
+
+		log.Printf("[DEBUG] DescribeMseCluster response: %#v", object)
+
+		versionCode, ok := object["ClusterVersion"].(string)
+		if !ok || versionCode == "" {
+			return WrapErrorf(fmt.Errorf("failed to get current version, cluster info: %v", object), DefaultErrorMsg, d.Id(), "GetClusterInfo", AlibabaCloudSdkGoERROR)
+		}
+		log.Printf("[DEBUG] Current VersionCode: %s", versionCode)
+
+		getImageRequest := map[string]interface{}{
+			"VersionCode": versionCode,
+		}
+		log.Printf("[DEBUG] GetImage request: %#v", getImageRequest)
+
+		response, err := client.RpcPost("mse", "2019-05-31", "GetImage", nil, getImageRequest, false)
+		if err != nil {
+			return WrapErrorf(err, DefaultErrorMsg, d.Id(), "GetImage", AlibabaCloudSdkGoERROR)
+		}
+		log.Printf("[DEBUG] GetImage response: %#v", response)
+
+		data, ok := response["Data"].(map[string]interface{})
+		if !ok {
+			return WrapErrorf(fmt.Errorf("failed to get data from response: %v", response), DefaultErrorMsg, d.Id(), "GetImage", AlibabaCloudSdkGoERROR)
+		}
+
+		maxVersionCode, ok := data["MaxVersionCode"].(string)
+		if !ok {
+			return WrapErrorf(fmt.Errorf("failed to get maxVersionCode: %v", data), DefaultErrorMsg, d.Id(), "GetImage", AlibabaCloudSdkGoERROR)
+		}
+		log.Printf("[DEBUG] MaxVersionCode: %s", maxVersionCode)
+
+		targetVersion := d.Get("version_code").(string)
+		if targetVersion == "LATEST" {
+			d.SetNew("version_code", maxVersionCode)
+		} else if d.HasChange("version_code") {
+			if targetVersion != maxVersionCode {
+				return WrapErrorf(fmt.Errorf("can only upgrade to the latest version %s, but got %s. "+
+					"You can also set version_code to 'LATEST' to always upgrade to the latest version",
+					maxVersionCode, targetVersion), DefaultErrorMsg, d.Id(), "ValidateVersion", AlibabaCloudSdkGoERROR)
+			}
+		}
+	}
+	return nil
+}
+
 func convertMseChargeTypeToPaymentType(source interface{}) interface{} {
 	switch source {
 	case "POSTPAY":

alicloud/resource_alicloud_mse_cluster_test.go

@@ -448,6 +448,16 @@ func TestAccAliCloudMSECluster_pro(t *testing.T) {
 					}),
 				),
 			},
+			{
+				Config: testAccConfig(map[string]interface{}{
+					"version_code": "LATEST",
+				}),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheck(map[string]string{
+						"version_code": CHECKSET,
+					}),
+				),
+			},
 			{
 				ResourceName:      resourceId,
 				ImportState:       true,

website/docs/r/mse_cluster.html.markdown

@@ -4,7 +4,7 @@ layout: "alicloud"
 page_title: "Alicloud: alicloud_mse_cluster"
 sidebar_current: "docs-alicloud-resource-mse-cluster"
 description: |-
-    Provides an Alicloud MSE Cluster resource.
+  Provides an Alicloud MSE Cluster resource.
 ---
 
 # alicloud_mse_cluster
@@ -43,6 +43,7 @@ resource "alicloud_mse_cluster" "example" {
   cluster_specification = "MSE_SC_1_2_60_c"
   cluster_type          = "Nacos-Ans"
   cluster_version       = "NACOS_2_0_0"
+  version_code          = "NACOS_2_3_2_1"
   instance_count        = 3
   net_type              = "privatenet"
   pub_network_flow      = "1"
@@ -69,25 +70,26 @@ The following arguments are supported:
 * `cluster_alias_name` - (Optional, Computed) The alias of MSE Cluster.
 * `cluster_specification` - (Required) The engine specification of MSE Cluster. **NOTE:** From version 1.188.0, `cluster_specification` can be modified. If you were an international user, please use the specification version ending with `_200_c`.Valid values:
   - Professional Edition
-     - `MSE_SC_1_2_60_c`: 1C2G
-     - `MSE_SC_2_4_60_c`: 2C4G
-     - `MSE_SC_4_8_60_c`: 4C8G
-     - `MSE_SC_8_16_60_c`: 8C16G
-     - `MSE_SC_16_32_60_c`:16C32G
-     - `MSE_SC_1_2_200_c`: 1C2G
-     - `MSE_SC_2_4_200_c`: 2C4G
-     - `MSE_SC_4_8_200_c`: 4C8G
-     - `MSE_SC_8_16_200_c`: 8C16G
-     - `MSE_SC_16_32_200_c`:16C32G
+    - `MSE_SC_1_2_60_c`: 1C2G
+    - `MSE_SC_2_4_60_c`: 2C4G
+    - `MSE_SC_4_8_60_c`: 4C8G
+    - `MSE_SC_8_16_60_c`: 8C16G
+    - `MSE_SC_16_32_60_c`:16C32G
+    - `MSE_SC_1_2_200_c`: 1C2G
+    - `MSE_SC_2_4_200_c`: 2C4G
+    - `MSE_SC_4_8_200_c`: 4C8G
+    - `MSE_SC_8_16_200_c`: 8C16G
+    - `MSE_SC_16_32_200_c`:16C32G
   - Developer Edition
-     - `MSE_SC_1_2_60_c`: 1C2G
-     - `MSE_SC_2_4_60_c`: 2C4G
-     - `MSE_SC_1_2_200_c`: 1C2G
-     - `MSE_SC_2_4_200_c`: 2C4G
+    - `MSE_SC_1_2_60_c`: 1C2G
+    - `MSE_SC_2_4_60_c`: 2C4G
+    - `MSE_SC_1_2_200_c`: 1C2G
+    - `MSE_SC_2_4_200_c`: 2C4G
   - Serverless Edition
     - `MSE_SC_SERVERLESS`: Available since v1.232.0
-* `cluster_type` - (Required, ForceNew) The type of MSE Cluster. 
+* `cluster_type` - (Required, ForceNew) The type of MSE Cluster.
 * `cluster_version` - (Required, ForceNew) The version of MSE Cluster. See [details](https://www.alibabacloud.com/help/en/mse/developer-reference/api-mse-2019-05-31-createcluster)
+* `version_code` - (Optional) The version code of MSE Cluster. You can keep the instance version up to date by setting the value to `LATEST` (Available since v1.257.0).
 * `disk_type` - (Optional) The type of Disk.
 * `instance_count` - (Required) The count of instance. **NOTE:** From version 1.188.0, `instance_count` can be modified.
 * `net_type` - (Required, ForceNew) The type of network. Valid values: `privatenet` and `pubnet` and `both`(Available since v1.232.0).
@@ -99,7 +101,7 @@ The following arguments are supported:
 * `pub_slb_specification` - (Optional) The specification of public network SLB. Serverless Instance could ignore this parameter.
 * `vswitch_id` - (Optional) The id of VSwitch.
 * `mse_version` - (Optional, ForceNew, Computed, Available since v1.177.0) The version of MSE. Valid values: `mse_dev` or `mse_pro` or `mse_serverless`(Available since v1.232.0).
-* `connection_type` - (Optional, ForceNew, Available since v1.183.0) The connection type. Valid values: `slb`,`single_eni`(Available since v1.232.0). If your region is one of `ap-southeast-6、us-west-1、eu-central-1、us-east-1、ap-southeast-1`,and your cluster's mse_version is `mse_dev`,please use `single_eni`. 
+* `connection_type` - (Optional, ForceNew, Available since v1.183.0) The connection type. Valid values: `slb`,`single_eni`(Available since v1.232.0). If your region is one of `ap-southeast-6、us-west-1、eu-central-1、us-east-1、ap-southeast-1`,and your cluster's mse_version is `mse_dev`,please use `single_eni`.
 * `request_pars` - (Optional, Available since v1.183.0) The extended request parameters in the JSON format.
 * `vpc_id` - (Optional, Available since v1.185.0) The id of the VPC.