Skip to content

Commit a63b21f

Browse files
authored
Removed the automatic field from the google_secret_manager_secret resource (#8859)
1 parent 11a4b1c commit a63b21f

File tree

4 files changed

+2
-354
lines changed

4 files changed

+2
-354
lines changed

mmv1/products/secretmanager/Secret.yaml

+2-15
Original file line numberDiff line numberDiff line change
@@ -117,29 +117,17 @@ properties:
117117
name: replication
118118
required: true
119119
immutable: true
120-
custom_expand: templates/terraform/custom_expand/secret_manager_replication.go.erb
121-
custom_flatten: templates/terraform/custom_flatten/secret_manager_replication.go.erb
122120
description: |
123121
The replication policy of the secret data attached to the Secret. It cannot be changed
124122
after the Secret has been created.
125123
properties:
126-
- !ruby/object:Api::Type::Boolean
127-
name: automatic
128-
immutable: true
129-
exactly_one_of:
130-
- replication.0.automatic
131-
- replication.0.user_managed
132-
- replication.0.auto
133-
deprecation_message: >-
134-
`automatic` is deprecated and will be removed in a future major release. Use `auto` instead.
135-
description: |
136-
The Secret will automatically be replicated without any restrictions.
137124
- !ruby/object:Api::Type::NestedObject
138125
name: auto
139126
api_name: automatic
140127
immutable: true
128+
allow_empty_object: true
129+
send_empty_value: true
141130
exactly_one_of:
142-
- replication.0.automatic
143131
- replication.0.user_managed
144132
- replication.0.auto
145133
description: |
@@ -161,7 +149,6 @@ properties:
161149
name: userManaged
162150
immutable: true
163151
exactly_one_of:
164-
- replication.0.automatic
165152
- replication.0.user_managed
166153
- replication.0.auto
167154
description: |

mmv1/templates/terraform/custom_expand/secret_manager_replication.go.erb

-180
This file was deleted.

mmv1/templates/terraform/custom_flatten/secret_manager_replication.go.erb

-118
This file was deleted.

mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb

-41
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,6 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) {
234234
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
235235
CheckDestroy: testAccCheckSecretManagerSecretDestroyProducer(t),
236236
Steps: []resource.TestStep{
237-
{
238-
Config: testAccSecretMangerSecret_automaticBasic(context),
239-
},
240-
{
241-
ResourceName: "google_secret_manager_secret.secret-basic",
242-
ImportState: true,
243-
ImportStateVerify: true,
244-
ImportStateVerifyIgnore: []string{"ttl", "replication.0.automatic", "replication.0.auto"},
245-
},
246237
{
247238
Config: testAccSecretMangerSecret_automaticCmekBasic(context),
248239
},
@@ -698,38 +689,6 @@ resource "google_secret_manager_secret" "secret-basic" {
698689
`, context)
699690
}
700691

701-
func testAccSecretMangerSecret_automaticBasic(context map[string]interface{}) string {
702-
return acctest.Nprintf(`
703-
data "google_project" "project" {
704-
project_id = "%{pid}"
705-
}
706-
resource "google_kms_crypto_key_iam_member" "kms-secret-binding-1" {
707-
crypto_key_id = "%{kms_key_name_1}"
708-
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
709-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-secretmanager.iam.gserviceaccount.com"
710-
}
711-
resource "google_kms_crypto_key_iam_member" "kms-secret-binding-2" {
712-
crypto_key_id = "%{kms_key_name_2}"
713-
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
714-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-secretmanager.iam.gserviceaccount.com"
715-
}
716-
resource "google_secret_manager_secret" "secret-basic" {
717-
secret_id = "tf-test-secret-%{random_suffix}"
718-
719-
labels = {
720-
label = "my-label"
721-
}
722-
replication {
723-
automatic = true
724-
}
725-
depends_on = [
726-
google_kms_crypto_key_iam_member.kms-secret-binding-1,
727-
google_kms_crypto_key_iam_member.kms-secret-binding-2,
728-
]
729-
}
730-
`, context)
731-
}
732-
733692
func testAccSecretMangerSecret_automaticCmekBasic(context map[string]interface{}) string {
734693
return acctest.Nprintf(`
735694
data "google_project" "project" {

0 commit comments

Comments
 (0)