Added support for auto and deprecated automatic field in `google_…

…secret_manager_secret` resource (#8838) (#15793) * Added support for automatic_replication field in google_secret_manager_secret resource * Replaced deprecated field automatic with automatic_replication in terraform configs * Improved the deprecation_message * Changed the name of field from automatic_replication to auto * Adjusted white spaces * Added test case to cover the automatic field Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 11, 2023 · 7762094 · 7762094
1 parent bdd8862
commit 7762094
Show file tree

Hide file tree

Showing 27 changed files with 485 additions and 50 deletions.
diff --git a/.changelog/8838.txt b/.changelog/8838.txt
@@ -0,0 +1,6 @@
+```release-note:enhancement
+secretmanager: added `auto` field to `google_secret_manager_secret` resource
+```
+```release-note:deprecation
+secretmanager: deprecated `automatic` field on `google_secret_manager_secret`. Use `auto` instead.
+```
diff --git a/google/services/cloudrun/resource_cloud_run_service_generated_test.go b/google/services/cloudrun/resource_cloud_run_service_generated_test.go
@@ -306,7 +306,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "secret%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -400,7 +400,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "secret%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/cloudrun/resource_cloud_run_service_test.go b/google/services/cloudrun/resource_cloud_run_service_test.go
@@ -185,14 +185,14 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret1" {
   secret_id = "%s"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
 resource "google_secret_manager_secret" "secret2" {
   secret_id = "%s"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -309,14 +309,14 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret1" {
   secret_id = "%s"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
 resource "google_secret_manager_secret" "secret2" {
   secret_id = "%s"
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go
@@ -156,7 +156,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "secret%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -331,7 +331,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "secret%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go
@@ -152,7 +152,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "tf-test-secret-1%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -361,7 +361,7 @@ data "google_project" "project" {
 resource "google_secret_manager_secret" "secret" {
   secret_id = "tf-test-secret-1%{random_suffix}"
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/...le/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go b/...le/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go
@@ -104,7 +104,7 @@ resource "google_secret_manager_secret" "secret-basic" {
   secret_id = "tf-test-secret-name%{random_suffix}"
 
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/...le/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go b/...le/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go
@@ -183,7 +183,7 @@ resource "google_secret_manager_secret" "secret-basic" {
   secret_id = "tf-test-secret-name%{random_suffix}"
 
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/...e/services/networkservices/resource_network_services_edge_cache_service_generated_test.go b/...e/services/networkservices/resource_network_services_edge_cache_service_generated_test.go
@@ -355,7 +355,7 @@ resource "google_secret_manager_secret" "secret-basic" {
   secret_id = "tf-test-secret-name%{random_suffix}"
 
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/secretmanager/data_source_secret_manager_secret_version_access_test.go b/google/services/secretmanager/data_source_secret_manager_secret_version_access_test.go
@@ -84,7 +84,7 @@ resource "google_secret_manager_secret" "secret-basic" {
     label = "my-label"
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -114,7 +114,7 @@ resource "google_secret_manager_secret" "secret-basic" {
     label = "my-label"
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/secretmanager/data_source_secret_manager_secret_version_test.go b/google/services/secretmanager/data_source_secret_manager_secret_version_test.go
@@ -84,7 +84,7 @@ resource "google_secret_manager_secret" "secret-basic" {
     label = "my-label"
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -114,7 +114,7 @@ resource "google_secret_manager_secret" "secret-basic" {
     label = "my-label"
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 

diff --git a/google/services/secretmanager/resource_secret_manager_secret.go b/google/services/secretmanager/resource_secret_manager_secret.go
@@ -57,12 +57,42 @@ after the Secret has been created.`,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"auto": {
+							Type:        schema.TypeList,
+							Optional:    true,
+							ForceNew:    true,
+							Description: `The Secret will automatically be replicated without any restrictions.`,
+							MaxItems:    1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"customer_managed_encryption": {
+										Type:     schema.TypeList,
+										Optional: true,
+										Description: `The customer-managed encryption configuration of the Secret.
+If no configuration is provided, Google-managed default
+encryption is used.`,
+										MaxItems: 1,
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"kms_key_name": {
+													Type:        schema.TypeString,
+													Required:    true,
+													Description: `The resource name of the Cloud KMS CryptoKey used to encrypt secret payloads.`,
+												},
+											},
+										},
+									},
+								},
+							},
+							ExactlyOneOf: []string{"replication.0.automatic", "replication.0.user_managed", "replication.0.auto"},
+						},
 						"automatic": {
 							Type:         schema.TypeBool,
 							Optional:     true,
+							Deprecated:   "`automatic` is deprecated and will be removed in a future major release. Use `auto` instead.",
 							ForceNew:     true,
 							Description:  `The Secret will automatically be replicated without any restrictions.`,
-							ExactlyOneOf: []string{"replication.0.automatic", "replication.0.user_managed"},
+							ExactlyOneOf: []string{"replication.0.automatic", "replication.0.user_managed", "replication.0.auto"},
 						},
 						"user_managed": {
 							Type:        schema.TypeList,
@@ -106,7 +136,7 @@ after the Secret has been created.`,
 									},
 								},
 							},
-							ExactlyOneOf: []string{"replication.0.automatic", "replication.0.user_managed"},
+							ExactlyOneOf: []string{"replication.0.automatic", "replication.0.user_managed", "replication.0.auto"},
 						},
 					},
 				},
@@ -645,8 +675,14 @@ func flattenSecretManagerSecretReplication(v interface{}, d *schema.ResourceData
 		return nil
 	}
 	transformed := make(map[string]interface{})
-	transformed["automatic"] =
-		flattenSecretManagerSecretReplicationAutomatic(original["automatic"], d, config)
+	_, ok := d.GetOk("replication.0.automatic")
+	if ok {
+		transformed["automatic"] =
+			flattenSecretManagerSecretReplicationAutomatic(original["automatic"], d, config)
+	} else {
+		transformed["auto"] =
+			flattenSecretManagerSecretReplicationAuto(original["automatic"], d, config)
+	}
 	transformed["user_managed"] =
 		flattenSecretManagerSecretReplicationUserManaged(original["userManaged"], d, config)
 	return []interface{}{transformed}
@@ -655,6 +691,33 @@ func flattenSecretManagerSecretReplicationAutomatic(v interface{}, d *schema.Res
 	return v != nil
 }
 
+func flattenSecretManagerSecretReplicationAuto(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	transformed := make(map[string]interface{})
+	transformed["customer_managed_encryption"] =
+		flattenSecretManagerSecretReplicationAutoCustomerManagedEncryption(original["customerManagedEncryption"], d, config)
+	return []interface{}{transformed}
+}
+func flattenSecretManagerSecretReplicationAutoCustomerManagedEncryption(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["kms_key_name"] =
+		flattenSecretManagerSecretReplicationAutoCustomerManagedEncryptionKmsKeyName(original["kmsKeyName"], d, config)
+	return []interface{}{transformed}
+}
+func flattenSecretManagerSecretReplicationAutoCustomerManagedEncryptionKmsKeyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenSecretManagerSecretReplicationUserManaged(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -799,11 +862,22 @@ func expandSecretManagerSecretReplication(v interface{}, d tpgresource.Terraform
 	original := raw.(map[string]interface{})
 	transformed := make(map[string]interface{})
 
-	transformedAutomatic, err := expandSecretManagerSecretReplicationAutomatic(original["automatic"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedAutomatic); val.IsValid() && !tpgresource.IsEmptyValue(val) {
-		transformed["automatic"] = transformedAutomatic
+	if _, ok := d.GetOk("replication.0.automatic"); ok {
+		transformedAutomatic, err := expandSecretManagerSecretReplicationAutomatic(original["automatic"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedAutomatic); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["automatic"] = transformedAutomatic
+		}
+	}
+
+	if _, ok := d.GetOk("replication.0.auto"); ok {
+		transformedAuto, err := expandSecretManagerSecretReplicationAuto(original["auto"], d, config)
+		if err != nil {
+			return nil, err
+		} else {
+			transformed["automatic"] = transformedAuto
+		}
 	}
 
 	transformedUserManaged, err := expandSecretManagerSecretReplicationUserManaged(original["user_managed"], d, config)
@@ -824,6 +898,53 @@ func expandSecretManagerSecretReplicationAutomatic(v interface{}, d tpgresource.
 	return struct{}{}, nil
 }
 
+func expandSecretManagerSecretReplicationAuto(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 {
+		return nil, nil
+	}
+
+	if l[0] == nil {
+		transformed := make(map[string]interface{})
+		return transformed, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedCustomerManagedEncryption, err := expandSecretManagerSecretReplicationAutoCustomerManagedEncryption(original["customer_managed_encryption"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedCustomerManagedEncryption); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["customerManagedEncryption"] = transformedCustomerManagedEncryption
+	}
+
+	return transformed, nil
+}
+
+func expandSecretManagerSecretReplicationAutoCustomerManagedEncryption(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedKmsKeyName, err := expandSecretManagerSecretReplicationAutoCustomerManagedEncryptionKmsKeyName(original["kms_key_name"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKmsKeyName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["kmsKeyName"] = transformedKmsKeyName
+	}
+
+	return transformed, nil
+}
+
+func expandSecretManagerSecretReplicationAutoCustomerManagedEncryptionKmsKeyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandSecretManagerSecretReplicationUserManaged(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,7 @@ resource "google_secret_manager_secret" "secret-basic" { @@
       secret_id = "tf-test-secret-name%{random_suffix}"
       replication {
-        automatic = true
+        auto {}
       }
     }
@@ Expand Down @@