Skip to content

Commit 4f25ad4

Browse files
jaredfholgateoZakari
jaredfholgate
and
oZakari
authored
feat: remove ui support (#202)
# Pull Request ## Issue Issue #, if available: ## Description Removal of UI support and addition of new features. e2e tests: https://github.com/Azure/accelerator-bootstrap-modules/actions/runs/11130630879 ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license. --------- Co-authored-by: Zach Trocinski <ztrocinski@outlook.com>
1 parent 1d27733 commit 4f25ad4

File tree

60 files changed

+1172
-2037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1172
-2037
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ templates/basic/terraform.tfvars
5353
templates/.test_azuredevops
5454
templates/.test_github
5555
.vscode/settings.json
56+
/ALZ

‎CONTRIBUTING.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,30 @@ Deploy-Accelerator `
155155
156156
```
157157

158+
### Bicep Local
159+
160+
Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
161+
162+
>IMPORTANT! - Make sure to update the input file with your settings for VCS, etc.
163+
164+
```pwsh
165+
Invoke-Build -File .\src\ALZ.build.ps1
166+
167+
$targetFolder = "dev"
168+
169+
# Uncomment to start fresh rather than relying on the -replaceFiles parameter
170+
# Remove-Item -Path "/$targetFolder/acc/bicep/output/github" -Recurse -Force
171+
172+
Deploy-Accelerator `
173+
-bootstrapModuleOverrideFolderPath "/$targetFolder/code/accelerator-bootstrap-modules" `
174+
-starterModuleOverrideFolderPath "/$targetFolder/code/ALZ-Bicep" `
175+
-output "/$targetFolder/acc/bicep/output/local" `
176+
-inputs "/$targetFolder/acc/bicep/config/inputs-local.yaml" `
177+
-verbose `
178+
-replaceFiles # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
179+
180+
```
181+
158182
### Terraform Azure DevOps
159183

160184
Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
@@ -202,3 +226,27 @@ Deploy-Accelerator `
202226
-replaceFiles # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
203227
204228
```
229+
230+
### Terraform Local
231+
232+
Run this from the VSCode terminal for the ALZ-PowerShell-Module repository:
233+
234+
>IMPORTANT! - Make sure to update the input file with your settings for VCS, etc.
235+
236+
```pwsh
237+
Invoke-Build -File .\src\ALZ.build.ps1
238+
239+
$targetFolder = "dev"
240+
241+
# Uncomment to start fresh rather than relying on the -replaceFiles parameter
242+
# Remove-Item -Path "/$targetFolder/acc/terraform/output/azuredevops" -Recurse -Force
243+
244+
Deploy-Accelerator `
245+
-bootstrapModuleOverrideFolderPath "/$targetFolder/code/accelerator-bootstrap-modules" `
246+
-starterModuleOverrideFolderPath "/$targetFolder/code/alz-terraform-accelerator/templates" `
247+
-output "/$targetFolder/acc/terraform/output/local" `
248+
-inputs "/$targetFolder/acc/terraform/config/inputs-local.yaml" `
249+
-verbose `
250+
-replaceFiles # This will replace the files in the output folder with the files in the bootstrap and starter modules, so any updates are taken into account
251+
252+
```

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

Lines changed: 66 additions & 63 deletions
Large diffs are not rendered by default.

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

Lines changed: 60 additions & 57 deletions
Large diffs are not rendered by default.

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

Lines changed: 55 additions & 46 deletions
Large diffs are not rendered by default.

‎docs/wiki/[User-Guide]-Quick-Start-Phase-3.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,22 @@ Now you have created your bootstrapped environment you can deploy you Azure land
3333

3434
### 3.1.3 Local file system
3535

36+
Follow the steps below to deploy the landing zone locally. If you want to hook it up to you custom version control system, follow their documentation on how to that.
37+
38+
#### 3.1.3.1 Bicep
39+
40+
1. Ensure you have the latest versions of the [AZ PowerShell Module](https://learn.microsoft.com/en-us/powershell/azure/install-azure-powershell) and [Bicep](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/install) installed.
41+
1. Open a new PowerShell Core (pwsh) terminal or use the one you already have open.
42+
1. Navigate to the directory shown in the `module_output_directory_path` output from the bootstrap.
43+
1. Login to Azure using `Connect-AzAccount -TenantId 00000000-0000-0000-0000-000000000000 -SubscriptionId 00000000-0000-0000-0000-000000000000`.
44+
1. (Optional) Examine the `./scripts/deploy-local.ps1` to understand what it is doing.
45+
1. Run `./scripts/deploy-local.ps1`.
46+
1. A what if will run and then you'll be prompted to check it and run the deploy.
47+
1. Type `yes` and hit enter to run the deploy.
48+
1. The ALZ will now be deployed, this may take some time.
49+
50+
#### 3.1.3.2 Terraform
51+
3652
1. Open a new PowerShell Core (pwsh) terminal or use the one you already have open.
3753
1. Navigate to the directory shown in the `module_output_directory_path` output from the bootstrap.
3854
1. If you choose to deploy the bootstrap resources in Azure, then you will need to navigate to the Azure Portal and find you storage account.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following table describes the inputs required for the `complete` starter mod
1212
| Input | Placeholder | Description |
1313
| - | -- | --- |
1414
| `Prefix` | `landing-zone` | This is the defaut prefix for names of resources and management groups. |
15-
| `SecondaryLocation` | `westus2` | The secondary location for the landing zone. Only used if the `networkType` has a multi-region configuration specified. |
15+
| `SecondaryLocation` | `westus2` | The secondary location for the landing zone. Only used if the `networkType` has a multi-region configuration specified. |
1616
| `Environment` | `live` | The environment name for the landing zone. This can be any lower case string. (e.g. `live` or `canary`) |
1717
| `networkType` | `hubNetworking` | The type of network configuration to deploy. Currently only `hubNetworking`, `hubNetworkingMultiRegion`, `vwanConnectivity,` `vwanConnectivityMultiRegion` or `none` are supported. |
1818
| `SecurityContact` | `<email-address>` | The email address of the security contact for the landing zone. |

‎docs/wiki/_Sidebar.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
- [Terraform - Basic][wiki_starter_module_terraform_basic]
2020
- [Terraform - Hub Networking][wiki_starter_module_terraform_hubnetworking]
2121
- [Terraform - Complete][wiki_starter_module_terraform_complete]
22-
- [Terraform - Complete Multi Region][wiki_starter_module_terraform_complete_multi_region]
2322
- [Configuration YAML Schema][wiki_yaml_schema_reference]
24-
- [Example Multi Region Hub and Spoke config][example_starter_module_complete_config_hub_spoke_multi_region]
25-
- [Example Multi Region Virtual WAN config][example_starter_module_complete_config_vwan_multi_region]
2623
- [Example Hub and Spoke config][example_starter_module_complete_config_hub_spoke]
2724
- [Example Virtual WAN config][example_starter_module_complete_config_vwan]
25+
- [Terraform - Complete Multi Region][wiki_starter_module_terraform_complete_multi_region]
26+
- [Example Multi Region Hub and Spoke config][example_starter_module_complete_config_hub_spoke_multi_region]
27+
- [Example Multi Region Virtual WAN config][example_starter_module_complete_config_vwan_multi_region]
2828
- Input Files
2929
- [Azure DevOps Bicep Complete][example_powershell_inputs_azure_devops_bicep_complete]
3030
- [Azure DevOps Terraform Basic][example_powershell_inputs_azure_devops_terraform_basic]

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2211-azure-devops-with-bicep
44

55
# Basic Inputs
6-
iac: "bicep"
7-
bootstrap: "alz_azuredevops"
8-
starter: "complete"
6+
iac_type: "bicep"
7+
bootstrap_module_name: "alz_azuredevops"
8+
starter_module_name: "complete"
99

1010
# Shared Interface Inputs
1111
bootstrap_location: "<region>"
12-
starter_location: "<region>"
12+
starter_locations: ["<region>"]
1313
root_parent_management_group_id: ""
1414
subscription_id_management: "<management-subscription-id>"
1515
subscription_id_identity: "<identity-subscription-id>"
@@ -19,24 +19,28 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
1919
azure_devops_personal_access_token: "<token-1>"
2020
azure_devops_agents_personal_access_token: "<token-2>"
2121
azure_devops_organization_name: "<azure-devops-organization>"
22-
use_separate_repository_for_templates: "true"
22+
use_separate_repository_for_templates: true
2323
bootstrap_subscription_id: ""
2424
service_name: "alz"
2525
environment_name: "mgmt"
26-
postfix_number: "1"
27-
azure_devops_use_organisation_legacy_url: "false"
28-
azure_devops_create_project: "true"
26+
postfix_number: 1
27+
azure_devops_use_organisation_legacy_url: false
28+
azure_devops_create_project: true
2929
azure_devops_project_name: "<azure-devops-project-name>"
30-
use_self_hosted_agents: "true"
31-
use_private_networking: "true"
32-
allow_storage_access_from_my_ip: "false"
30+
use_self_hosted_agents: true
31+
use_private_networking: true
32+
allow_storage_access_from_my_ip: false
3333
apply_approvers: ["<email-address>"]
34-
create_branch_policies: "true"
34+
create_branch_policies: true
3535

3636
# Complete Starter Module Specific Variables
3737
# (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Bicep-Complete)
3838
Prefix: "alz"
39-
SecondaryLocation: ""
4039
Environment: "live"
4140
networkType: "hubNetworking"
4241
SecurityContact: "<email-address>"
42+
43+
# Advanced Inputs
44+
bootstrap_module_version: "latest"
45+
starter_module_version: "latest"
46+
#output_folder_path: "/accelerator/output"

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
44

55
# Basic Inputs
6-
iac: "terraform"
7-
bootstrap: "alz_azuredevops"
8-
starter: "complete"
6+
iac_type: "terraform"
7+
bootstrap_module_name: "alz_azuredevops"
8+
starter_module_name: "complete"
99

1010
# Shared Interface Inputs
1111
bootstrap_location: "<region>"
12-
starter_location: "<region>"
12+
starter_locations: ["<region>"]
1313
root_parent_management_group_id: ""
1414
subscription_id_management: "<management-subscription-id>"
1515
subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
1919
azure_devops_personal_access_token: "<token-1>"
2020
azure_devops_agents_personal_access_token: "<token-2>"
2121
azure_devops_organization_name: "<azure-devops-organization>"
22-
use_separate_repository_for_templates: "true"
22+
use_separate_repository_for_templates: true
2323
bootstrap_subscription_id: ""
2424
service_name: "alz"
2525
environment_name: "mgmt"
26-
postfix_number: "1"
27-
azure_devops_use_organisation_legacy_url: "false"
28-
azure_devops_create_project: "true"
26+
postfix_number: 1
27+
azure_devops_use_organisation_legacy_url: false
28+
azure_devops_create_project: true
2929
azure_devops_project_name: "<azure-devops-project-name>"
30-
use_self_hosted_agents: "true"
31-
use_private_networking: "true"
32-
allow_storage_access_from_my_ip: "false"
30+
use_self_hosted_agents: true
31+
use_private_networking: true
32+
allow_storage_access_from_my_ip: false
3333
apply_approvers: ["<email-address>"]
34-
create_branch_policies: "true"
34+
create_branch_policies: true
3535

3636
# Basic Starter Module Specific Variables
3737
# (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Basic)
3838
root_id: "<id_prefix>"
3939
root_name: "<name_prefix>"
40+
41+
# Advanced Inputs
42+
bootstrap_module_version: "latest"
43+
starter_module_version: "latest"
44+
#output_folder_path: "/accelerator/output"

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
44

55
# Basic Inputs
6-
iac: "terraform"
7-
bootstrap: "alz_azuredevops"
8-
starter: "complete_multi_region"
6+
iac_type: "terraform"
7+
bootstrap_module_name: "alz_azuredevops"
8+
starter_module_name: "complete_multi_region"
99

1010
# Shared Interface Inputs
1111
bootstrap_location: "<region-1>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
1919
azure_devops_personal_access_token: "<token-1>"
2020
azure_devops_agents_personal_access_token: "<token-2>"
2121
azure_devops_organization_name: "<azure-devops-organization>"
22-
use_separate_repository_for_templates: "true"
22+
use_separate_repository_for_templates: true
2323
bootstrap_subscription_id: ""
2424
service_name: "alz"
2525
environment_name: "mgmt"
26-
postfix_number: "1"
27-
azure_devops_use_organisation_legacy_url: "false"
28-
azure_devops_create_project: "true"
26+
postfix_number: 1
27+
azure_devops_use_organisation_legacy_url: false
28+
azure_devops_create_project: true
2929
azure_devops_project_name: "<azure-devops-project-name>"
30-
use_self_hosted_agents: "true"
31-
use_private_networking: "true"
32-
allow_storage_access_from_my_ip: "false"
30+
use_self_hosted_agents: true
31+
use_private_networking: true
32+
allow_storage_access_from_my_ip: false
3333
apply_approvers: ["<email-address>"]
34-
create_branch_policies: "true"
34+
create_branch_policies: true
3535

3636
# Complete Starter Module Specific Variables
3737
# (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete-Multi-Region)
3838
configuration_file_path: "<configuration-file-path>" # Only required for the `complete` starter module. NOTE: This must be an absolute path.
3939
default_postfix: "<postfix>"
40+
41+
# Advanced Inputs
42+
bootstrap_module_version: "latest"
43+
starter_module_version: "latest"
44+
#output_folder_path: "/accelerator/output"

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
44

55
# Basic Inputs
6-
iac: "terraform"
7-
bootstrap: "alz_azuredevops"
8-
starter: "complete"
6+
iac_type: "terraform"
7+
bootstrap_module_name: "alz_azuredevops"
8+
starter_module_name: "complete"
99

1010
# Shared Interface Inputs
1111
bootstrap_location: "<region>"
12-
starter_location: "<region>"
12+
starter_locations: ["<region>"]
1313
root_parent_management_group_id: ""
1414
subscription_id_management: "<management-subscription-id>"
1515
subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
1919
azure_devops_personal_access_token: "<token-1>"
2020
azure_devops_agents_personal_access_token: "<token-2>"
2121
azure_devops_organization_name: "<azure-devops-organization>"
22-
use_separate_repository_for_templates: "true"
22+
use_separate_repository_for_templates: true
2323
bootstrap_subscription_id: ""
2424
service_name: "alz"
2525
environment_name: "mgmt"
26-
postfix_number: "1"
27-
azure_devops_use_organisation_legacy_url: "false"
28-
azure_devops_create_project: "true"
26+
postfix_number: 1
27+
azure_devops_use_organisation_legacy_url: false
28+
azure_devops_create_project: true
2929
azure_devops_project_name: "<azure-devops-project-name>"
30-
use_self_hosted_agents: "true"
31-
use_private_networking: "true"
32-
allow_storage_access_from_my_ip: "false"
30+
use_self_hosted_agents: true
31+
use_private_networking: true
32+
allow_storage_access_from_my_ip: false
3333
apply_approvers: ["<email-address>"]
34-
create_branch_policies: "true"
34+
create_branch_policies: true
3535

3636
# Complete vNext Starter Module Specific Variables
3737
# (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete-vNext)
3838
configuration_file_path: "<configuration-file-path>" # Only required for the `complete` starter module. NOTE: This must be an absolute path.
3939
default_postfix: "<postfix>"
40+
41+
# Advanced Inputs
42+
bootstrap_module_version: "latest"
43+
starter_module_version: "latest"
44+
#output_folder_path: "/accelerator/output"

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Quick-Start-Phase-2-Azure-DevOps#2212-azure-devops-with-terraform
44

55
# Basic Inputs
6-
iac: "terraform"
7-
bootstrap: "alz_azuredevops"
8-
starter: "complete"
6+
iac_type: "terraform"
7+
bootstrap_module_name: "alz_azuredevops"
8+
starter_module_name: "complete"
99

1010
# Shared Interface Inputs
1111
bootstrap_location: "<region>"
12-
starter_location: "<region>"
12+
starter_locations: ["<region>"]
1313
root_parent_management_group_id: ""
1414
subscription_id_management: "<management-subscription-id>"
1515
subscription_id_identity: "<identity-subscription-id>"
@@ -19,21 +19,26 @@ subscription_id_connectivity: "<connectivity-subscription-id>"
1919
azure_devops_personal_access_token: "<token-1>"
2020
azure_devops_agents_personal_access_token: "<token-2>"
2121
azure_devops_organization_name: "<azure-devops-organization>"
22-
use_separate_repository_for_templates: "true"
22+
use_separate_repository_for_templates: true
2323
bootstrap_subscription_id: ""
2424
service_name: "alz"
2525
environment_name: "mgmt"
26-
postfix_number: "1"
27-
azure_devops_use_organisation_legacy_url: "false"
28-
azure_devops_create_project: "true"
26+
postfix_number: 1
27+
azure_devops_use_organisation_legacy_url: false
28+
azure_devops_create_project: true
2929
azure_devops_project_name: "<azure-devops-project-name>"
30-
use_self_hosted_agents: "true"
31-
use_private_networking: "true"
32-
allow_storage_access_from_my_ip: "false"
30+
use_self_hosted_agents: true
31+
use_private_networking: true
32+
allow_storage_access_from_my_ip: false
3333
apply_approvers: ["<email-address>"]
34-
create_branch_policies: "true"
34+
create_branch_policies: true
3535

3636
# Complete Starter Module Specific Variables
3737
# (Details: https://github.com/Azure/ALZ-PowerShell-Module/wiki/%5BUser-Guide%5D-Starter-Module-Terraform-Complete)
3838
configuration_file_path: "<configuration-file-path>" # Only required for the `complete` starter module. NOTE: This must be an absolute path.
3939
default_postfix: "<postfix>"
40+
41+
# Advanced Inputs
42+
bootstrap_module_version: "latest"
43+
starter_module_version: "latest"
44+
#output_folder_path: "/accelerator/output"

0 commit comments

Comments
 (0)