Skip to content

Commit

Permalink
feat: remove ui support (#43)
Browse files Browse the repository at this point in the history 
* Remove redundant UI related config

* Remove tfvars file for simplicity

* Update e2e tests

* Fix typo

* Fix type

* Remove legacy bicep from e2e tests

* Fix path for tfvars

* Add single region check

* Add local script files for Bicep

* Fix storage perm bug and filter script files for Terraform

* Linting

* fix linting

* linting

* linting
  • Loading branch information
@jaredfholgate
jaredfholgate authored Oct 2, 2024
1 parent 8e506b2 commit bd84242
Show file tree
Hide file tree
Showing 25 changed files with 613 additions and 507 deletions.
189 changes: 9 additions & 180 deletions .config/ALZ-Powershell.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,18 @@
"location": "alz/azuredevops",
"short_name": "Azure DevOps: Azure Landing Zones",
"description": "Azure Landing Zones with Azure DevOps",
"input_variable_files": [ "variables.input.tf" ],
"interface_variable_files": [ "variables.interface.tf" ],
"interface_config_file": "alz/.config/ALZ-Powershell.config.json",
"aliases": [ "azuredevops" ],
"starter_modules": "alz"
},
"alz_github": {
"location": "alz/github",
"short_name": "GitHub: Azure Landing Zones",
"description": "Azure Landing Zones with GitHub",
"input_variable_files": [ "variables.input.tf" ],
"interface_variable_files": [ "variables.interface.tf" ],
"interface_config_file": "alz/.config/ALZ-Powershell.config.json",
"aliases": [ "github" ],
"starter_modules": "alz"
},
"alz_local": {
"location": "alz/local",
"short_name": "Local: Azure Landing Zones",
"description": "Azure Landing Zones for local file system",
"input_variable_files": [ "variables.input.tf" ],
"interface_variable_files": [ "variables.interface.tf" ],
"interface_config_file": "alz/.config/ALZ-Powershell.config.json",
"aliases": [ "local" ],
"starter_modules": "alz"
}
},
Expand Down Expand Up @@ -60,85 +48,6 @@
]
}
},
"azure_location": {
"Type": "AllowedValues",
"Description": "An Azure deployment location e.g. 'uksouth'",
"AllowedValues": {
"Display": false,
"Values": [
"australiacentral",
"australiacentral2",
"australiaeast",
"australiasoutheast",
"brazilsouth",
"brazilsoutheast",
"centraluseuap",
"canadacentral",
"canadaeast",
"centralus",
"eastasia",
"eastus2euap",
"eastus",
"eastus2",
"francecentral",
"francesouth",
"germanycentral",
"germanynorth",
"germanynortheast",
"germanywestcentral",
"israelcentral",
"italynorth",
"centralindia",
"southindia",
"westindia",
"japaneast",
"japanwest",
"jioindiacentral",
"jioindiawest",
"koreacentral",
"koreasouth",
"northcentralus",
"northeurope",
"norwayeast",
"norwaywest",
"polandcentral",
"qatarcentral",
"southafricanorth",
"southafricawest",
"southcentralus",
"swedencentral",
"swedensouth",
"southeastasia",
"switzerlandnorth",
"switzerlandwest",
"uaecentral",
"uaenorth",
"uksouth",
"ukwest",
"westcentralus",
"westeurope",
"westus",
"westus2",
"westus3",
"usdodcentral",
"usdodeast",
"usgovarizona",
"usgoviowa",
"usgovtexas",
"usgovvirginia",
"usnateast",
"usnatwest",
"usseceast",
"ussecwest",
"chinanorth",
"chinanorth2",
"chinanorth3",
"chinaeast",
"chinaeast2",
"chinaeast3"
]
}
},
"azure_subscription_id": {
"Type": "Valid",
"Description": "A valid subscription id GUID e.g. '12345678-1234-1234-1234-123456789012'",
Expand All @@ -159,22 +68,6 @@
"Description": "A valid GUID e.g. '12345678-1234-1234-1234-123456789012'",
"Valid": "^( {){0,1}[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}(}){0,1}$"
},
"bool": {
"Type": "AllowedValues",
"Description": "A boolean value e.g. 'true'",
"AllowedValues": {
"Display": true,
"Values": [
"true",
"false"
]
}
},
"number": {
"Type": "Valid",
"Description": "A number e.g. '1234'",
"Valid": "^(0|[1-9][0-9]*)$"
},
"cidr_range": {
"Type": "Valid",
"Description": "A valid CIDR range e.g '10.0.0.0/16'",
Expand Down Expand Up @@ -203,78 +96,14 @@
"Type": "Valid",
"Description": "A valid email address",
"Valid": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
},
"azure_location": {
"Type": "AllowedValues",
"Description": "An Azure deployment location e.g. 'uksouth'",
"AllowedValues": {
"Display": false,
"Values": [ "This is dynamically populated from Azure" ]
}
}
},
"zonesSupport": [
{"region":"australiacentral", "zones":[]},
{"region":"australiacentral2", "zones": []},
{"region":"australiaeast", "zones": ["1","2","3"]},
{"region":"australiasoutheast", "zones": []},
{"region":"brazilsouth", "zones": ["1","2","3"]},
{"region":"brazilsoutheast", "zones": []},
{"region":"centraluseuap", "zones": ["1","2"]},
{"region":"canadacentral", "zones": ["1","2","3"]},
{"region":"canadaeast", "zones": []},
{"region":"centralus", "zones": ["1","2","3"]},
{"region":"eastasia", "zones": ["1","2","3"]},
{"region":"eastus2euap", "zones": ["1","2","3"]},
{"region":"eastus", "zones": ["1","2","3"]},
{"region":"eastus2", "zones": ["1","2","3"]},
{"region":"francecentral", "zones": ["1","2","3"]},
{"region":"francesouth", "zones": []},
{"region":"germanycentral", "zones": []},
{"region":"germanynorth", "zones": []},
{"region":"germanynortheast", "zones": []},
{"region":"germanywestcentral", "zones": ["1","2","3"]},
{"region":"israelcentral", "zones": ["1","2","3"]},
{"region":"italynorth", "zones": ["1","2","3"]},
{"region":"centralindia", "zones": ["1","2","3"]},
{"region":"southindia", "zones": []},
{"region":"westindia", "zones": []},
{"region":"japaneast", "zones": ["1","2","3"]},
{"region":"japanwest", "zones": []},
{"region":"jioindiacentral", "zones": []},
{"region":"jioindiawest", "zones": []},
{"region":"koreacentral", "zones": ["1","2","3"]},
{"region":"koreasouth", "zones": []},
{"region":"northcentralus", "zones": ["1","2","3"]},
{"region":"northeurope", "zones": ["1","2","3"]},
{"region":"norwayeast", "zones": ["1","2","3"]},
{"region":"norwaywest", "zones": []},
{"region":"polandcentral", "zones": ["1","2","3"]},
{"region":"qatarcentral", "zones": ["1","2","3"]},
{"region":"southafricanorth", "zones": ["1","2","3"]},
{"region":"southafricawest", "zones": []},
{"region":"southcentralus", "zones": ["1","2","3"]},
{"region":"swedencentral", "zones": ["1","2","3"]},
{"region":"swedensouth", "zones": []},
{"region":"southeastasia", "zones": ["1","2","3"]},
{"region":"switzerlandnorth", "zones": ["1","2","3"]},
{"region":"switzerlandwest", "zones": []},
{"region":"uaecentral", "zones": []},
{"region":"uaenorth", "zones": ["1","2","3"]},
{"region":"uksouth", "zones": ["1","2","3"]},
{"region":"ukwest", "zones": []},
{"region":"westcentralus", "zones": []},
{"region":"westeurope", "zones": ["1","2","3"]},
{"region":"westus", "zones": ["1","2","3"]},
{"region":"westus2", "zones": ["1","2","3"]},
{"region":"westus3", "zones": ["1","2","3"]},
{"region":"usdodcentral", "zones": []},
{"region":"usdodeast", "zones": []},
{"region":"usgovarizona", "zones": []},
{"region":"usgoviowa", "zones": []},
{"region":"usgovtexas", "zones": []},
{"region":"usgovvirginia", "zones": []},
{"region":"usnateast", "zones": []},
{"region":"usnatwest", "zones": []},
{"region":"usseceast", "zones": []},
{"region":"ussecwest", "zones": []},
{"region":"chinanorth", "zones": []},
{"region":"chinanorth2", "zones": []},
{"region":"chinanorth3", "zones": []},
{"region":"chinaeast", "zones": []},
{"region":"chinaeast2", "zones": []},
{"region":"chinaeast3", "zones": []}
]
}
}
2 changes: 1 addition & 1 deletion .github/tests/cleanup-scripts/cleanup_resouce_groups.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file can be used to clean up Resource Groups if there has been an issue with the End to End tests.
# CAUTION: Make sure you are connected to the correct subscription before running this script!
az account show
$resourceGroups = az group list --query "[?contains(name, '254-')]" | ConvertFrom-Json
$resourceGroups = az group list --query "[?contains(name, '355-')]" | ConvertFrom-Json

$resourceGroups | ForEach-Object -Parallel {
Write-Host "Deleting resource group: $($_.name)"
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/scripts/destroy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param (
$bootstrapDirectoryPath = "$($env:TARGET_FOLDER)/bootstrap/local/alz/$versionControlSystem"
Write-Host "Bootstrap Directory Path: $bootstrapDirectoryPath"

if(Test-Path -Path "$bootstrapDirectoryPath/override.tfvars.json") {
if(Test-Path -Path "$bootstrapDirectoryPath/terraform.tfvars.json") {
Write-Host "Bootstrap tfvars Exists"
} else {
Write-Host "Bootstrap tfvars does not exist, so there is nothing to clean up. Exiting now."
Expand Down
Loading

0 comments on commit bd84242

Please sign in to comment.