Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,31 @@ param (
. $PSScriptRoot/TestResources-Helpers.ps1
. $PSScriptRoot/SubConfig-Helpers.ps1

function SerializeForTrace($value) {
if ($null -eq $value) {
return '<null>'
}

try {
return ($value | ConvertTo-Json -Depth 20 -Compress)
}
catch {
return "<serialization failed: $($_.Exception.Message)>"
}
}

function TraceParameterSnapshot($step) {
Write-Verbose "[TraceParameterFlow] Step: $step"
Write-Verbose "[TraceParameterFlow] ArmTemplateParameters: $(SerializeForTrace $ArmTemplateParameters)"
Write-Verbose "[TraceParameterFlow] AdditionalParameters: $(SerializeForTrace $AdditionalParameters)"
Write-Verbose "[TraceParameterFlow] PSBoundParameters: $(SerializeForTrace $PSBoundParameters)"
}

function TraceTemplateParameters($step, $templateParametersSnapshot) {
Write-Verbose "[TraceParameterFlow] Step: $step"
Write-Verbose "[TraceParameterFlow] templateParameters: $(SerializeForTrace $templateParametersSnapshot)"
}

$wellKnownTMETenants = @('70a036f6-8e4d-4615-bad6-149c02e7720d')

# People keep passing this legacy parameter. Throw an error to save them future keystrokes
Expand Down Expand Up @@ -687,6 +712,7 @@ try {
}

if (Test-Path $postDeploymentScript) {
TraceParameterSnapshot "Entered post-deployment script branch for '$postDeploymentScript'"
if ($SelfContainedPostScript) {
Log "Creating invokable post-deployment script '$SelfContainedPostScript' from '$postDeploymentScript'"

Expand All @@ -709,10 +735,13 @@ $serialized
# Set global variables that aren't always passed as parameters
`$ResourceGroupName = `$parameters.ResourceGroupName
`$AdditionalParameters = `$parameters.AdditionalParameters
`$ArmTemplateParameters = `$parameters.ArmTemplateParameters
Comment thread
minhanh-phan marked this conversation as resolved.
Outdated
`$DeploymentOutputs = `$parameters.DeploymentOutputs
$postDeploymentScript `@parameters
"@
$outScript | Out-File $SelfContainedPostScript
Write-Verbose "[TraceParameterFlow] Step: Out script content before writing '$SelfContainedPostScript'"
Write-Verbose "[TraceParameterFlow] outScript: $outScript"
} else {
Log "Invoking post-deployment script '$postDeploymentScript'"
&$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extends:
SKIP_SP_LIVE_TESTS: "true"

${{ if endsWith(variables['Build.DefinitionName'], 'weekly') }}:
AdditionalMatrixConfigs:
MatrixConfigs:
- Name: Identity_msi_live_test_base
Path: sdk/identity/identity/managed-identity-matrix.json
Selection: sparse
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/test-resources-post.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ param(
$RemainingArguments
)

if (!$AdditionalParameters['deployMIResources']) {
if (!$ArmTemplateParameters['deployMIResources']) {
Write-Host "Skipping post-provisioning script because resources weren't deployed"
return
}
Expand Down
Loading