Remove logic causing script to hang

Author: oZakari

src/ALZ/Private/Deploy-Accelerator-Helpers/New-Bootstrap.ps1

@@ -248,39 +248,23 @@ function New-Bootstrap {
             }
         }
 
-        if ($iac -in @("bicep", "bicep-avm")) {
-            $starterModuleDefinition = $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value)
-            Copy-ParametersFileCollection -starterPath $starterModulePath -configFiles $starterModuleDefinition.deployment_files
+        if($iac -eq "bicep") {
+            Copy-ParametersFileCollection -starterPath $starterModulePath -configFiles $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value).deployment_files
             Set-ComputedConfiguration -configuration $starterConfiguration
             Edit-ALZConfigurationFilesInPlace -alzEnvironmentDestination $starterModulePath -configuration $starterConfiguration
-            if ($iac -eq "bicep-avm") {
-                $bicepAvmEnvConfiguration = Get-BicepAvmEnvironmentConfiguration -inputConfig $inputConfig
-                $combinedConfiguration = [PSCustomObject]@{}
-
-                foreach ($property in $starterConfiguration.PSObject.Properties) {
-                    $combinedConfiguration | Add-Member -NotePropertyName $property.Name -NotePropertyValue $property.Value
-                }
-
-                foreach ($property in $bicepAvmEnvConfiguration.PSObject.Properties) {
-                    $combinedConfiguration | Add-Member -NotePropertyName $property.Name -NotePropertyValue $property.Value -Force
-                }
-
-                Write-JsonFile -jsonFilePath $starterBicepVarsPath -configuration $combinedConfiguration
-            } else {
-                Write-JsonFile -jsonFilePath $starterBicepVarsPath -configuration $starterConfiguration
-            }
+            Write-JsonFile -jsonFilePath $starterBicepVarsPath -configuration $starterConfiguration
 
             # Remove unrequired files
-            $foldersOrFilesToRetain = $starterModuleDefinition.folders_or_files_to_retain
+            $foldersOrFilesToRetain = $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value).folders_or_files_to_retain
             $foldersOrFilesToRetain += "parameters.json"
             $foldersOrFilesToRetain += "config"
             $foldersOrFilesToRetain += "starter-cache.json"
 
-            foreach ($deployment_file in $starterModuleDefinition.deployment_files) {
+            foreach($deployment_file in $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value).deployment_files) {
                 $foldersOrFilesToRetain += $deployment_file.templateParametersSourceFilePath
             }
 
-            $subFoldersOrFilesToRemove = $starterModuleDefinition.subfolders_or_files_to_remove
+            $subFoldersOrFilesToRemove = $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value).subfolders_or_files_to_remove
 
             Remove-UnrequiredFileSet -path $starterModulePath -foldersOrFilesToRetain $foldersOrFilesToRetain -subFoldersOrFilesToRemove $subFoldersOrFilesToRemove -writeVerboseLogs:$writeVerboseLogs.IsPresent
         }