Skip to content

Commit

Permalink
Scripts to generate config from template, support JSON config intelli…
Browse files Browse the repository at this point in the history
…sense in editors, fix bugs in deployment scripts (Azure#379)

Fixes path normalization bug in deployment scripts Azure#374
Fixes subscription filtering bug in deployment scripts Azure#375
Adds CanadaPubSecALZ configuration JSON schema support for editors Azure#376
Adds Scripts to generate CanadaPubSecALZ configuration files using existing environments as template Azure#377
Adds Deploy landing zones to new Azure subscriptions in new primary tenant Azure#378
  • Loading branch information
skeeler authored Jul 10, 2023
1 parent 5830bcb commit db45632
Show file tree
Hide file tree
Showing 51 changed files with 3,408 additions and 987 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/0-everything.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:
required: false
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/1-management-groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/2-roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3-logging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/4-policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/5-azure-firewall-policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/5-hub-network-with-azure-firewall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/5-hub-network-with-nva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/6-identity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
inputs:
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/7-subscriptions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
required: true
environmentName:
type: string
description: Environment name (optional), e.g. CanadaESLZ-main
description: Environment name (optional), e.g. CanadaPubSecALZ-main
required: false

defaults:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
experiments/*
**/*.swp
**/*.diff
.vscode/*
/*.sh
/*.ps1
Expand Down
6 changes: 5 additions & 1 deletion .pipelines/templates/jobs/trigger-subscriptions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,17 @@ jobs:
{
$url = "$($env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)$env:SYSTEM_TEAMPROJECTID/_apis/pipelines/$($env:SYSTEM_DEFINITIONID)/runs?api-version=6.0-preview.1"
Write-Host "Invoking pipeline definition with URL: $url"
$paths = $env:SUBSCRIPTION_CHANGES -split ','
$guids = $paths -replace '.*?([0-9a-f]{8}[-]?([0-9a-f]{4}[-]?){3}[0-9a-f]{12}).*', '$1'
$changes = $guids -join ','
$body = @"
{
"templateParameters": {
"subscriptions":"[$env:SUBSCRIPTION_CHANGES]"
"subscriptions":"[$changes]"
},
}
"@
Write-Host "Invoking pipeline definition with body: $body"
$headers = @{ Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN" }
$pipeline = Invoke-RestMethod -Uri $url -Headers $headers -Method Post -Body $body -ContentType application/json
Write-Host "Pipeline invocation result = $($pipeline | ConvertTo-Json -Depth 100)"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ See the following onboarding guides for setup instructions:
* [Azure DevOps Setup](docs/onboarding/azure-devops-setup.md) provides guidance on considerations and recommended practices when creating and configuring your Azure DevOps Services environment.
* [Azure DevOps Scripts](docs/onboarding/azure-devops-scripts.md) provides guidance on the scripts available to help simplify the onboarding process to Azure Landing Zones design using Azure DevOps pipelines.
* [Azure DevOps Pipelines](docs/onboarding/azure-devops-pipelines.md) provides guidance on the manual steps for onboarding to the Azure Landing Zones design using Azure DevOps Pipelines.
* [Configuration Scripts](docs/onboarding/configuration-scripts.md) provides guidance on the scripts available to help simplify the configuration process of the Azure Landing Zones design.

## Goals

Expand Down
170 changes: 0 additions & 170 deletions config/identity/CanadaESLZ-main/identity.parameters.json

This file was deleted.

Loading

0 comments on commit db45632

Please sign in to comment.