Skip to content

Sync eng/common directory with azure-sdk-tools for PR 8319 #5653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azure-sdk merged 7 commits into from
May 28, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 8319 #5653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e1abb0
Add static file secret-less sub-config support
danieljurek May 21, 2024
4384f53
Review feedback: if/else
danieljurek May 22, 2024
bc16373
http -> https
danieljurek May 22, 2024
9b577a4
Update eng/common/TestResources/deploy-test-resources.yml
weshaggard May 22, 2024
a81bc60
Space cleanup
danieljurek May 22, 2024
90f7a31
Add AzurePublicMsft.json
danieljurek May 28, 2024
088864b
Remove EnvironmentVariables
danieljurek May 28, 2024
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
Prev Previous commit
Next Next commit
Review feedback: if/else
  • Loading branch information
@danieljurek @azure-sdk
danieljurek authored and azure-sdk committed May 28, 2024
commit 4384f53031d1bb86a8be8bf01393b4eb387b90f6
10 changes: 7 additions & 3 deletions eng/common/TestResources/deploy-test-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,18 @@ steps:
Inline: |
eng/common/scripts/Import-AzModules.ps1

$subscriptionConfiguration = @'
${{ parameters.SubscriptionConfiguration }}
'@ | ConvertFrom-Json -AsHashtable;


if ('${{ parameters.SubscriptionConfigurationFilePath }}' -ne '') {
$subscriptionConfiguration = `
Get-Content '${{ parameters.SubscriptionConfigurationFilePath }}' `
| ConvertFrom-Json -AsHashtable;
} else {
# Multiline string termination ('@) needs to be at the beginning
# of the line
$subscriptionConfiguration = @'
${{ parameters.SubscriptionConfiguration }}
'@ | ConvertFrom-Json -AsHashtable;
}

# The subscriptionConfiguration may have ArmTemplateParameters defined, so
Expand Down
10 changes: 7 additions & 3 deletions eng/common/TestResources/remove-test-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@ steps:
Inline: |
eng/common/scripts/Import-AzModules.ps1

$subscriptionConfiguration = @"
${{ parameters.SubscriptionConfiguration }}
"@ | ConvertFrom-Json -AsHashtable;

if ('${{ parameters.SubscriptionConfigurationFilePath }}' -ne '') {
$subscriptionConfiguration = `
Get-Content '${{ parameters.SubscriptionConfigurationFilePath }}' `
| ConvertFrom-Json -AsHashtable;
} else {
# Multiline string termination ("@) needs to be at the beginning
# of the line
$subscriptionConfiguration = @"
${{ parameters.SubscriptionConfiguration }}
"@ | ConvertFrom-Json -AsHashtable;

}

eng/common/TestResources/Remove-TestResources.ps1 `
Expand Down