Bug Fix - TERRAFORM_ISSUE:NOSQL: Change on compartmentId of child table should be ignored

Author: Akash Mishra

internal/integrationtest/nosql_table_replica_test.go

@@ -75,6 +75,18 @@ func TestNosqlTableReplicaResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "region", "ca-montreal-1"),
 				resource.TestCheckResourceAttrSet(resourceName, "table_name_or_id"),
+				resource.TestCheckResourceAttr(resourceName, "max_write_units", "10"),
+			),
+		},
+
+		// update the max_read_units/max_write_units of the resource, the changes should be ignored
+		{
+			Config: config + compartmentIdVariableStr + NosqlTableReplicaResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_nosql_table_replica", "test_table_replica", acctest.Optional, acctest.Create, NosqlTableReplicaRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "region", "ca-montreal-1"),
+				resource.TestCheckResourceAttrSet(resourceName, "table_name_or_id"),
+				resource.TestCheckResourceAttr(resourceName, "max_write_units", "10"),
 			),
 		},
 

internal/integrationtest/nosql_table_resource_test.go

@@ -102,6 +102,9 @@ func TestNosqlTableResource_test(t *testing.T) {
 	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentIdU := utils.GetEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+
 	ondemandResourceName := "oci_nosql_table.test_ondemand"
 	ondemandDatasourceName := "data.oci_nosql_tables.test_tables"
 	ondemandSingularDatasourceName := "data.oci_nosql_table.test_ondemand"
@@ -240,7 +243,22 @@ func TestNosqlTableResource_test(t *testing.T) {
 					resource.TestCheckResourceAttr(childResourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(childResourceName, "ddl_statement", childTableDdlStatement),
 					resource.TestCheckResourceAttr(childResourceName, "name", "test_table.test_child"),
-					resource.TestCheckNoResourceAttr(childResourceName, "table_limits"),
+					resource.TestCheckResourceAttr(childResourceName, "table_limits.#", "0"),
+				),
+			},
+
+			// verify updating compartment of the child table will be ignored
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + ChildTableResourceDependencies +
+					acctest.GenerateResourceFromRepresentationMap("oci_nosql_table", "test_child", acctest.Required, acctest.Create,
+						acctest.RepresentationCopyWithNewProperties(childTableRepresentation, map[string]interface{}{
+							"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(childResourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(childResourceName, "ddl_statement", childTableDdlStatement),
+					resource.TestCheckResourceAttr(childResourceName, "name", "test_table.test_child"),
+					resource.TestCheckResourceAttr(childResourceName, "table_limits.#", "0"),
 				),
 			},
 
@@ -257,7 +275,7 @@ func TestNosqlTableResource_test(t *testing.T) {
 					resource.TestCheckResourceAttrSet(childDataResourceName, "table_collection.0.id"),
 					resource.TestCheckResourceAttr(childDataResourceName, "table_collection.0.name", "test_table.test_child"),
 					resource.TestCheckResourceAttr(childDataResourceName, "table_collection.0.state", "ACTIVE"),
-					resource.TestCheckNoResourceAttr(childDataResourceName, "table_limits"),
+					resource.TestCheckResourceAttr(childDataResourceName, "table_limits.#", "0"),
 				),
 			},
 
@@ -276,7 +294,7 @@ func TestNosqlTableResource_test(t *testing.T) {
 					resource.TestCheckResourceAttr(singularChildDatasourceName, "state", "ACTIVE"),
 					resource.TestCheckResourceAttrSet(singularChildDatasourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(singularChildDatasourceName, "time_updated"),
-					resource.TestCheckNoResourceAttr(singularChildDatasourceName, "table_limits"),
+					resource.TestCheckResourceAttr(singularChildDatasourceName, "table_limits.#", "0"),
 				),
 			},
 

internal/service/nosql/nosql_table_replica_resource.go

@@ -355,6 +355,9 @@ func (s *NosqlTableReplicaResourceCrud) Delete() error {
 }
 
 func (s *NosqlTableReplicaResourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
 	region, tableNameOrId, err := parseTableReplicaCompositeId(s.D.Id())
 	if err == nil {
 		s.D.Set("region", &region)
@@ -391,8 +394,9 @@ func parseTableReplicaCompositeId(compositeId string) (region string, tableNameO
 }
 
 func anyChangeSuppressFunction(k string, old string, new string, d *schema.ResourceData) bool {
-	if old == "" && new != "" {
+	if d.Id() == "" {
 		return false
 	}
+	log.Printf("[INFO] Replica resource doesn't support update, ignoring change to %s, k=%s, old=%s, new=%s", d.Id(), k, old, new)
 	return true
 }

internal/service/nosql/nosql_table_resource.go

@@ -33,8 +33,9 @@ func NosqlTableResource() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			// Required
 			"compartment_id": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:             schema.TypeString,
+				Required:         true,
+				DiffSuppressFunc: compartmentIdSuppressFunction,
 			},
 			"ddl_statement": {
 				Type:             schema.TypeString,
@@ -1036,3 +1037,19 @@ func tableLimitsSuppressFunction(k string, old string, new string, d *schema.Res
 	}
 	return false
 }
+
+func compartmentIdSuppressFunction(k string, old string, new string, d *schema.ResourceData) bool {
+	if tableName, ok := d.GetOkExists("name"); ok {
+		/*
+		 * Ignore changing compartmentId for child table
+		 */
+		if strings.Contains(tableName.(string), ".") {
+			if old != "" {
+				log.Printf(" Suppress compartmentId change to the child table %s from %s to %s",
+					tableName, old, new)
+			}
+			return (old != "")
+		}
+	}
+	return false
+}

website/docs/r/nosql_table.html.markdown

@@ -42,7 +42,7 @@ resource "oci_nosql_table" "test_table" {
 The following arguments are supported:
 
 * `compartment_id` - (Required) (Updatable) Compartment Identifier.
-* `ddl_statement` - (Required) (Updatable) Complete CREATE TABLE DDL statement. When update ddl_statement, it should be ALTER TABLE DDL statement.
+* `ddl_statement` - (Required) (Updatable) CREATE TABLE DDL statement. While updating an existing table, note that the column order should not be changed, and new columns can only be appended at the end of the table.
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace.  Example: `{"foo-namespace": {"bar-key": "value"}}` 
 * `freeform_tags` - (Optional) (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `is_auto_reclaimable` - (Optional) True if table can be reclaimed after an idle period.