Don't read kms_key_names if kms_key_name is set

GoogleCloudPlatform · Oct 8, 2024 · 95d98d7 · 95d98d7
1 parent 3b28000
commit 95d98d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mmv1/templates/terraform/custom_flatten/spanner_database_kms_key_names.go.tmpl b/mmv1/templates/terraform/custom_flatten/spanner_database_kms_key_names.go.tmpl
@@ -1,4 +1,10 @@
 func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+   // Api returns `kms_key_names` if `kms_key_names` is set but we can ignore
+	_, kmsNameSet := d.GetOk("encryption_config.0.kms_key_name")
+    if kmsNameSet {
+        return nil
+    }
+
 	rawConfigValue := d.Get("encryption_config.0.kms_key_names")
 
 	// Convert config value to []string

diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.tmpl b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.tmpl
@@ -539,7 +539,7 @@ func TestAccSpannerDatabase_cmek(t *testing.T) {
 				ResourceName:            "google_spanner_database.database",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"ddl", "deletion_protection"},
+				ImportStateVerifyIgnore: []string{"ddl", "deletion_protection", "encryption_config.0.kms_key_names"},
 			},
 		},
 	})