From d7dae1da08b707989637547c773588b5be4a1f6a Mon Sep 17 00:00:00 2001 From: Aleksandr Averbukh Date: Wed, 1 Mar 2023 10:33:08 +0100 Subject: [PATCH 1/4] Add missing tfvars template to the tfc blueprint --- .../terraform.auto.tfvars.template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template diff --git a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template new file mode 100644 index 00000000..2d2167a3 --- /dev/null +++ b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template @@ -0,0 +1,18 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +billing_account = "015647-1A8CBC-A002D9" +parent = "folders/0123456789" +tfc_organization_id = "org-W3bx9naazHrUz99U" +tfc_workspace_id = "ws-2GnGJtqTfvxKptHn" From 2d9dd5071c3c7ac2a6c1144dbc9f2391edf08a86 Mon Sep 17 00:00:00 2001 From: Aleksandr Averbukh Date: Wed, 1 Mar 2023 10:42:39 +0100 Subject: [PATCH 2/4] Add more explicit template --- .../terraform.auto.tfvars.template | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template index 2d2167a3..918d8375 100644 --- a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template +++ b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template @@ -16,3 +16,13 @@ billing_account = "015647-1A8CBC-A002D9" parent = "folders/0123456789" tfc_organization_id = "org-W3bx9naazHrUz99U" tfc_workspace_id = "ws-2GnGJtqTfvxKptHn" + +billing_account = "xxx" +project_create = false +project_id = "xxx" +parent = "organizations/xxx" +tfc_organization_id = "org-xxxxxxxxxxxxx" +tfc_workspace_id = "ws-xxxxxxxxxxxxx" +workload_identity_pool_id = "tfc-pool" +workload_identity_pool_provider_id = "tfc-provider" +issuer_uri = "https://app.terraform.io/" \ No newline at end of file From b7418353be9c1a54d9fb48cd4248f7c5957e6338 Mon Sep 17 00:00:00 2001 From: Aleksandr Averbukh Date: Wed, 1 Mar 2023 10:43:32 +0100 Subject: [PATCH 3/4] Missing newline --- .../terraform.auto.tfvars.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template index 918d8375..327a51d6 100644 --- a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template +++ b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template @@ -25,4 +25,4 @@ tfc_organization_id = "org-xxxxxxxxxxxxx" tfc_workspace_id = "ws-xxxxxxxxxxxxx" workload_identity_pool_id = "tfc-pool" workload_identity_pool_provider_id = "tfc-provider" -issuer_uri = "https://app.terraform.io/" \ No newline at end of file +issuer_uri = "https://app.terraform.io/" From b4a8a37805476963cab45f8ebadd6434b0482076 Mon Sep 17 00:00:00 2001 From: Aleksandr Averbukh Date: Wed, 1 Mar 2023 11:34:37 +0100 Subject: [PATCH 4/4] Fix tfvars template --- .../terraform.auto.tfvars.template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template index 327a51d6..57787bf9 100644 --- a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template +++ b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/terraform.auto.tfvars.template @@ -12,11 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -billing_account = "015647-1A8CBC-A002D9" -parent = "folders/0123456789" -tfc_organization_id = "org-W3bx9naazHrUz99U" -tfc_workspace_id = "ws-2GnGJtqTfvxKptHn" - billing_account = "xxx" project_create = false project_id = "xxx"