From 01fb46519b8cf73bf06c09ecf7fc197b3c55536e Mon Sep 17 00:00:00 2001 From: Andrew Garcia-Corley Date: Tue, 28 Mar 2023 10:58:33 -0600 Subject: [PATCH 1/4] Added var for service_account name --- mmv1/products/cloudbuild/Trigger.yaml | 2 ++ .../examples/cloudbuild_trigger_service_account.tf.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mmv1/products/cloudbuild/Trigger.yaml b/mmv1/products/cloudbuild/Trigger.yaml index e80a8e1bf3f8..1150f6ee0cf8 100644 --- a/mmv1/products/cloudbuild/Trigger.yaml +++ b/mmv1/products/cloudbuild/Trigger.yaml @@ -42,6 +42,8 @@ examples: - !ruby/object:Provider::Terraform::Examples name: "cloudbuild_trigger_service_account" primary_resource_id: "service-account-trigger" + vars: + sa_name: "my-service-account" - !ruby/object:Provider::Terraform::Examples name: "cloudbuild_trigger_include_build_logs" primary_resource_id: "include-build-logs-trigger" diff --git a/mmv1/templates/terraform/examples/cloudbuild_trigger_service_account.tf.erb b/mmv1/templates/terraform/examples/cloudbuild_trigger_service_account.tf.erb index 5302b6b0d825..bd175c58a764 100644 --- a/mmv1/templates/terraform/examples/cloudbuild_trigger_service_account.tf.erb +++ b/mmv1/templates/terraform/examples/cloudbuild_trigger_service_account.tf.erb @@ -15,7 +15,7 @@ resource "google_cloudbuild_trigger" "<%= ctx[:primary_resource_id] %>" { } resource "google_service_account" "cloudbuild_service_account" { - account_id = "tf-test-my-service-account" + account_id = "<%= ctx[:vars]['sa_name'] %>" } resource "google_project_iam_member" "act_as" { From 424e2cc13dbed6e7e6a7f388302f662eea19bf65 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Fri, 28 Apr 2023 12:02:06 -0700 Subject: [PATCH 2/4] Format YAML for products c-d (#7786) --- mmv1/products/cloudbuild/Trigger.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mmv1/products/cloudbuild/Trigger.yaml b/mmv1/products/cloudbuild/Trigger.yaml index 2001264f3745..45f060459b6b 100644 --- a/mmv1/products/cloudbuild/Trigger.yaml +++ b/mmv1/products/cloudbuild/Trigger.yaml @@ -40,10 +40,8 @@ examples: name: 'cloudbuild_trigger_build' primary_resource_id: 'build-trigger' - !ruby/object:Provider::Terraform::Examples - name: "cloudbuild_trigger_service_account" - primary_resource_id: "service-account-trigger" - vars: - sa_name: "my-service-account" + name: 'cloudbuild_trigger_service_account' + primary_resource_id: 'service-account-trigger' - !ruby/object:Provider::Terraform::Examples name: 'cloudbuild_trigger_include_build_logs' primary_resource_id: 'include-build-logs-trigger' From 9c49ada74a5a0d7741ac6539cc6735a653246052 Mon Sep 17 00:00:00 2001 From: Andrew Garcia-Corley Date: Mon, 1 May 2023 10:12:26 -0400 Subject: [PATCH 3/4] Fixing double to single --- mmv1/products/cloudbuild/Trigger.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmv1/products/cloudbuild/Trigger.yaml b/mmv1/products/cloudbuild/Trigger.yaml index 45f060459b6b..7911d84ce957 100644 --- a/mmv1/products/cloudbuild/Trigger.yaml +++ b/mmv1/products/cloudbuild/Trigger.yaml @@ -42,6 +42,8 @@ examples: - !ruby/object:Provider::Terraform::Examples name: 'cloudbuild_trigger_service_account' primary_resource_id: 'service-account-trigger' + vars: + sa_name: 'my-service-account' - !ruby/object:Provider::Terraform::Examples name: 'cloudbuild_trigger_include_build_logs' primary_resource_id: 'include-build-logs-trigger' From 30a798ce23b55d01f12308fc10a2045d867b6aa0 Mon Sep 17 00:00:00 2001 From: Andrew Garcia-Corley Date: Mon, 1 May 2023 12:47:45 -0400 Subject: [PATCH 4/4] Adding in test_vars_overrides due to char limit on SA name --- mmv1/products/cloudbuild/Trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/products/cloudbuild/Trigger.yaml b/mmv1/products/cloudbuild/Trigger.yaml index 7911d84ce957..947dfb1b3177 100644 --- a/mmv1/products/cloudbuild/Trigger.yaml +++ b/mmv1/products/cloudbuild/Trigger.yaml @@ -43,7 +43,7 @@ examples: name: 'cloudbuild_trigger_service_account' primary_resource_id: 'service-account-trigger' vars: - sa_name: 'my-service-account' + sa_name: 'cloud-sa' - !ruby/object:Provider::Terraform::Examples name: 'cloudbuild_trigger_include_build_logs' primary_resource_id: 'include-build-logs-trigger'