Bug Fix - [mysql] Terraform support DbSystem change shape without ForceNew

Author: Terraform Team Automation

internal/integrationtest/mysql_mysql_backup_test.go

@@ -68,8 +68,7 @@ var (
 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
 		MysqlMysqlConfigurationResourceConfig +
 		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_backup_db_system", acctest.Required, acctest.Create, MysqlMysqlDbSystemRepresentation) +
-		AvailabilityDomainConfig +
-		DefinedTagsDependencies
+		AvailabilityDomainConfig
 )
 
 // issue-routing-tag: mysql/default

internal/integrationtest/mysql_mysql_configuration_test.go

@@ -149,6 +149,7 @@ var (
 	}
 
 	MysqlMysqlConfigurationResourceDependencies = utils.MysqlConfigurationIdVariable +
+		utils.MysqlConfigurationIdVariableE3_2_32_OCID +
 		DefinedTagsDependencies
 )
 

internal/integrationtest/mysql_mysql_db_system_resource_test.go

@@ -79,6 +79,17 @@ var (
 		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{"defined_tags"}},
 	}
 
+	mysqlDbSystemRepresentationShapeAndConfigUpdate = map[string]interface{}{
+		"admin_password":          acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
+		"admin_username":          acctest.Representation{RepType: acctest.Required, Create: `adminUser`},
+		"availability_domain":     acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"compartment_id":          acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"configuration_id":        acctest.Representation{RepType: acctest.Optional, Create: `${var.MysqlConfigurationOCID[var.region]}`, Update: `${var.MysqlConfigurationE3_2_32_OCID[var.region]}`},
+		"shape_name":              acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`, Update: `MySQL.VM.Standard.E3.2.32GB`},
+		"subnet_id":               acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
+		"data_storage_size_in_gb": acctest.Representation{RepType: acctest.Required, Create: `50`},
+	}
+
 	MysqlDbSystemSourceBackupResourceDependencies = MysqlMysqlDbSystemResourceDependencies + utils.MysqlHAConfigurationIdVariable +
 		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_backup", "test_mysql_backup", acctest.Required, acctest.Create, MysqlMysqlBackupRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_backup_db_system", acctest.Required, acctest.Create, MysqlMysqlDbSystemRepresentation)
@@ -590,8 +601,8 @@ func TestMysqlMysqlDbSystemResource_HA_enable(t *testing.T) {
 }
 
 // issue-routing-tag: mysql/default
-func TestMysqlMysqlDbSystemResource_configurationId(t *testing.T) {
-	httpreplay.SetScenario("TestMysqlMysqlDbSystemResource_configurationId")
+func TestMysqlMysqlDbSystemResource_updateConfigurationIdAndShape(t *testing.T) {
+	httpreplay.SetScenario("TestMysqlMysqlDbSystemResource_updateConfigurationIdAndShape")
 	defer httpreplay.SaveScenario()
 
 	config := acctest.ProviderTestConfig()
@@ -603,42 +614,42 @@ func TestMysqlMysqlDbSystemResource_configurationId(t *testing.T) {
 
 	var resId, resId2 string
 
-	updatedRepresentation := acctest.GetUpdatedRepresentationCopy("configuration_id",
-		acctest.Representation{RepType: acctest.Optional, Create: `${var.MysqlConfigurationOCID[var.region]}`, Update: `${var.MysqlHAConfigurationOCID[var.region]}`},
-		acctest.RepresentationCopyWithNewProperties(MysqlMysqlDbSystemRepresentation, map[string]interface{}{
-			"backup_policy": acctest.RepresentationGroup{RepType: acctest.Optional, Group: MysqlDbSystemBackupPolicyNotUpdateableRepresentation},
-		}))
-
 	// would be nice to make this look up work, but since this is terraform syntax we can't evaluate it.
 	// Luckily configs are realm wide and the ocid will be the same across all regions. We should remove the map
 	// at some point.
 	// mysqlConfigurationOCIDVal := `${var.MysqlConfigurationOCID[var.region]}`
-	// mysqlHAConfigurationOCIDVal := `${var.MysqlHAConfigurationOCID[var.region]}`
+	// change configuration and shape from
+	// MySQL.VM.Standard.E3.1.8GB.Standalone
 	mysqlConfigurationOCIDVal := "ocid1.mysqlconfiguration.oc1..aaaaaaaalwzc2a22xqm56fwjwfymixnulmbq3v77p5v4lcbb6qhkftxf2trq"
-	mysqlHAConfigurationOCIDVal := "ocid1.mysqlconfiguration.oc1..aaaaaaaantprksu6phqfgr5xvyut46wdfesdszonbclybfwvahgysfjbrb4q"
+	// to
+	// mysqlConfigurationOCIDVal2 := `${var.MysqlConfigurationE3_2_32_OCID[var.region]}`
+	// MySQL.VM.Standard.E3.2.32GB.Standalone
+	mysqlConfigurationE3_2_32_OCIDVal := "ocid1.mysqlconfiguration.oc1..aaaaaaaakremacvh2fizcznnja5rdxry2q4nyn27afjblyrimzjmrqblhfwa"
 
 	// NOTE: for now this test has to be separate from TestMysqlMysqlDbSystemResource_HA because the configuration and is_highly_available fields
 	// cannot be changed at the same time.  Once that is fixed, we should consolidate these two test cases
 	acctest.ResourceTest(t, nil, []resource.TestStep{
 		// verify standalone Create
 		{
-			Config: config + compartmentIdVariableStr + MysqlDbSystemSourceBackupResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Create, updatedRepresentation),
+			Config: config + compartmentIdVariableStr + MysqlMysqlDbSystemResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Create, mysqlDbSystemRepresentationShapeAndConfigUpdate),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "configuration_id", mysqlConfigurationOCIDVal),
+				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.1.8GB"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
 					return err
 				},
 			),
 		},
-		// verify update to HA enabled configuration
+		// verify update to new configuration and shape
 		{
-			Config: config + compartmentIdVariableStr + MysqlDbSystemSourceBackupResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Update, updatedRepresentation),
+			Config: config + compartmentIdVariableStr + MysqlMysqlDbSystemResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Update, mysqlDbSystemRepresentationShapeAndConfigUpdate),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "configuration_id", mysqlHAConfigurationOCIDVal),
+				resource.TestCheckResourceAttr(resourceName, "configuration_id", mysqlConfigurationE3_2_32_OCIDVal),
+				resource.TestCheckResourceAttr(resourceName, "shape_name", "MySQL.VM.Standard.E3.2.32GB"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")

internal/integrationtest/mysql_mysql_db_system_test.go

@@ -123,8 +123,7 @@ var (
 		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
 		AvailabilityDomainConfig +
-		MysqlMysqlVersionResourceConfig +
-		DefinedTagsDependencies
+		MysqlMysqlVersionResourceConfig
 )
 
 // issue-routing-tag: mysql/default

internal/service/mysql/mysql_mysql_db_system_resource.go

@@ -50,7 +50,6 @@ func MysqlMysqlDbSystemResource() *schema.Resource {
 			"shape_name": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"subnet_id": {
 				Type:     schema.TypeString,
@@ -1030,6 +1029,11 @@ func (s *MysqlMysqlDbSystemResourceCrud) Update() error {
 		}
 	}
 
+	if shapeName, ok := s.D.GetOkExists("shape_name"); ok && s.D.HasChange("shape_name") {
+		tmp := shapeName.(string)
+		request.ShapeName = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "mysql")
 
 	_, err := s.Client.UpdateDbSystem(context.Background(), request)

internal/utils/helpers.go

@@ -79,7 +79,16 @@ const (
 		us-phoenix-1 = "ocid1.mysqlconfiguration.oc1..aaaaaaaalwzc2a22xqm56fwjwfymixnulmbq3v77p5v4lcbb6qhkftxf2trq"
 	  }
 	}
-    `
+ 	`
+	MysqlConfigurationIdVariableE3_2_32_OCID = `
+	variable "MysqlConfigurationE3_2_32_OCID" {
+	  type = "map"
+	  default = {
+		us-ashburn-1 = "ocid1.mysqlconfiguration.oc1..aaaaaaaakremacvh2fizcznnja5rdxry2q4nyn27afjblyrimzjmrqblhfwa"
+		us-phoenix-1 = "ocid1.mysqlconfiguration.oc1..aaaaaaaakremacvh2fizcznnja5rdxry2q4nyn27afjblyrimzjmrqblhfwa"
+	  }
+	}
+   `
 	MysqlHAConfigurationIdVariable = `
 	variable "MysqlHAConfigurationOCID" {
 		type = "map"

website/docs/r/mysql_mysql_db_system.html.markdown

@@ -105,9 +105,9 @@ The following arguments are supported:
 
 		At some point in the window, the system may incur a brief service disruption as the backup is performed. 
 * `compartment_id` - (Required) The OCID of the compartment.
-* `configuration_id` - (Optional) The OCID of the Configuration to be used for this DB System.
+* `configuration_id` - (Optional) (Updatable) The OCID of the Configuration to be used for this DB System.
 * `crash_recovery` - (Optional) (Updatable) Whether to run the DB System with InnoDB Redo Logs and the Double Write Buffer enabled or disabled, and whether to enable or disable syncing of the Binary Logs. 
-* `data_storage_size_in_gb` - (Optional) Initial size of the data volume in GBs that will be created and attached. Keep in mind that this only specifies the size of the database data volume, the log volume for the database will be scaled appropriately with its shape. It is required if you are creating a new database. It cannot be set if you are creating a database from a backup.
+* `data_storage_size_in_gb` - (Optional) (Updatable) Initial size of the data volume in GBs that will be created and attached. Keep in mind that this only specifies the size of the database data volume, the log volume for the database will be scaled appropriately with its shape. It is required if you are creating a new database. It cannot be set if you are creating a database from a backup.
 * `defined_tags` - (Optional) (Updatable) Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}` 
 * `deletion_policy` - (Optional) (Updatable) Policy for how the DB System and related resources should be handled at the time of its deletion. 
 	* `automatic_backup_retention` - (Optional) (Updatable) Specifies if any automatic backups created for a DB System should be retained or deleted when the DB System is deleted. 
@@ -140,7 +140,7 @@ The following arguments are supported:
 		"{time-of-day}" is the "Time" portion of an RFC3339-formatted timestamp. Any second or sub-second time data will be truncated to zero. 
 * `port` - (Optional) The port for primary endpoint of the DB System to listen on.
 * `port_x` - (Optional) The TCP network port on which X Plugin listens for connections. This is the X Plugin equivalent of port. 
-* `shape_name` - (Required) The name of the shape. The shape determines the resources allocated
+* `shape_name` - (Required) (Updatable) The name of the shape. The shape determines the resources allocated
 	* CPU cores and memory for VM shapes; CPU cores, memory and storage for non-VM (or bare metal) shapes. To get a list of shapes, use the [ListShapes](https://docs.cloud.oracle.com/iaas/api/#/en/mysql/20190415/ShapeSummary/ListShapes) operation. 
 * `source` - (Optional) Parameters detailing how to provision the initial data of the system. 
 	* `backup_id` - (Required when source_type=BACKUP) The OCID of the backup to be used as the source for the new DB System.