Updates to deploy local

oZakari · oZakari · commit 8ec856bacc7a · 2025-11-15T23:30:10.000-06:00
diff --git a/alz/local/locals.files.tf b/alz/local/locals.files.tf
@@ -15,10 +15,10 @@ locals {
 
   target_folder_name = local.is_bicep_avm ? "scripts-bicep-avm" : "scripts"
 
-  # Get a list of on-demand folders
-  on_demand_folders = local.is_bicep_iac_type ? try(local.starter_module_config.on_demand_folders, []) : []
+  # Get a list of on-demand folders (only for classic bicep, not bicep-avm)
+  on_demand_folders = local.is_classic_bicep ? try(local.starter_module_config.on_demand_folders, []) : []
 
-  networking_type = local.is_classic_bicep && fileexists("${var.module_folder_path}/${var.bicep_parameters_file_path}") ? jsondecode(file("${var.module_folder_path}/${var.bicep_parameters_file_path}")).NETWORK_TYPE : ""
+  networking_type = local.is_bicep_avm ? var.network_type : (local.is_classic_bicep && fileexists("${var.module_folder_path}/${var.bicep_parameters_file_path}") ? jsondecode(file("${var.module_folder_path}/${var.bicep_parameters_file_path}")).NETWORK_TYPE : "")
   script_files = local.is_bicep_iac_type ? { for script_file in local.script_files_all : format("%03d", script_file.order) => {
     name                       = script_file.name
     displayName                = script_file.displayName
@@ -36,13 +36,27 @@ locals {
     {
       content = templatefile("${local.deploy_script_file_directory_path}/${deploy_script_file}", {
         script_files                   = local.script_files
-        on_demand_folders              = local.on_demand_folders
-        on_demand_folder_repository    = var.on_demand_folder_repository
-        on_demand_folder_artifact_name = var.on_demand_folder_artifact_name
+        on_demand_folders              = local.is_classic_bicep ? local.on_demand_folders : []
+        on_demand_folder_repository    = local.is_classic_bicep ? var.on_demand_folder_repository : ""
+        on_demand_folder_artifact_name = local.is_classic_bicep ? var.on_demand_folder_artifact_name : ""
       })
     }
   }
 
+  # Add parameters.json for bicep-avm
+  parameters_json_file = local.is_bicep_avm ? {
+    "${local.target_folder_name}/parameters.json" = {
+      content = templatefile("${local.deploy_script_file_directory_path}/parameters.json.tftpl", {
+        management_group_id          = local.root_parent_management_group_id
+        subscription_id_management   = try(var.subscription_ids["management"], var.subscription_id_management, "")
+        subscription_id_identity     = try(var.subscription_ids["identity"], var.subscription_id_identity, "")
+        subscription_id_connectivity = try(var.subscription_ids["connectivity"], var.subscription_id_connectivity, "")
+        location                     = var.bootstrap_location
+        network_type                 = local.networking_type
+      })
+    }
+  } : {}
+
   module_files = { for key, value in module.files.files : key =>
     {
       content = try(replace((file(value.path)), "# backend \"azurerm\" {}", (var.create_bootstrap_resources_in_azure ? "backend \"azurerm\" {}" : "backend \"local\" {}")), "unsupported_file_type")
@@ -52,13 +66,13 @@ locals {
   # Build a map of module files with types that are supported
   module_files_supported = { for key, value in local.module_files : key => value if value.content != "unsupported_file_type" && !endswith(key, "-cache.json") && !endswith(key, local.bicep_config_file_path) }
 
-  # Build a list of files to exclude from the repository based on the on-demand folders
-  excluded_module_files = distinct(flatten([for exclusion in local.on_demand_folders :
+  # Build a list of files to exclude from the repository based on the on-demand folders (only for classic bicep)
+  excluded_module_files = local.is_classic_bicep ? distinct(flatten([for exclusion in local.on_demand_folders :
     [for key, value in local.module_files_supported : key if startswith(key, exclusion.target)]
-  ]))
+  ])) : []
 
   # Filter out the excluded files
   module_files_filtered = { for key, value in local.module_files_supported : key => value if !contains(local.excluded_module_files, key) }
 
-  final_module_files = merge(local.module_files_filtered, local.deploy_script_files_parsed)
+  final_module_files = merge(local.module_files_filtered, local.deploy_script_files_parsed, local.parameters_json_file)
 }
diff --git a/alz/local/scripts-bicep-avm/bicep-deploy.ps1 b/alz/local/scripts-bicep-avm/bicep-deploy.ps1
@@ -1,4 +1,5 @@
 param(
+    [string]$name,
     [string]$displayName,
     [string]$templateFilePath,
     [string]$templateParametersFilePath,
@@ -9,6 +10,12 @@ param(
     [string]$deploymentType
 )
 
+# Resolve template paths relative to the script's parent directory (where templates folder is located)
+$scriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Definition
+$templateRoot = Split-Path -Parent $scriptRoot
+$templateFilePath = Join-Path $templateRoot $templateFilePath
+$templateParametersFilePath = Join-Path $templateRoot $templateParametersFilePath
+
 Write-Host "<---------------------------------------------------------------------------->" -ForegroundColor Blue
 Write-Host "Starting deployment stack for $displayName..." -ForegroundColor Blue
 Write-Host "<---------------------------------------------------------------------------->" -ForegroundColor Blue
@@ -23,35 +30,42 @@ Write-Host "Resource Group Name: $resourceGroupName" -ForegroundColor DarkGray
 Write-Host "Location: $location" -ForegroundColor DarkGray
 Write-Host "Deployment Type: $deploymentType" -ForegroundColor DarkGray
 
-$deploymentPrefix = $env:PREFIX
-$deploymentName = $displayName.Replace(" ", "-")
-$deploymentTimeStamp = Get-Date -Format 'yyyyMMddHHmmss'
-
-$prefixPostFixAndHyphenLength = $deploymentPrefix.Length + $deploymentTimeStamp.Length + 2
-$deploymentNameMaxLength = 61 - $prefixPostFixAndHyphenLength
+$deploymentName = $name
+Write-Host "Deployment Stack Name: $deploymentName"
+Write-Host ""
 
-if($deploymentName.Length -gt $deploymentNameMaxLength) {
-    $deploymentName = $deploymentName.Substring(0, $deploymentNameMaxLength)
+# Check if template files exist
+if (-not (Test-Path $templateFilePath)) {
+    Write-Error "Template file not found: $templateFilePath"
+    throw "Template file not found: $templateFilePath"
 }
+Write-Host "Template file exists: $templateFilePath" -ForegroundColor Green
 
-$deploymentName = "$deploymentPrefix-$deploymentName-$deploymentTimeStamp"
-Write-Host "Deployment Stack Name: $deploymentName"
+if (-not (Test-Path $templateParametersFilePath)) {
+    Write-Error "Template parameters file not found: $templateParametersFilePath"
+    throw "Template parameters file not found: $templateParametersFilePath"
+}
+Write-Host "Template parameters file exists: $templateParametersFilePath" -ForegroundColor Green
+Write-Host ""
 
 $stackParameters = @{
     Name                  = $deploymentName
     TemplateFile          = $templateFilePath
     TemplateParameterFile = $templateParametersFilePath
+    DenySettingsMode      = "None"
+    ActionOnUnmanage      = "DeleteAll"
     Force                 = $true
+    Verbose               = $true
 }
 
 $retryCount = 0
-$retryMax = 30
+$retryMax = 5
 $initialRetryDelay = 20
-$retryDelayIncrement = 10
+$retryDelayIncrement = 5
 $finalSuccess = $false
 
 while ($retryCount -lt $retryMax) {
-    if($retryCount -gt 0) {
+    if ($retryCount -gt 0) {
         $retryDelay = $initialRetryDelay + ($retryCount * $retryDelayIncrement)
         Write-Host "Retrying deployment stack after $retryDelay seconds..." -ForegroundColor Green
         Start-Sleep -Seconds $retryDelay
@@ -105,10 +119,10 @@ while ($retryCount -lt $retryMax) {
     }
 
     Write-Host "Deployment Stack ID: $($result.Id)"
-    Write-Host "Provisioning State: $($result.Properties.ProvisioningState)"
+    Write-Host "Provisioning State: $($result.ProvisioningState)"
 
-    if($result.Properties.ProvisioningState -ne "Succeeded") {
-        Write-Host "Deployment stack provisioning did not succeed. Entering retry loop..." -ForegroundColor Red
+    if ($result.ProvisioningState -ne "succeeded") {
+        Write-Host "Deployment stack provisioning did not succeed. Current state: $($result.ProvisioningState). Entering retry loop..." -ForegroundColor Red
         $retryCount++
     } else {
         $finalSuccess = $true
diff --git a/alz/local/scripts-bicep-avm/bicep-get-variables.ps1 b/alz/local/scripts-bicep-avm/bicep-get-variables.ps1
@@ -2,12 +2,15 @@ param(
     [string]$fileName="parameters.json"
 )
 
-Write-Host "Getting variables from $fileName"
-$json = Get-Content -Path $fileName | ConvertFrom-Json
+$scriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Definition
+$parametersPath = Join-Path $scriptRoot $fileName
+
+Write-Host "Getting variables from $parametersPath"
+$json = Get-Content -Path $parametersPath | ConvertFrom-Json
 
 foreach ($key in $json.PSObject.Properties) {
   $envVarName = $key.Name
   $envVarValue = $key.Value
-  [Environment]::SetEnvironmentVariable($envVarName, $envVarValue)
+  [Environment]::SetEnvironmentVariable($envVarName, $envVarValue, "Process")
   Write-Output "Set $envVarName to $envVarValue"
 }
diff --git a/alz/local/scripts-bicep-avm/deploy-local.ps1 b/alz/local/scripts-bicep-avm/deploy-local.ps1
@@ -8,28 +8,19 @@ Write-Host "Verbose: $verbose"
 # Getting the variables from the parameters.json file
 & (Join-Path $scriptRoot 'bicep-get-variables.ps1') -fileName "parameters.json"
 
-%{ for on_demand_folder in on_demand_folders ~}
-# Downloading the on demand folder for ${on_demand_folder.target}
-& (Join-Path $scriptRoot 'bicep-on-demand-folder.ps1') `
-    -repository "${on_demand_folder_repository}" `
-    -releaseArtifactName "${on_demand_folder_artifact_name}" `
-    -releaseVersion $env:RELEASE_VERSION `
-    -sourcePath "${on_demand_folder.source}" `
-    -targetPath "${on_demand_folder.target}" `
-%{ endfor ~}
-
 Write-Host ""
 $deployApproved = Read-Host -Prompt "Type 'yes' and hit Enter to continue with the full deployment"
 Write-Host ""
 
-if($deployApproved -ne "yes") {
+if ($deployApproved -ne "yes") {
     Write-Error "Deployment was not approved. Exiting..."
     exit 1
 }
 
 %{ for script_file in script_files ~}
 # Running deployment stack for ${script_file.displayName}
 & (Join-Path $scriptRoot 'bicep-deploy.ps1') `
+    -name "${script_file.name}" `
     -displayName "${script_file.displayName}" `
     -templateFilePath "${script_file.templateFilePath}" `
     -templateParametersFilePath "${script_file.templateParametersFilePath}" `
diff --git a/alz/local/scripts-bicep-avm/parameters.json.tftpl b/alz/local/scripts-bicep-avm/parameters.json.tftpl
@@ -0,0 +1,8 @@
+{
+    "MANAGEMENT_GROUP_ID": "${management_group_id}",
+    "SUBSCRIPTION_ID_MANAGEMENT": "${subscription_id_management}",
+    "SUBSCRIPTION_ID_IDENTITY": "${subscription_id_identity}",
+    "SUBSCRIPTION_ID_CONNECTIVITY": "${subscription_id_connectivity}",
+    "LOCATION": "${location}",
+    "NETWORK_TYPE": "${network_type}"
+}
diff --git a/alz/local/variables.tf b/alz/local/variables.tf
@@ -77,6 +77,12 @@ variable "bootstrap_location" {
   default     = ""
 }
 
+variable "network_type" {
+  description = "The network type for the deployment (e.g. 'hubNetworking' or 'vwanConnectivity')"
+  type        = string
+  default     = ""
+}
+
 variable "on_demand_folder_repository" {
   description = "The repository to use for the on-demand folders"
   type        = string
