Docs: Fix bootstrap subscription id for advanced scenarios (#175)

# Pull Request

## Issue

Issue #, if available: #131

## Description

This PR updqates the docs for advanced scenarios to bring it in line
with the updated variable naming.

## License

By submitting this pull request, I confirm that my contribution is made
under the terms of the projects associated license.

docs/wiki/[User-Guide]-Advanced-Scenarios.md

@@ -20,7 +20,7 @@ In order to use the secure island approach, you can follow these steps:
 1. Create a new subscription for the bootstrap resources and place it in the new management group. Take note of the subscription id.
 1. Grant owner rights to the account you are using to deploy the accelerator on the new subscription.
 1. Run the bootstrap as normal, following the instructions in the [Quick Start][wiki_quick_start] guide.
-1. When you get to step 2.2.1 (GitHub), 2.2.2 (Azure DevOps) or 2.2.3 (Local), enter the subscription id of the new subscription you created into the `azure_subscription_id` field.
+1. When you get to step for updating the input config file variables, enter the subscription id of the new subscription you created into the `bootstrap_subscription_id` field.
 1. Continue with the rest of the steps in the [Quick Start][wiki_quick_start] guide.
 
 This will result in the bootstrap resources being deployed in the new subscription and management group hierarchy, while the Azure Landing Zone is deployed into the defined management group hierarchy.
@@ -32,40 +32,40 @@ This will result in the bootstrap resources being deployed in the new subscripti
 3. Use the `complete` starter module to deploy the Azure Landing Zone.
 4. Update the `config.yaml` file to include subscription placement for the new subscription using the `subscription-id-overrides` setting. For example:
 
-```yaml
-archetypes:  # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary.
-  root_name: es
-  root_id: Enterprise-Scale
-  deploy_corp_landing_zones: true
-  deploy_online_landing_zones: true
-  default_location: uksouth
-  disable_telemetry: true
-  deploy_management_resources: true
-  configure_management_resources:
-    location: uksouth
-    settings:
-      security_center:
-        config:
-          email_security_contact: "security_contact@replace_me"
-    advanced:
-      asc_export_resource_group_name: rg-asc-export
-      custom_settings_by_resource_type:
-        azurerm_resource_group:
-          management:
-            name: rg-management
-        azurerm_log_analytics_workspace:
-          management:
-            name: log-management
-        azurerm_automation_account:
-          management:
-            name: aa-management
-  subscription-id-overrides:
-    management:
-      - "00000000-0000-0000-0000-000000000000"  # Your new subscription id
-```
+    ```yaml
+    archetypes:  # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary.
+      root_name: es
+      root_id: Enterprise-Scale
+      deploy_corp_landing_zones: true
+      deploy_online_landing_zones: true
+      default_location: uksouth
+      disable_telemetry: true
+      deploy_management_resources: true
+      configure_management_resources:
+        location: uksouth
+        settings:
+          security_center:
+            config:
+              email_security_contact: "security_contact@replace_me"
+        advanced:
+          asc_export_resource_group_name: rg-asc-export
+          custom_settings_by_resource_type:
+            azurerm_resource_group:
+              management:
+                name: rg-management
+            azurerm_log_analytics_workspace:
+              management:
+                name: log-management
+            azurerm_automation_account:
+              management:
+                name: aa-management
+      subscription-id-overrides:
+        management:
+          - "00000000-0000-0000-0000-000000000000"  # Your new subscription id
+    ```
 
 5. Run the bootstrap as normal, following the instructions in the [Quick Start][wiki_quick_start] guide.
-6. When you get to step 2.2.1 (GitHub), 2.2.2 (Azure DevOps) or 2.2.3 (Local), enter the subscription id of the new subscription you created into the `azure_subscription_id` field.
+6. When you get to step for updating the input config file variables, enter the subscription id of the new subscription you created into the `bootstrap_subscription_id` field.
 7. Continue with the rest of the steps in the [Quick Start][wiki_quick_start] guide.
 
 This will result in the bootstrap resources being deployed in the new subscription. When you then deploy the Azure Landing Zone your subscription will be moved under the `management` management group.

docs/wiki/[User-Guide]-Quick-Start-Phase-2-Azure-DevOps.md

@@ -49,7 +49,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `azure_devops_organization_name` | `<azure-devops-organization>` | Replace `<azure-devops-organization>` with the name of your Azure DevOps organization. This is the section of the url after `dev.azure.com` or before `.visualstudio.com`. E.g. enter `my-org` for `https://dev.azure.com/my-org`. |
     | `use_separate_repository_for_templates` | `true` | Determine whether to create a separate repository to store pipeline templates as an extra layer of security. Set to `false` if you don't wish to secure your pipeline templates by using a separate repository. This will default to `true`. |
     | `bootstrap_location` | `<region>` | Replace `<region>` with the Azure region where you would like to deploy the bootstrap resources in Azure. This field expects the `name` of the region, such as `uksouth`. You can find a full list of names by running `az account list-locations -o table`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |
@@ -127,7 +127,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `azure_devops_agents_personal_access_token` | `<token-2>` | Replace `<token-2>` with the `token-2` Azure DevOps PAT you generated in the previous step specifically for the self-hosted agents. This only applies if you have `use_self_hosted_agents` set to `true`. You can set this to an empty string `""` if you are not using self-hosted agents. |
     | `azure_devops_organization_name` | `<azure-devops-organization>` | Replace `<azure-devops-organization>` with the name of your Azure DevOps organization. This is the section of the url after `dev.azure.com` or before `.visualstudio.com`. E.g. enter `my-org` for `https://dev.azure.com/my-org`. |
     | `use_separate_repository_for_templates` | `true` | Determine whether to create a separate repository to store pipeline templates as an extra layer of security. Set to `false` if you don't wish to secure your pipeline templates by using a separate repository. This will default to `true`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |

docs/wiki/[User-Guide]-Quick-Start-Phase-2-GitHub.md

@@ -46,7 +46,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `github_runners_personal_access_token` | `<token-2>` | Replace `<token-2>` with the `token-2` GitHub PAT you generated in the previous step specifically for the self-hosted runners. This only applies if you have `use_self_hosted_agents` set to `true`. You can set this to an empty string `""` if you are not using self-hosted runners. |
     | `github_organization_name` | `<github-organization>` | Replace `<github-organization>` with the name of your GitHub organization. This is the section of the url after `github.com`. E.g. enter `my-org` for `https://github.com/my-org`. |
     | `use_separate_repository_for_templates` | `true` | Determine whether to create a separate repository to store workflow templates as an extra layer of security. Set to `false` if you don't wish to secure your workflow templates by using a separate repository. This will default to `true`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and GitHub resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and GitHub resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and GitHub resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |
@@ -117,7 +117,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `github_runners_personal_access_token` | `<token-2>` | Replace `<token-2>` with the `token-2` GitHub PAT you generated in the previous step specifically for the self-hosted runners. This only applies if you have `use_self_hosted_agents` set to `true`. You can set this to an empty string `""` if you are not using self-hosted runners. |
     | `github_organization_name` | `<github-organization>` | Replace `<github-organization>` with the name of your GitHub organization. This is the section of the url after `github.com`. E.g. enter `my-org` for `https://github.com/my-org`. |
     | `use_separate_repository_for_templates` | `true` | Determine whether to create a separate repository to store workflow templates as an extra layer of security. Set to `false` if you don't wish to secure your workflow templates by using a separate repository. This will default to `true`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and GitHub resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and GitHub resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and GitHub resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |

docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.md

@@ -44,7 +44,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `subscription_id_connectivity` | `<connectivity-subscription-id>` | Replace `<connectivity-subscription-id>` with the id of the connectivity subscription you created in the previous phase. |
     | `target_directory` | `<target-directory>` | This is the directory where the ALZ module code will be created. This defaults a directory called `local` in the root of the accelerator directory if not supplied. |
     | `create_bootstrap_resources_in_azure` | `true` | This determines whether the bootstrap will create the bootstrap resources in Azure. This defaults to `true`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |
@@ -110,7 +110,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
     | `subscription_id_connectivity` | `<connectivity-subscription-id>` | Replace `<connectivity-subscription-id>` with the id of the connectivity subscription you created in the previous phase. |
     | `target_directory` | `<target-directory>` | This is the directory where the ALZ module code will be created. This defaults a directory called `local` in the root of the accelerator directory if not supplied. |
     | `create_bootstrap_resources_in_azure` | `true` | This determines whether the bootstrap will create the bootstrap resources in Azure. This defaults to `true`. |
-    | `bootstrap_subscription_id` | `<bootstrap-subscription-id>` | Replace `<subscription-id>` with the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
+    | `bootstrap_subscription_id` | `""` | Enter the id of the subscription in which you would like to deploy the bootstrap resources in Azure. If left blank, the subscription you are connected to via `az login` will be used. In most cases this is the management subscription, but you can specifiy a separate subscription if you prefer. |
     | `service_name` | `alz` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-<service_name>-mgmt-uksouth-001`. We recommend using `alz` for this. |
     | `environment_name` | `mgmt` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-<environment_name>-uksouth-001`. We recommend using `mgmt` for this. |
     | `postfix_number` | `1` | This is used to build up the names of your Azure and Azure DevOps resources, for example `rg-alz-mgmt-uksouth-<postfix_number>`. We recommend using `1` for this. |

docs/wiki/examples/powershell-inputs/inputs-azure-devops-bicep-complete.yaml

@@ -20,7 +20,7 @@ azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-basic.yaml

@@ -20,7 +20,7 @@ azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete-vnext.yaml

@@ -20,7 +20,7 @@ azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-complete.yaml

@@ -20,7 +20,7 @@ azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-azure-devops-terraform-hubnetworking.yaml

@@ -20,7 +20,7 @@ azure_devops_personal_access_token: "<token-1>"
 azure_devops_agents_personal_access_token: "<token-2>"
 azure_devops_organization_name: "<azure-devops-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-github-bicep-complete.yaml

@@ -20,7 +20,7 @@ github_personal_access_token: "<token-1>"
 github_runners_personal_access_token: "<token-2>"
 github_organization_name: "<github-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"

docs/wiki/examples/powershell-inputs/inputs-github-terraform-basic.yaml

@@ -20,7 +20,7 @@ github_personal_access_token: "<token-1>"
 github_runners_personal_access_token: "<token-2>"
 github_organization_name: "<github-organization>"
 use_separate_repository_for_templates: "true"
-bootstrap_subscription_id: "<bootstrap-subscription-id>"
+bootstrap_subscription_id: ""
 service_name: "alz"
 environment_name: "mgmt"
 postfix_number: "1"