diff --git a/mmv1/products/workstations/terraform.yaml b/mmv1/products/workstations/terraform.yaml index 29243ead461f..7e68819c8f7f 100644 --- a/mmv1/products/workstations/terraform.yaml +++ b/mmv1/products/workstations/terraform.yaml @@ -50,6 +50,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides host.gceInstance.bootDiskSizeGb: !ruby/object:Overrides::Terraform::PropertyOverride default_from_api: true + host.gceInstance.serviceAccount: + !ruby/object:Overrides::Terraform::PropertyOverride + default_from_api: true host.gceInstance.machineType: !ruby/object:Overrides::Terraform::PropertyOverride default_from_api: true @@ -104,8 +107,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides name: "workstation_config_encryption_key" min_version: beta primary_resource_id: "default" - # TODO: https://github.com/hashicorp/terraform-provider-google/issues/13923 - skip_test: true vars: account_id: "my-account" workstation_cluster_name: "workstation-cluster" diff --git a/mmv1/templates/terraform/examples/workstation_config_encryption_key.tf.erb b/mmv1/templates/terraform/examples/workstation_config_encryption_key.tf.erb index c600de7a5532..c734fe83ca01 100644 --- a/mmv1/templates/terraform/examples/workstation_config_encryption_key.tf.erb +++ b/mmv1/templates/terraform/examples/workstation_config_encryption_key.tf.erb @@ -37,7 +37,6 @@ resource "google_kms_key_ring" "default" { resource "google_kms_crypto_key" "default" { name = "<%= ctx[:vars]['workstation_cluster_name'] %>" key_ring = google_kms_key_ring.default.id - rotation_period = "100000s" provider = google-beta }