Skip to content

Commit 1f302b9

Browse files
docs: Update placeholder value in ALZ module code creation (#203)
# Pull Request ## Description This pull request includes several documentation updates to clarify the usage of configuration file paths and default directory values. The most important changes involve adding instructions for escaping backslashes in YAML file paths on Windows and specifying how to handle default directory values. Clarifications in documentation: * `docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.md`: Updated the description for the `target_directory` input to specify that the placeholder value `<target-directory>` should be removed to use the default value. ([docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.mdL45-R45](diffhunk://#diff-f86bb4f6ce154adfd0bf07c039be16f163e0e081779c957de4826e664e2792d0L45-R45), [docs/wiki/[User-Guide]-Quick-Start-Phase-2-Local.mdL113-R113](diffhunk://#diff-f86bb4f6ce154adfd0bf07c039be16f163e0e081779c957de4826e664e2792d0L113-R113)) * `docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-Multi-Region.md`: Added a note that backslashes need to be escaped in YAML file paths on Windows. ([docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-Multi-Region.mdL18-R18](diffhunk://#diff-edeec51894dbd58453488f2badb0e44737d2aa7e16be2dd6fe71cd211149db69L18-R18)) * `docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-VNext.md`: Added a note that backslashes need to be escaped in YAML file paths on Windows. ([docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-VNext.mdL19-R19](diffhunk://#diff-94372c563fe90e45582ccdb428559491398b4e10af345feeebdbe737633c417bL19-R19)) * `docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete.md`: Added a note that backslashes need to be escaped in YAML file paths on Windows. ([docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete.mdL17-R17](diffhunk://#diff-c95238aa2c2777c9c78aaf4534391f3195707d10f6edf94a1defa573a10d017aL17-R17)) ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license. --------- Co-authored-by: Jared Holgate <jaredholgate@microsoft.com>
1 parent 4f25ad4 commit 1f302b9

11 files changed

+16
-20
lines changed

.github/workflows/wiki-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
# yamllint disable-line rule:truthy
88
on:
99
release:
10-
types: [published]
10+
types: [published, released]
1111
workflow_dispatch:
1212

1313
env:

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
1515
# Windows
1616
New-Item -ItemType "file" c:\accelerator\config\inputs.yaml -Force
1717
New-Item -ItemType "directory" c:\accelerator\output
18-
New-Item -ItemType "directory" c:\accelerator\target
1918
2019
# Linux/Mac
2120
New-Item -ItemType "file" /accelerator/config/inputs.yaml -Force
2221
New-Item -ItemType "directory" /accelerator/output
23-
New-Item -ItemType "directory" /accelerator/target
2422
```
2523
2624
```plaintext
2725
📂accelerator
2826
┣ 📂config
2927
┃ ┗ 📜inputs.yaml
30-
┃ 📂output
31-
┗ 📂target
28+
┗ 📂output
3229
```
3330
3431
1. Open your `inputs.yaml` file in Visual Studio Code (or your preferred editor) and copy the content from [inputs-local-bicep-complete.yaml][example_powershell_inputs_local_bicep_complete] into that file.
@@ -47,7 +44,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
4744
| `subscription_id_management` | `TF_VAR` | `<management-subscription-id>` | Replace `<management-subscription-id>` with the id of the management subscription you created in the previous phase. |
4845
| `subscription_id_identity` | `TF_VAR` | `<identity-subscription-id>` | Replace `<identity-subscription-id>` with the id of the identity subscription you created in the previous phase. |
4946
| `subscription_id_connectivity` | `TF_VAR` | `<connectivity-subscription-id>` | Replace `<connectivity-subscription-id>` with the id of the connectivity subscription you created in the previous phase. |
50-
| `target_directory` | `TF_VAR` | `/accelerator/target` | This is the directory where the ALZ module code will be created. This defaults a directory called `local-output` in the root of the accelerator output directory if not supplied. |
47+
| `target_directory` | `TF_VAR` | `""` | This is the directory where the ALZ module code will be created. This defaults a directory called `local-output` in the root of the accelerator output directory if not supplied. |
5148
| `create_bootstrap_resources_in_azure` | `TF_VAR` | `true` | This determines whether the bootstrap will create the bootstrap resources in Azure. This defaults to `true`. |
5249
| `bootstrap_subscription_id` | `TF_VAR` | `""` | 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. |
5350
| `service_name` | `TF_VAR` | `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. |
@@ -71,6 +68,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
7168
1. There will be a pause after the `plan` phase you allow you to validate what is going to be deployed.
7269
1. If you are happy with the plan, then type `yes` and hit enter.
7370
1. The Terraform will `apply` and your environment will be bootstrapped.
71+
1. You will find the output in the `/accelerator/output/local-output` folder if you didn't specifiy a different location for `target_directory`.
7472
7573
### 2.2.3.2 Local File System with Terraform
7674
@@ -82,20 +80,17 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
8280
# Windows
8381
New-Item -ItemType "file" c:\accelerator\config\inputs.yaml -Force
8482
New-Item -ItemType "directory" c:\accelerator\output
85-
New-Item -ItemType "directory" c:\accelerator\target
8683
8784
# Linux/Mac
8885
New-Item -ItemType "file" /accelerator/config/inputs.yaml -Force
8986
New-Item -ItemType "directory" /accelerator/output
90-
New-Item -ItemType "directory" /accelerator/target
9187
```
9288
9389
```plaintext
9490
📂accelerator
9591
┣ 📂config
9692
┃ ┗ 📜inputs.yaml
97-
┃ 📂output
98-
┗ 📂target
93+
┗ 📂output
9994
```
10095
10196
1. Open your `inputs.yaml` file in Visual Studio Code (or your preferred editor) and copy the content from the relevant input file for your chosen starter module:
@@ -118,7 +113,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
118113
| `subscription_id_management` | `TF_VAR` | `<management-subscription-id>` | Replace `<management-subscription-id>` with the id of the management subscription you created in the previous phase. |
119114
| `subscription_id_identity` | `TF_VAR` | `<identity-subscription-id>` | Replace `<identity-subscription-id>` with the id of the identity subscription you created in the previous phase. |
120115
| `subscription_id_connectivity` | `TF_VAR` | `<connectivity-subscription-id>` | Replace `<connectivity-subscription-id>` with the id of the connectivity subscription you created in the previous phase. |
121-
| `target_directory` | `TF_VAR` | `/accelerator/target` | This is the directory where the ALZ module code will be created. This defaults a directory called `local-output` in the root of the accelerator output directory if not supplied. |
116+
| `target_directory` | `TF_VAR` | `""` | This is the directory where the ALZ module code will be created. This defaults a directory called `local-output` in the root of the accelerator output directory if not supplied. |
122117
| `create_bootstrap_resources_in_azure` | `TF_VAR` | `true` | This determines whether the bootstrap will create the bootstrap resources in Azure. This defaults to `true`. |
123118
| `bootstrap_subscription_id` | `TF_VAR` | `""` | 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. |
124119
| `service_name` | `TF_VAR` | `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. |
@@ -146,6 +141,7 @@ Although you can just run `Deploy-Accelerator` and fill out the prompted inputs,
146141
1. There will be a pause after the `plan` phase you allow you to validate what is going to be deployed.
147142
1. If you are happy with the plan, then type `yes` and hit enter.
148143
1. The Terraform will `apply` and your environment will be bootstrapped.
144+
1. You will find the output in the `/accelerator/output/local-output` folder if you didn't specifiy a different location for `target_directory`.
149145
150146
## Next Steps
151147

docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-Multi-Region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The following table describes the inputs required for the `complete_multi_region
1515

1616
| Input | Placeholder | Description |
1717
| - | -- | --- |
18-
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml` |
18+
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml`. For YAML on Windows you will need to escape the `\`, i.e. `c:\\my-config\\config.yaml`. |
1919
| `default_postfix` | `<postfix>` | This is the default postfix used for resource names. |
2020

2121
You can create a custom yaml config to tailor to your needs, for example an Azure Landing Zone with a three-region mesh. Get started with our two region samples:

docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete-VNext.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following table describes the inputs required for the `complete_vnext` start
1616

1717
| Input | Placeholder | Description |
1818
| - | -- | --- |
19-
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml` |
19+
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml`. For YAML on Windows you will need to escape the `\`, i.e. `c:\\my-config\\config.yaml`. |
2020
| `default_postfix` | `<postfix>` | This is the default postfix used for resource names. |
2121

2222
## Further details on the Complete Starter Module and config file

docs/wiki/[User-Guide]-Starter-Module-Terraform-Complete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The following table describes the inputs required for the `complete` starter mod
1414

1515
| Input | Placeholder | Description |
1616
| - | -- | --- |
17-
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml` |
17+
| `configuration_file_path` | `<configuration-file-path>` | This is the absolute path to the configuration file. E.g. `c:\my-config\config.yaml` or `~/my-config/config.yaml`. For YAML on Windows you will need to escape the `\`, i.e. `c:\\my-config\\config.yaml`. |
1818
| `default_postfix` | `<postfix>` | This is the default postfix used for resource names. |
1919

2020
## Further details on the Complete Starter Module and config file

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subscription_id_identity: "<identity-subscription-id>"
1616
subscription_id_connectivity: "<connectivity-subscription-id>"
1717

1818
# Bootstrap Inputs
19-
target_directory: "/accelerator/target"
19+
target_directory: ""
2020
create_bootstrap_resources_in_azure: "true"
2121
bootstrap_subscription_id: ""
2222
service_name: "alz"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subscription_id_identity: "<identity-subscription-id>"
1616
subscription_id_connectivity: "<connectivity-subscription-id>"
1717

1818
# Bootstrap Inputs
19-
target_directory: "/accelerator/target"
19+
target_directory: ""
2020
create_bootstrap_resources_in_azure: true
2121
bootstrap_subscription_id: ""
2222
service_name: "alz"

docs/wiki/examples/powershell-inputs/inputs-local-terraform-complete-multi-region.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subscription_id_identity: "<identity-subscription-id>"
1616
subscription_id_connectivity: "<connectivity-subscription-id>"
1717

1818
# Bootstrap Inputs
19-
target_directory: "/accelerator/target"
19+
target_directory: ""
2020
create_bootstrap_resources_in_azure: true
2121
bootstrap_subscription_id: ""
2222
service_name: "alz"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subscription_id_identity: "<identity-subscription-id>"
1616
subscription_id_connectivity: "<connectivity-subscription-id>"
1717

1818
# Bootstrap Inputs
19-
target_directory: "/accelerator/target"
19+
target_directory: ""
2020
create_bootstrap_resources_in_azure: true
2121
bootstrap_subscription_id: ""
2222
service_name: "alz"

docs/wiki/examples/powershell-inputs/inputs-local-terraform-complete.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subscription_id_identity: "<identity-subscription-id>"
1616
subscription_id_connectivity: "<connectivity-subscription-id>"
1717

1818
# Bootstrap Inputs
19-
target_directory: "/accelerator/target"
19+
target_directory: ""
2020
create_bootstrap_resources_in_azure: true
2121
bootstrap_subscription_id: ""
2222
service_name: "alz"

0 commit comments

Comments
 (0)