Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed the automatic field from the google_secret_manager_secret resource #8859

17 changes: 2 additions & 15 deletions mmv1/products/secretmanager/Secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,17 @@ properties:
name: replication
required: true
immutable: true
custom_expand: templates/terraform/custom_expand/secret_manager_replication.go.erb
custom_flatten: templates/terraform/custom_flatten/secret_manager_replication.go.erb
description: |
The replication policy of the secret data attached to the Secret. It cannot be changed
after the Secret has been created.
properties:
- !ruby/object:Api::Type::Boolean
name: automatic
immutable: true
exactly_one_of:
- replication.0.automatic
- replication.0.user_managed
- replication.0.auto
deprecation_message: >-
`automatic` is deprecated and will be removed in a future major release. Use `auto` instead.
description: |
The Secret will automatically be replicated without any restrictions.
- !ruby/object:Api::Type::NestedObject
name: auto
api_name: automatic
immutable: true
allow_empty_object: true
send_empty_value: true
exactly_one_of:
- replication.0.automatic
- replication.0.user_managed
- replication.0.auto
description: |
Expand All @@ -161,7 +149,6 @@ properties:
name: userManaged
immutable: true
exactly_one_of:
- replication.0.automatic
- replication.0.user_managed
- replication.0.auto
description: |
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,6 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) {
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccCheckSecretManagerSecretDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccSecretMangerSecret_automaticBasic(context),
},
{
ResourceName: "google_secret_manager_secret.secret-basic",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"ttl", "replication.0.automatic", "replication.0.auto"},
},
{
Config: testAccSecretMangerSecret_automaticCmekBasic(context),
},
Expand Down Expand Up @@ -698,38 +689,6 @@ resource "google_secret_manager_secret" "secret-basic" {
`, context)
}

func testAccSecretMangerSecret_automaticBasic(context map[string]interface{}) string {
return acctest.Nprintf(`
data "google_project" "project" {
project_id = "%{pid}"
}
resource "google_kms_crypto_key_iam_member" "kms-secret-binding-1" {
crypto_key_id = "%{kms_key_name_1}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-secretmanager.iam.gserviceaccount.com"
}
resource "google_kms_crypto_key_iam_member" "kms-secret-binding-2" {
crypto_key_id = "%{kms_key_name_2}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-secretmanager.iam.gserviceaccount.com"
}
resource "google_secret_manager_secret" "secret-basic" {
secret_id = "tf-test-secret-%{random_suffix}"

labels = {
label = "my-label"
}
replication {
automatic = true
}
depends_on = [
google_kms_crypto_key_iam_member.kms-secret-binding-1,
google_kms_crypto_key_iam_member.kms-secret-binding-2,
]
}
`, context)
}

func testAccSecretMangerSecret_automaticCmekBasic(context map[string]interface{}) string {
return acctest.Nprintf(`
data "google_project" "project" {
Expand Down