Rename FAST globals output file

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)")
 

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]'`

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"
           ]
         }
         : {

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"
     ]
   }
 }

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)
 }
 

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)
 }
 

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
 

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"
     ]

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]'`

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]'`

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]'`

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]'`

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]'`