resource/alicloud_selectdb_db_instance: Optimize creating 4.0.X instance. resource/alicloud_selectdb_db_cluster: fix config Optional scope bug. data-source/alicloud_selectdb_db_clusters: fix flavor bug in memory.

Kamosphere · Kamosphere · commit 680daea51323 · 2025-04-10T11:59:12.000+08:00
diff --git a/alicloud/data_source_alicloud_selectdb_db_clusters.go b/alicloud/data_source_alicloud_selectdb_db_clusters.go
@@ -105,7 +105,7 @@ func dataSourceAlicloudSelectDBDbClusters() *schema.Resource {
 										Computed: true,
 									},
 									"optional": {
-										Type:     schema.TypeInt,
+										Type:     schema.TypeString,
 										Computed: true,
 									},
 									"comment": {
@@ -274,7 +274,7 @@ func dataSourceAlicloudSelectDBDbClustersRead(d *schema.ResourceData, meta inter
 			temp1 := map[string]interface{}{
 				"comment":            m1["Comment"].(string),
 				"default_value":      m1["DefaultValue"].(string),
-				"optional":           m1["Optional"],
+				"optional":           m1["Optional"].(string),
 				"param_category":     m1["ParamCategory"].(string),
 				"value":              m1["Value"].(string),
 				"is_user_modifiable": m1["IsUserModifiable"],
diff --git a/alicloud/data_source_alicloud_selectdb_db_clusters_test.go b/alicloud/data_source_alicloud_selectdb_db_clusters_test.go
@@ -31,7 +31,7 @@ func TestAccAlicloudSelectDBDbClustersDataSource(t *testing.T) {
 			"clusters.0.engine":              "selectdb",
 			"clusters.0.create_time":         CHECKSET,
 			"clusters.0.cpu":                 "8",
-			"clusters.0.memory":              "64",
+			"clusters.0.memory":              "32",
 			"clusters.0.cache_size":          CHECKSET,
 			"clusters.0.region_id":           CHECKSET,
 			"clusters.0.vpc_id":              CHECKSET,
@@ -82,6 +82,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_class       = "selectdb.2xlarge"
   db_instance_description = var.name
   cache_size              = "400"
+  engine_minor_version    = "3.0.12"
   payment_type            = "PayAsYouGo"
   vpc_id                  = "${data.alicloud_vpcs.default.ids.0}"
   zone_id                 = "${data.alicloud_zones.default.ids.0}"
diff --git a/alicloud/data_source_alicloud_selectdb_db_instances_test.go b/alicloud/data_source_alicloud_selectdb_db_instances_test.go
@@ -108,6 +108,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_class       = "selectdb.2xlarge"
   db_instance_description = var.name
   cache_size              = "400"
+  engine_minor_version    = "3.0.12"
   payment_type            = "PayAsYouGo"
   vpc_id                  = "${data.alicloud_vpcs.default.ids.0}"
   zone_id                 = "${data.alicloud_zones.default.ids.0}"
diff --git a/alicloud/resource_alicloud_selectdb_db_cluster_test.go b/alicloud/resource_alicloud_selectdb_db_cluster_test.go
@@ -315,6 +315,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_class       = "selectdb.xlarge"
   db_instance_description = var.name
   cache_size              = "200"
+  engine_minor_version    = "3.0.12"
   payment_type            = "PayAsYouGo"
   vpc_id                  = data.alicloud_vswitches.default.vswitches.0.vpc_id
   zone_id                 = data.alicloud_vswitches.default.vswitches.0.zone_id
diff --git a/alicloud/resource_alicloud_selectdb_db_instance.go b/alicloud/resource_alicloud_selectdb_db_instance.go
@@ -72,6 +72,18 @@ func resourceAliCloudSelectDBDbInstance() *schema.Resource {
 				Type:     schema.TypeInt,
 				Required: true,
 			},
+			"engine_minor_version": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "3.0.12",
+				ConflictsWith: []string{"upgraded_engine_minor_version"},
+			},
+			"upgraded_engine_minor_version": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				ConflictsWith: []string{"engine_minor_version"},
+				Deprecated:    "Field `upgraded_engine_minor_version` has been deprecated from provider version 1.248.0. New field `engine_minor_version` instead.",
+			},
 			"tags": tagsSchema(),
 			// flag for public network and update
 			"enable_public_network": {
@@ -83,10 +95,6 @@ func resourceAliCloudSelectDBDbInstance() *schema.Resource {
 				Sensitive: true,
 				Optional:  true,
 			},
-			"upgraded_engine_minor_version": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
 			"desired_security_ip_lists": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -113,10 +121,6 @@ func resourceAliCloudSelectDBDbInstance() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"engine_minor_version": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"status": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -365,8 +369,14 @@ func resourceAliCloudSelectDBDbInstanceUpdate(d *schema.ResourceData, meta inter
 
 	}
 
-	if d.HasChange("upgraded_engine_minor_version") && d.Get("upgraded_engine_minor_version") != "" {
-		_, newVersion := d.GetChange("upgraded_engine_minor_version")
+	if !d.IsNewResource() && (d.HasChange("engine_minor_version") || d.HasChange("upgraded_engine_minor_version")) {
+		var newVersion interface{} = ""
+		if d.HasChange("upgraded_engine_minor_version") {
+			_, newVersion = d.GetChange("upgraded_engine_minor_version")
+		} else if d.HasChange("engine_minor_version") {
+			_, newVersion = d.GetChange("engine_minor_version")
+		}
+
 		instanceId := fmt.Sprint(d.Id())
 		instanceResp, err := selectDBService.DescribeSelectDBDbInstance(instanceId)
 		if err != nil {
@@ -409,6 +419,7 @@ func resourceAliCloudSelectDBDbInstanceUpdate(d *schema.ResourceData, meta inter
 		}
 
 		d.SetPartial("upgraded_engine_minor_version")
+		d.SetPartial("engine_minor_version")
 	}
 
 	cacheSizeModified := false
@@ -693,14 +704,20 @@ func buildSelectDBCreateInstanceRequest(d *schema.ResourceData, meta interface{}
 
 	request := map[string]interface{}{
 		"Engine":                "SelectDB",
-		"EngineVersion":         "3.0",
 		"DBInstanceClass":       d.Get("db_instance_class").(string),
 		"RegionId":              client.RegionId,
 		"ZoneId":                d.Get("zone_id").(string),
 		"VpcId":                 d.Get("vpc_id").(string),
 		"VSwitchId":             d.Get("vswitch_id").(string),
 		"DBInstanceDescription": d.Get("db_instance_description").(string),
 	}
+
+	if v, ok := d.GetOk("engine_minor_version"); ok {
+		request["EngineVersion"] = v.(string)
+	} else if v, ok := d.GetOk("upgraded_engine_minor_version"); ok {
+		request["EngineVersion"] = v.(string)
+	}
+
 	cache_size, exist := d.GetOkExists("cache_size")
 	if exist {
 		request["CacheSize"] = cache_size.(int)
diff --git a/alicloud/resource_alicloud_selectdb_db_instance_test.go b/alicloud/resource_alicloud_selectdb_db_instance_test.go
@@ -89,6 +89,7 @@ func TestAccAliCloudSelectDBDbInstance_basic_info_upgrade_major_version(t *testi
 					"db_instance_description": name,
 					"cache_size":              "200",
 					"payment_type":            "PayAsYouGo",
+					"engine_minor_version":    "3.0.12",
 					"zone_id":                 "${data.alicloud_vswitches.default.vswitches.0.zone_id}",
 					"vpc_id":                  "${data.alicloud_vswitches.default.vswitches.0.vpc_id}",
 					"vswitch_id":              "${data.alicloud_vswitches.default.vswitches.0.id}",
@@ -104,6 +105,7 @@ func TestAccAliCloudSelectDBDbInstance_basic_info_upgrade_major_version(t *testi
 						"db_instance_class":           "selectdb.xlarge",
 						"cache_size":                  "200",
 						"payment_type":                "PayAsYouGo",
+						"engine_minor_version":        "3.0.12",
 						"zone_id":                     CHECKSET,
 						"vpc_id":                      CHECKSET,
 						"vswitch_id":                  CHECKSET,
@@ -186,12 +188,11 @@ func TestAccAliCloudSelectDBDbInstance_basic_info_upgrade_major_version(t *testi
 			},
 			{
 				Config: testAccConfig(map[string]interface{}{
-					"upgraded_engine_minor_version": "4.0",
+					"engine_minor_version": "4.0.4",
 				}),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheck(map[string]string{
-						"engine_minor_version":          "4.0.4",
-						"upgraded_engine_minor_version": "4.0",
+						"engine_minor_version": "4.0.4",
 					}),
 				),
 			},
@@ -233,7 +234,7 @@ func TestAccAliCloudSelectDBDbInstance_basic_info_upgrade_major_version(t *testi
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{"security_ip_lists", "gmt_modified",
 					"instance_net_infos", "desired_security_ip_lists", "db_instance_class",
-					"enable_public_network", "upgraded_engine_minor_version", "admin_pass"},
+					"enable_public_network", "admin_pass"},
 			},
 		},
 	})
@@ -265,6 +266,7 @@ func TestAccAliCloudSelectDBDbInstance_basic_payment_modify_upgrade_minor_versio
 					"db_instance_class":       "selectdb.xlarge",
 					"db_instance_description": name,
 					"cache_size":              "200",
+					"engine_minor_version":    "4.0.3",
 					"admin_pass":              "test_123",
 					"payment_type":            "Subscription",
 					"period":                  "Month",
@@ -298,12 +300,11 @@ func TestAccAliCloudSelectDBDbInstance_basic_payment_modify_upgrade_minor_versio
 			},
 			{
 				Config: testAccConfig(map[string]interface{}{
-					"upgraded_engine_minor_version": "4.0.4",
+					"engine_minor_version": "4.0.4",
 				}),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheck(map[string]string{
-						"engine_minor_version":          "4.0.4",
-						"upgraded_engine_minor_version": "4.0.4",
+						"engine_minor_version": "4.0.4",
 					}),
 				),
 			},
@@ -321,31 +322,33 @@ func TestAccAliCloudSelectDBDbInstance_basic_payment_modify_upgrade_minor_versio
 				ResourceName:      resourceId,
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateVerifyIgnore: []string{"gmt_modified", "cache_size", "db_instance_class", "upgraded_engine_minor_version",
-					"enable_public_network", "period", "period_time", "instance_net_infos", "engine_minor_version", "admin_pass"},
+				ImportStateVerifyIgnore: []string{"gmt_modified", "cache_size", "db_instance_class",
+					"enable_public_network", "period", "period_time", "instance_net_infos", "admin_pass"},
 			},
 		},
 	})
 }
 
 var AliCloudSelectDBDbInstanceMap0 = map[string]string{
-	"db_instance_class": CHECKSET,
-	"cache_size":        CHECKSET,
-	"payment_type":      CHECKSET,
-	"zone_id":           CHECKSET,
-	"vpc_id":            CHECKSET,
-	"vswitch_id":        CHECKSET,
+	"db_instance_class":    CHECKSET,
+	"cache_size":           CHECKSET,
+	"payment_type":         CHECKSET,
+	"engine_minor_version": CHECKSET,
+	"zone_id":              CHECKSET,
+	"vpc_id":               CHECKSET,
+	"vswitch_id":           CHECKSET,
 }
 
 var AliCloudSelectDBDbInstanceMap1 = map[string]string{
-	"db_instance_class": CHECKSET,
-	"cache_size":        CHECKSET,
-	"payment_type":      CHECKSET,
-	"period":            CHECKSET,
-	"period_time":       CHECKSET,
-	"zone_id":           CHECKSET,
-	"vpc_id":            CHECKSET,
-	"vswitch_id":        CHECKSET,
+	"db_instance_class":    CHECKSET,
+	"cache_size":           CHECKSET,
+	"payment_type":         CHECKSET,
+	"engine_minor_version": CHECKSET,
+	"period":               CHECKSET,
+	"period_time":          CHECKSET,
+	"zone_id":              CHECKSET,
+	"vpc_id":               CHECKSET,
+	"vswitch_id":           CHECKSET,
 }
 
 func AliCloudSelectDBDbInstanceBasicDependence0(name string) string {
diff --git a/examples/selectdb/main.tf b/examples/selectdb/main.tf
@@ -18,6 +18,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_description = var.name
   cache_size              = 200
   payment_type            = "PayAsYouGo"
+  engine_minor_version    = "3.0.12"
   vpc_id                  = alicloud_vpc.default.id
   zone_id                 = data.alicloud_zones.default.zones.0.id
   vswitch_id              = alicloud_vswitches.default.id
diff --git a/website/docs/d/selectdb_db_clusters.html.markdown b/website/docs/d/selectdb_db_clusters.html.markdown
@@ -40,6 +40,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_description = var.name
   cache_size              = 200
   payment_type            = "PayAsYouGo"
+  engine_minor_version    = "3.0.12"
   vpc_id                  = data.alicloud_vswitches.default.vswitches.0.vpc_id
   zone_id                 = data.alicloud_vswitches.default.vswitches.0.zone_id
   vswitch_id              = data.alicloud_vswitches.default.vswitches.0.id
diff --git a/website/docs/d/selectdb_db_instances.html.markdown b/website/docs/d/selectdb_db_instances.html.markdown
@@ -40,6 +40,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_description = var.name
   cache_size              = 200
   payment_type            = "PayAsYouGo"
+  engine_minor_version    = "3.0.12"
   vpc_id                  = data.alicloud_vswitches.default.vswitches.0.vpc_id
   zone_id                 = data.alicloud_vswitches.default.vswitches.0.zone_id
   vswitch_id              = data.alicloud_vswitches.default.vswitches.0.id
diff --git a/website/docs/r/selectdb_db_cluster.html.markdown b/website/docs/r/selectdb_db_cluster.html.markdown
@@ -49,6 +49,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_description = var.name
   cache_size              = 200
   payment_type            = "PayAsYouGo"
+  engine_minor_version    = "3.0.12"
   vpc_id                  = data.alicloud_vswitches.default.vswitches.0.vpc_id
   zone_id                 = data.alicloud_vswitches.default.vswitches.0.zone_id
   vswitch_id              = data.alicloud_vswitches.default.vswitches.0.id
@@ -95,7 +96,6 @@ The following attributes are exported:
 * `status` - The current status of the resource.
 * `cpu` - The cpu resource amount of DBCluster. Depends on `db_cluster_class`.
 * `memory` - The memory resource amount of DBCluster. Depends on `db_cluster_class`.
-* `cache_size` - The cache size of DBCluster.
 * `region_id` - The ID of region for the cluster.
 * `zone_id` - The ID of zone for the cluster.
 * `vpc_id` - The ID of the VPC for the cluster.
diff --git a/website/docs/r/selectdb_db_instance.html.markdown b/website/docs/r/selectdb_db_instance.html.markdown
@@ -48,6 +48,7 @@ resource "alicloud_selectdb_db_instance" "default" {
   db_instance_description = var.name
   cache_size              = 200
   payment_type            = "PayAsYouGo"
+  engine_minor_version    = "3.0.12"
   vpc_id                  = data.alicloud_vswitches.default.vswitches.0.vpc_id
   zone_id                 = data.alicloud_vswitches.default.vswitches.0.zone_id
   vswitch_id              = data.alicloud_vswitches.default.vswitches.0.id
@@ -63,13 +64,14 @@ The following arguments are supported:
 * `cache_size` - (Required) The cache size in DBInstance on creating default cluster. The number should be divided by 100.
 * `payment_type` - (Required) The payment type of the resource. Valid values: `PayAsYouGo`,`Subscription`.
 * `db_instance_description` - (Required) The DBInstance description.
+* `engine_minor_version` - (Optional, Available since 1.248.0) The DBInstance minor version. Valid values: `3.0.12`,`4.0.4`.
+* `upgraded_engine_minor_version` - (Deprecated since 1.248.0) Field `upgraded_engine_minor_version` has been deprecated from provider version 1.248.0. New field `engine_minor_version` instead.
 * `period` - (Optional) It is valid when payment_type is `Subscription`. Valid values are `Year`, `Month`.
 * `period_time` - (Optional) The duration that you will buy DBInstance. It is valid when payment_type is `Subscription`. Valid values: [1~9], 12, 24, 36.
 * `zone_id` - (Required, ForceNew) The ID of zone for DBInstance.
 * `vpc_id` - (Required, ForceNew) The ID of the VPC for DBInstance.
 * `vswitch_id` - (Required, ForceNew) The ID of vswitch for DBInstance.
 * `enable_public_network` - (Optional) If DBInstance need to open public network, set it to `true`.
-* `upgraded_engine_minor_version` - (Optional) The DBInstance minor version want to upgraded to. (Available since 1.245.0) Can be set to `4.0` in creating SelectDB 4.0 DBInstance.
 * `admin_pass` - (Optional, Available since 1.245.0) The password for DBInstance using admin account.
 * `tags` - (Optional) A mapping of tags to assign to the resource.
   - Key: It can be up to 64 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It cannot be a null string.
@@ -90,7 +92,6 @@ The following attributes are exported:
 * `id` - The resource ID in terraform of DBInstance. 
 * `region_id` - The region ID of the instance.
 * `engine` - The engine of DBInstance. Always `selectdb`.
-* `engine_minor_version` - The current DBInstance minor version.
 * `status` - The status of the resource. Valid values: `ACTIVATION`,`STOPPED`,`STARTING`,`RESTART`.
 * `cpu_prepaid` - The sum of cpu resource amount for every `Subscription` clusters in DBInstance.
 * `memory_prepaid` - The sum of memory resource amount offor every `Subscription` clusters in DBInstance.
