diff --git a/fast/stage-links.sh b/fast/stage-links.sh index 102252d6..fb35797e 100755 --- a/fast/stage-links.sh +++ b/fast/stage-links.sh @@ -42,7 +42,7 @@ else CP_CMD="cp $1" fi -GLOBALS="tfvars/globals.auto.tfvars.json" +GLOBALS="tfvars/0-globals.auto.tfvars.json" PROVIDER_CMD=$CMD STAGE_NAME=$(basename "$(pwd)") diff --git a/fast/stages-multitenant/0-bootstrap-tenant/README.md b/fast/stages-multitenant/0-bootstrap-tenant/README.md index 96747b21..46b66515 100644 --- a/fast/stages-multitenant/0-bootstrap-tenant/README.md +++ b/fast/stages-multitenant/0-bootstrap-tenant/README.md @@ -74,7 +74,7 @@ The script output can be copy/pasted to a terminal: # copy and paste the following commands for '0-bootstrap-tenant' cp ~/fast-config/providers/0-bootstrap-tenant-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ @@ -158,7 +158,7 @@ Once the configuration is done just go through the usual `init/apply` cycle. On This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`automation-project`, `log-export-project`) - apply using `-target`, for example `terraform apply -target 'module.automation-project.google_project.project[0]'` diff --git a/fast/stages-multitenant/0-bootstrap-tenant/outputs.tf b/fast/stages-multitenant/0-bootstrap-tenant/outputs.tf index 883acac9..2a6f563e 100644 --- a/fast/stages-multitenant/0-bootstrap-tenant/outputs.tf +++ b/fast/stages-multitenant/0-bootstrap-tenant/outputs.tf @@ -33,7 +33,7 @@ locals { tf_var_files = [ "0-bootstrap.auto.tfvars.json", "1-resman.auto.tfvars.json", - "globals.auto.tfvars.json" + "0-globals.auto.tfvars.json" ] } : { diff --git a/fast/stages/0-bootstrap/cicd.tf b/fast/stages/0-bootstrap/cicd.tf index 96839ec3..4c8615fe 100644 --- a/fast/stages/0-bootstrap/cicd.tf +++ b/fast/stages/0-bootstrap/cicd.tf @@ -58,7 +58,7 @@ locals { bootstrap = [] resman = [ "0-bootstrap.auto.tfvars.json", - "globals.auto.tfvars.json" + "0-globals.auto.tfvars.json" ] } } diff --git a/fast/stages/0-bootstrap/outputs-files.tf b/fast/stages/0-bootstrap/outputs-files.tf index 90e195b5..427f858b 100644 --- a/fast/stages/0-bootstrap/outputs-files.tf +++ b/fast/stages/0-bootstrap/outputs-files.tf @@ -33,7 +33,7 @@ resource "local_file" "tfvars" { resource "local_file" "tfvars_globals" { for_each = var.outputs_location == null ? {} : { 1 = 1 } file_permission = "0644" - filename = "${try(pathexpand(var.outputs_location), "")}/tfvars/globals.auto.tfvars.json" + filename = "${try(pathexpand(var.outputs_location), "")}/tfvars/0-globals.auto.tfvars.json" content = jsonencode(local.tfvars_globals) } diff --git a/fast/stages/0-bootstrap/outputs-gcs.tf b/fast/stages/0-bootstrap/outputs-gcs.tf index 0aded986..734ba0a6 100644 --- a/fast/stages/0-bootstrap/outputs-gcs.tf +++ b/fast/stages/0-bootstrap/outputs-gcs.tf @@ -32,7 +32,7 @@ resource "google_storage_bucket_object" "tfvars" { resource "google_storage_bucket_object" "tfvars_globals" { bucket = module.automation-tf-output-gcs.name - name = "tfvars/globals.auto.tfvars.json" + name = "tfvars/0-globals.auto.tfvars.json" content = jsonencode(local.tfvars_globals) } diff --git a/fast/stages/1-resman/README.md b/fast/stages/1-resman/README.md index ad39cc48..cc2896f8 100644 --- a/fast/stages/1-resman/README.md +++ b/fast/stages/1-resman/README.md @@ -84,7 +84,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '1-resman' ln -s ~/fast-config/providers/1-resman-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ``` @@ -94,7 +94,7 @@ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ # copy and paste the following commands for '1-resman' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/1-resman-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ ``` @@ -106,7 +106,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` file linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file diff --git a/fast/stages/1-resman/main.tf b/fast/stages/1-resman/main.tf index a30b56fd..6f9f3eb6 100644 --- a/fast/stages/1-resman/main.tf +++ b/fast/stages/1-resman/main.tf @@ -66,12 +66,12 @@ locals { stage_2 = [ "0-bootstrap.auto.tfvars.json", "1-resman.auto.tfvars.json", - "globals.auto.tfvars.json" + "0-globals.auto.tfvars.json" ] stage_3 = [ "0-bootstrap.auto.tfvars.json", "1-resman.auto.tfvars.json", - "globals.auto.tfvars.json", + "0-globals.auto.tfvars.json", "2-networking.auto.tfvars.json", "2-security.auto.tfvars.json" ] diff --git a/fast/stages/2-networking-a-peering/README.md b/fast/stages/2-networking-a-peering/README.md index f536b943..03883b16 100644 --- a/fast/stages/2-networking-a-peering/README.md +++ b/fast/stages/2-networking-a-peering/README.md @@ -215,7 +215,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-networking-a-peering' ln -s ~/fast-config/providers/2-networking-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -226,7 +226,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-networking-a-peering' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-networking-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -239,7 +239,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -255,7 +255,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-spoke-project`, `landing-project`, `prod-spoke-project`) - apply using `-target`, for example `terraform apply -target 'module.landing-project.google_project.project[0]'` diff --git a/fast/stages/2-networking-b-vpn/README.md b/fast/stages/2-networking-b-vpn/README.md index 3cbf75f3..a478ea3f 100644 --- a/fast/stages/2-networking-b-vpn/README.md +++ b/fast/stages/2-networking-b-vpn/README.md @@ -229,7 +229,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-networking-a-peering' ln -s ~/fast-config/providers/2-networking-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -240,7 +240,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-networking-a-peering' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-networking-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -253,7 +253,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -269,7 +269,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-spoke-project`, `landing-project`, `prod-spoke-project`) - apply using `-target`, for example `terraform apply -target 'module.landing-project.google_project.project[0]'` diff --git a/fast/stages/2-networking-c-nva/README.md b/fast/stages/2-networking-c-nva/README.md index 5d7cc9b4..bb79f900 100644 --- a/fast/stages/2-networking-c-nva/README.md +++ b/fast/stages/2-networking-c-nva/README.md @@ -297,7 +297,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-networking-a-peering' ln -s ~/fast-config/providers/2-networking-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -308,7 +308,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-networking-a-peering' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-networking-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -321,7 +321,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -337,7 +337,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-spoke-project`, `landing-project`, `prod-spoke-project`) - apply using `-target`, for example `terraform apply -target 'module.landing-project.google_project.project[0]'` diff --git a/fast/stages/2-networking-d-separate-envs/README.md b/fast/stages/2-networking-d-separate-envs/README.md index 31a69ef6..3473e778 100644 --- a/fast/stages/2-networking-d-separate-envs/README.md +++ b/fast/stages/2-networking-d-separate-envs/README.md @@ -177,7 +177,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-networking-a-peering' ln -s ~/fast-config/providers/2-networking-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -188,7 +188,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-networking-a-peering' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-networking-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -201,7 +201,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -217,7 +217,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-spoke-project`, `prod-spoke-project`) - apply using `-target`, for example `terraform apply -target 'module.prod-spoke-project.google_project.project[0]'` diff --git a/fast/stages/2-networking-e-nva-bgp/README.md b/fast/stages/2-networking-e-nva-bgp/README.md index be1526c8..9c56a781 100644 --- a/fast/stages/2-networking-e-nva-bgp/README.md +++ b/fast/stages/2-networking-e-nva-bgp/README.md @@ -320,7 +320,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-networking-a-peering' ln -s ~/fast-config/providers/2-networking-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -331,7 +331,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-networking-a-peering' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-networking-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -344,7 +344,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -360,7 +360,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-spoke-project`, `landing-project`, `prod-spoke-project`) - apply using `-target`, for example `terraform apply -target 'module.landing-project.google_project.project[0]'` diff --git a/fast/stages/2-security/README.md b/fast/stages/2-security/README.md index 9d47bdaf..bdd86e7d 100644 --- a/fast/stages/2-security/README.md +++ b/fast/stages/2-security/README.md @@ -78,7 +78,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '2-security' ln -s ~/fast-config/providers/2-security-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -89,7 +89,7 @@ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ # copy and paste the following commands for '2-security' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/2-security-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ ``` @@ -102,7 +102,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `0-bootstrap.auto.tfvars.json` and `1-resman.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file @@ -118,7 +118,7 @@ outputs_location = "~/fast-config" This configuration is possible but unsupported and only exists for development purposes, use at your own risk: -- temporarily switch `billing_account.id` to `null` in `globals.auto.tfvars.json` +- temporarily switch `billing_account.id` to `null` in `0-globals.auto.tfvars.json` - for each project resources in the project modules used in this stage (`dev-sec-project`, `prod-sec-project`) - apply using `-target`, for example `terraform apply -target 'module.prod-sec-project.google_project.project[0]'` diff --git a/fast/stages/3-data-platform/dev/README.md b/fast/stages/3-data-platform/dev/README.md index 9836b598..6641e27b 100644 --- a/fast/stages/3-data-platform/dev/README.md +++ b/fast/stages/3-data-platform/dev/README.md @@ -96,7 +96,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '3-data-platform' ln -s ~/fast-config/providers/3-data-platform-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/2-networking.auto.tfvars.json ./ @@ -109,7 +109,7 @@ ln -s ~/fast-config/tfvars/2-security.auto.tfvars.json ./ # copy and paste the following commands for '3-data-platform' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/3-data-platform-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/2-networking.auto.tfvars.json ./ @@ -124,7 +124,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `*.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file diff --git a/fast/stages/3-gke-multitenant/dev/README.md b/fast/stages/3-gke-multitenant/dev/README.md index f099c10b..db125648 100644 --- a/fast/stages/3-gke-multitenant/dev/README.md +++ b/fast/stages/3-gke-multitenant/dev/README.md @@ -57,7 +57,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '3-gke-multitenant' ln -s /home/ludomagno/fast-config/providers/3-gke-multitenant-providers.tf ./ -ln -s /home/ludomagno/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s /home/ludomagno/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s /home/ludomagno/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s /home/ludomagno/fast-config/tfvars/1-resman.auto.tfvars.json ./ ln -s /home/ludomagno/fast-config/tfvars/2-networking.auto.tfvars.json ./ @@ -70,7 +70,7 @@ ln -s /home/ludomagno/fast-config/tfvars/2-security.auto.tfvars.json ./ # copy and paste the following commands for '3-gke-multitenant' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/3-gke-multitenant-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/2-networking.auto.tfvars.json ./ @@ -85,7 +85,7 @@ The preconfigured provider file uses impersonation to run with this stage's auto Variables in this stage -- like most other FAST stages -- are broadly divided into three separate sets: -- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `globals.auto.tfvars.json` file linked or copied above +- variables which refer to global values for the whole organization (org id, billing account id, prefix, etc.), which are pre-populated via the `0-globals.auto.tfvars.json` file linked or copied above - variables which refer to resources managed by previous stage, which are prepopulated here via the `*.auto.tfvars.json` files linked or copied above - and finally variables that optionally control this stage's behaviour and customizations, and can to be set in a custom `terraform.tfvars` file diff --git a/fast/stages/3-project-factory/dev/README.md b/fast/stages/3-project-factory/dev/README.md index 4c1fe75d..79a4b548 100644 --- a/fast/stages/3-project-factory/dev/README.md +++ b/fast/stages/3-project-factory/dev/README.md @@ -33,7 +33,7 @@ The commands to link or copy the provider and terraform variable files can be ea # copy and paste the following commands for '3-project-factory' ln -s ~/fast-config/providers/3-project-factory-providers.tf ./ -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json ./ +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json ./ ln -s ~/fast-config/tfvars/2-networking.auto.tfvars.json ./ @@ -46,7 +46,7 @@ ln -s ~/fast-config/tfvars/2-security.auto.tfvars.json ./ # copy and paste the following commands for '3-project-factory' gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/providers/3-project-factory-providers.tf ./ -gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/globals.auto.tfvars.json ./ +gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-globals.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/0-bootstrap.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/1-resman.auto.tfvars.json ./ gcloud alpha storage cp gs://xxx-prod-iac-core-outputs-0/tfvars/2-networking.auto.tfvars.json ./ diff --git a/fast/stages/COMPANION.md b/fast/stages/COMPANION.md index 9914ec9a..54733e4d 100644 --- a/fast/stages/COMPANION.md +++ b/fast/stages/COMPANION.md @@ -138,7 +138,7 @@ cd $FAST_PWD/1-resman # link providers and variables from previous stages ln -s ~/fast-config/providers/1-resman-providers.tf . ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json . -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json . +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json . # edit your terraform.tfvars to append Teams configuration (optional) edit terraform.tfvars @@ -186,7 +186,7 @@ cd $FAST_PWD/2-networking-XXX ln -s ~/fast-config/providers/2-networking-providers.tf . ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json . ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json . -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json . +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json . # create terraform.tfvars. output_location variable is required to generate networking stage output file edit terraform.tfvars @@ -217,7 +217,7 @@ cd $FAST_PWD/02-security ln -s ~/fast-config/providers/2-security-providers.tf . ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json . ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json . -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json . +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json . # edit terraform.tfvars to include KMS and/or VPC-SC configuration edit terraform.tfvars @@ -243,7 +243,7 @@ ln -s ~/fast-config/providers/3-project-factory-ENVIRONMENT-providers.tf . ln -s ~/fast-config/tfvars/0-bootstrap.auto.tfvars.json . ln -s ~/fast-config/tfvars/1-resman.auto.tfvars.json . ln -s ~/fast-config/tfvars/2-networking.auto.tfvars.json . -ln -s ~/fast-config/tfvars/globals.auto.tfvars.json . +ln -s ~/fast-config/tfvars/0-globals.auto.tfvars.json . # define your environment default values (eg for billing alerts and labels) edit data/defaults.yaml