From 28375f99d32283ab4545da06066aca3f7e4df63d Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Thu, 9 Mar 2023 13:07:41 +0100 Subject: [PATCH 1/3] If not specified, a default service agent SA is returned --- mmv1/products/workstations/terraform.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mmv1/products/workstations/terraform.yaml b/mmv1/products/workstations/terraform.yaml index fa966c7473f8..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 From 3a4906f94e5f769fb2fe420a3036dd58f5ee6545 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 10 Mar 2023 22:14:44 +0100 Subject: [PATCH 2/3] Revert "Skip TestAccWorkstationsWorkstationConfig_workstationConfigEncryptionKeyExample" This reverts commit 097bdbef337f4df402e81b4583994a779f63063d. --- mmv1/products/workstations/terraform.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/mmv1/products/workstations/terraform.yaml b/mmv1/products/workstations/terraform.yaml index 4c7bb0884361..7e68819c8f7f 100644 --- a/mmv1/products/workstations/terraform.yaml +++ b/mmv1/products/workstations/terraform.yaml @@ -107,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" From 47a24073f26f7169e3f314eda8984dbced09b581 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Tue, 14 Mar 2023 11:03:56 +0100 Subject: [PATCH 3/3] remove `rotation_period` --- .../terraform/examples/workstation_config_encryption_key.tf.erb | 1 - 1 file changed, 1 deletion(-) 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 }