Skip to content

Commit a954c7c

Browse files
committed
Fix validation and colour warning
1 parent 366c087 commit a954c7c

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

src/ALZ/Private/Tools/Test-Tooling.ps1

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ function Test-Tooling {
5959
$envVarValue = [System.Environment]::GetEnvironmentVariable($envVar)
6060
if($envVarValue -eq $null -or $envVarValue -eq "" ) {
6161
$envVarsSet = $false
62-
break
62+
continue
6363
}
6464
$envVarAtLeastOneSet = $true
6565
$envVarsWithValue += $envVar
6666
if($envVarValue -notmatch("^(\{){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}$")) {
6767
$envVarValid = $false
68-
break
68+
continue
6969
}
7070
if($checkedEnvVars -contains $envVarValue) {
7171
$envVarUnique = $false
72-
break
72+
continue
7373
}
7474
$checkedEnvVars += $envVarValue
7575
}
@@ -85,7 +85,7 @@ function Test-Tooling {
8585

8686
if(-not $envVarValid) {
8787
$checkResults += @{
88-
message = "Azure environment variables are set, but are not valid GUIDs."
88+
message = "Azure environment variables are set, but are not all valid GUIDs."
8989
result = "Failure"
9090
}
9191
}
@@ -104,8 +104,13 @@ function Test-Tooling {
104104
$hasFailure = $true
105105
} else {
106106
if($envVarAtLeastOneSet) {
107+
$envVarValidationOutput = ""
108+
foreach($envVar in $envVarsWithValue) {
109+
$envVarValue = [System.Environment]::GetEnvironmentVariable($envVar)
110+
$envVarValidationOutput += " $envVar ($envVarValue)"
111+
}
107112
$checkResults += @{
108-
message = "At least one environment variables is set, but the other expected environment variables are not set. This could cause Terraform to fail in unexpected ways. Set environment variables: $($envVarsWithValue -join " ")."
113+
message = "At least one environment variable is set, but the other expected environment variables are not set. This could cause Terraform to fail in unexpected ways. Set environment variables:$envVarValidationOutput."
109114
result = "Warning"
110115
}
111116
}

0 commit comments

Comments
 (0)