diff --git a/.github/tests/scripts/destroy.ps1 b/.github/tests/scripts/destroy.ps1 index 9b58164..c7906df 100644 --- a/.github/tests/scripts/destroy.ps1 +++ b/.github/tests/scripts/destroy.ps1 @@ -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") { +if(Test-Path -Path "$bootstrapDirectoryPath/override.tfvars.json") { Write-Host "Bootstrap tfvars Exists" } else { Write-Host "Bootstrap tfvars does not exist, so there is nothing to clean up. Exiting now." diff --git a/.github/workflows/end-to-end-test.yml b/.github/workflows/end-to-end-test.yml index 8d01ae3..876c362 100644 --- a/.github/workflows/end-to-end-test.yml +++ b/.github/workflows/end-to-end-test.yml @@ -249,7 +249,7 @@ jobs: $Inputs["create_bootstrap_resources_in_azure"] = $localDeployAzureResources } - $Inputs["apply_approvers"] = "" + $Inputs["apply_approvers"] = @() $Inputs["root_parent_management_group_id"] = "" $Inputs["subscription_id_connectivity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}" $Inputs["subscription_id_identity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}" @@ -278,7 +278,8 @@ jobs: $Inputs["ConnectivitySubscriptionId"] = "${{ vars.ARM_SUBSCRIPTION_ID }}" } - $json = $Inputs | ConvertTo-Json -Depth 100 | Out-File -FilePath inputs.json -Encoding utf8 -Force + $json = ConvertTo-Json $Inputs -Depth 100 + $json | Out-File -FilePath inputs.json -Encoding utf8 -Force shell: pwsh