From fa2501ee36ed06f4620e37248450c3842c12f714 Mon Sep 17 00:00:00 2001 From: Amanda Karina Lopes de Oliveira Date: Thu, 26 Sep 2024 15:33:30 -0300 Subject: [PATCH 1/2] Bumps tf min version --- .github/workflows/lint-tf-min.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-tf-min.yaml b/.github/workflows/lint-tf-min.yaml index 9a547b7b..88ec9bbb 100644 --- a/.github/workflows/lint-tf-min.yaml +++ b/.github/workflows/lint-tf-min.yaml @@ -22,7 +22,7 @@ on: env: TFENV_VERSION: v3.0.0 - TF_DEFAULT_MIN: "0.13.7" + TF_DEFAULT_MIN: "1.3.10" concurrency: group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}' From 81474de113e95679d66be51d49afa4e756a71da4 Mon Sep 17 00:00:00 2001 From: Amanda Karina Lopes de Oliveira Date: Thu, 26 Sep 2024 15:33:58 -0300 Subject: [PATCH 2/2] Fixes metadata info, removes metadata info from envs --- 2-multitenant/envs/development/versions.tf | 4 ---- 2-multitenant/envs/nonproduction/versions.tf | 4 ---- 2-multitenant/envs/production/versions.tf | 4 ---- 2-multitenant/modules/env_baseline/versions.tf | 2 +- 3-fleetscope/envs/development/versions.tf | 4 ---- 3-fleetscope/envs/nonproduction/versions.tf | 4 ---- 3-fleetscope/envs/production/versions.tf | 4 ---- 4-appfactory/modules/app-group-baseline/versions.tf | 2 +- .../accounts-userservice/envs/development/versions.tf | 4 ---- .../accounts-userservice/envs/nonproduction/versions.tf | 4 ---- .../accounts-userservice/envs/production/versions.tf | 4 ---- .../cymbal-bank/accounts-userservice/envs/shared/versions.tf | 4 ---- 5-appinfra/apps/cymbal-bank/frontend/envs/shared/versions.tf | 4 ---- .../cymbal-bank/ledger-balancereader/envs/shared/versions.tf | 4 ---- .../ledger-ledgerwriter/envs/development/versions.tf | 4 ---- .../ledger-ledgerwriter/envs/nonproduction/versions.tf | 4 ---- .../ledger-ledgerwriter/envs/production/versions.tf | 4 ---- .../cymbal-bank/ledger-ledgerwriter/envs/shared/versions.tf | 4 ---- .../ledger-transactionhistory/envs/shared/versions.tf | 4 ---- 5-appinfra/modules/alloydb-psc-setup/versions.tf | 2 +- 5-appinfra/modules/cicd-pipeline/versions.tf | 2 +- 21 files changed, 4 insertions(+), 72 deletions(-) diff --git a/2-multitenant/envs/development/versions.tf b/2-multitenant/envs/development/versions.tf index ab78a33b..2ff08fd4 100644 --- a/2-multitenant/envs/development/versions.tf +++ b/2-multitenant/envs/development/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/2-multitenant/envs/nonproduction/versions.tf b/2-multitenant/envs/nonproduction/versions.tf index ab78a33b..2ff08fd4 100644 --- a/2-multitenant/envs/nonproduction/versions.tf +++ b/2-multitenant/envs/nonproduction/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/2-multitenant/envs/production/versions.tf b/2-multitenant/envs/production/versions.tf index ab78a33b..2ff08fd4 100644 --- a/2-multitenant/envs/production/versions.tf +++ b/2-multitenant/envs/production/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/2-multitenant/modules/env_baseline/versions.tf b/2-multitenant/modules/env_baseline/versions.tf index bfed1f2c..3c111337 100644 --- a/2-multitenant/modules/env_baseline/versions.tf +++ b/2-multitenant/modules/env_baseline/versions.tf @@ -29,6 +29,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:environments/v0.1.0" + module_name = "blueprints/terraform/terraform-google-enterprise-application:multitenant/v0.1.0" } } diff --git a/3-fleetscope/envs/development/versions.tf b/3-fleetscope/envs/development/versions.tf index d87e3167..15da754f 100644 --- a/3-fleetscope/envs/development/versions.tf +++ b/3-fleetscope/envs/development/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.6" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/3-fleetscope/envs/nonproduction/versions.tf b/3-fleetscope/envs/nonproduction/versions.tf index d87e3167..15da754f 100644 --- a/3-fleetscope/envs/nonproduction/versions.tf +++ b/3-fleetscope/envs/nonproduction/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.6" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/3-fleetscope/envs/production/versions.tf b/3-fleetscope/envs/production/versions.tf index d87e3167..15da754f 100644 --- a/3-fleetscope/envs/production/versions.tf +++ b/3-fleetscope/envs/production/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.6" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" - } } diff --git a/4-appfactory/modules/app-group-baseline/versions.tf b/4-appfactory/modules/app-group-baseline/versions.tf index fdadba73..ad690217 100644 --- a/4-appfactory/modules/app-group-baseline/versions.tf +++ b/4-appfactory/modules/app-group-baseline/versions.tf @@ -29,6 +29,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:environments/v0.0.1" + module_name = "blueprints/terraform/terraform-google-enterprise-application:appfactory/v0.0.1" } } diff --git a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/development/versions.tf b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/development/versions.tf index 42f4b523..a70be6b3 100644 --- a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/development/versions.tf +++ b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/development/versions.tf @@ -23,8 +23,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/development/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/nonproduction/versions.tf b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/nonproduction/versions.tf index daa38cf1..a70be6b3 100644 --- a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/nonproduction/versions.tf +++ b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/nonproduction/versions.tf @@ -23,8 +23,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/nonproduction/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/production/versions.tf b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/production/versions.tf index a7b4cb91..a70be6b3 100644 --- a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/production/versions.tf +++ b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/production/versions.tf @@ -23,8 +23,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/production/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/shared/versions.tf b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/shared/versions.tf index 7b8aec10..2ff08fd4 100644 --- a/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/shared/versions.tf +++ b/5-appinfra/apps/cymbal-bank/accounts-userservice/envs/shared/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/shared/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/frontend/envs/shared/versions.tf b/5-appinfra/apps/cymbal-bank/frontend/envs/shared/versions.tf index 7b8aec10..2ff08fd4 100644 --- a/5-appinfra/apps/cymbal-bank/frontend/envs/shared/versions.tf +++ b/5-appinfra/apps/cymbal-bank/frontend/envs/shared/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/shared/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-balancereader/envs/shared/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-balancereader/envs/shared/versions.tf index 7b8aec10..2ff08fd4 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-balancereader/envs/shared/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-balancereader/envs/shared/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/shared/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/development/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/development/versions.tf index fbfc4a8b..f816d341 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/development/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/development/versions.tf @@ -38,8 +38,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/development/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/nonproduction/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/nonproduction/versions.tf index daa38cf1..a70be6b3 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/nonproduction/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/nonproduction/versions.tf @@ -23,8 +23,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/nonproduction/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/production/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/production/versions.tf index a7b4cb91..a70be6b3 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/production/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/production/versions.tf @@ -23,8 +23,4 @@ terraform { version = ">= 5, < 7" } } - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/production/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/shared/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/shared/versions.tf index 7b8aec10..2ff08fd4 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/shared/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-ledgerwriter/envs/shared/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/shared/v0.1.0" - } } diff --git a/5-appinfra/apps/cymbal-bank/ledger-transactionhistory/envs/shared/versions.tf b/5-appinfra/apps/cymbal-bank/ledger-transactionhistory/envs/shared/versions.tf index 7b8aec10..2ff08fd4 100644 --- a/5-appinfra/apps/cymbal-bank/ledger-transactionhistory/envs/shared/versions.tf +++ b/5-appinfra/apps/cymbal-bank/ledger-transactionhistory/envs/shared/versions.tf @@ -16,8 +16,4 @@ terraform { required_version = ">= 1.3" - - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cymbal-bank/shared/v0.1.0" - } } diff --git a/5-appinfra/modules/alloydb-psc-setup/versions.tf b/5-appinfra/modules/alloydb-psc-setup/versions.tf index 2267f241..d08ded5f 100644 --- a/5-appinfra/modules/alloydb-psc-setup/versions.tf +++ b/5-appinfra/modules/alloydb-psc-setup/versions.tf @@ -29,6 +29,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:bootstrap/v0.1.0" + module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/alloydb-psc-setup/v0.1.0" } } diff --git a/5-appinfra/modules/cicd-pipeline/versions.tf b/5-appinfra/modules/cicd-pipeline/versions.tf index e1bf89fd..1463eab4 100644 --- a/5-appinfra/modules/cicd-pipeline/versions.tf +++ b/5-appinfra/modules/cicd-pipeline/versions.tf @@ -29,6 +29,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-enterprise-application:environments/v0.1.0" + module_name = "blueprints/terraform/terraform-google-enterprise-application:appinfra/cicd-pipeline/v0.1.0" } }