Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rahalan authored May 3, 2024
2 parents 8ab5247 + bf2f123 commit bdcd0c0
Show file tree
Hide file tree
Showing 164 changed files with 816 additions and 130 deletions.
11 changes: 11 additions & 0 deletions .github/actions/templates/avm-getWorkflowInput/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ runs:
# Output values to be accessed by next jobs
$workflowInput = @{}
foreach($parameterName in $parameters.Keys) {
if([String]::IsNullOrEmpty($parameters[$parameterName])) {
Write-Verbose "Skipping parameter [$parameterName] as it has no explicit or default value" -Verbose
continue
}
Write-Verbose ('Passing output [{0}] with value [{1}]' -f $parameterName, $parameters[$parameterName]) -Verbose
$workflowInput[$parameterName] = $parameters[$parameterName]
}
Expand All @@ -88,6 +93,12 @@ runs:
# Output values to be accessed by next jobs
$workflowInput = @{}
foreach($parameterName in $workflowParameters.Keys) {
if([String]::IsNullOrEmpty($workflowParameters[$parameterName])) {
Write-Verbose "Skipping parameter [$parameterName] as it has no explicit or default value" -Verbose
continue
}
Write-Verbose ('Passing output [{0}] with value [{1}]' -f $parameterName, $workflowParameters[$parameterName]) -Verbose
$workflowInput[$parameterName] = $workflowParameters[$parameterName].toString()
}
Expand Down
17 changes: 13 additions & 4 deletions .github/actions/templates/avm-validateModuleDeployment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
## |======================================================================================================================================================================================|
## | Parameter | Required | Default | Description | Example |
## |----------------------------|----------|---------|-------------------------------------------------------|----------------------------------------------------------------------------|
## | modulePath | true | '' | The path to the module file directory | 'modules/api-management/service/main.bicep'
## | templateFilePath | true | '' | The path to the template file to use for deployment | 'modules/api-management/service/tests/e2e/maix/main.test.bicep' |
## | modulePath | true | '' | The path to the module file directory | 'modules/api-management/service/main.bicep' |
## | templateFilePath | true | '' | The path to the template file to use for deployment | 'modules/api-management/service/tests/e2e/maix/main.test.bicep' |
## | deploymentMetadataLocation | true | '' | The location to store the deployment metadata | 'WestEurope' |
## | subscriptionId | false | '' | The subscriptionId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' |
## | managementGroupId | false | '' | The managementGroupId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' |
## | customTokens | false | '' | Additional token pairs in json format. | '{"tokenName":"tokenValue"}' |
## | removeDeployment | false | 'true' | Set "true" to set module up for removal | 'true' |
## | customLocation | false | | Custom location overwrite, if needed | 'WestEurope' |
## |======================================================================================================================================================================================|
##
#########################################################
Expand Down Expand Up @@ -51,6 +52,9 @@ inputs:
description: 'Set "true" to set module up for removal'
default: "true"
required: false
customLocation:
description: "Custom location overwrite, if needed"
required: false

runs:
using: "composite"
Expand All @@ -73,7 +77,7 @@ runs:
Write-Output '::group::Get Recommended Regions'
# Load used functions
. (Join-Path $env:GITHUB_WORKSPACE 'avm' 'utilities' 'pipelines' 'e2eValidation' 'regionSelector' 'Get-AzAvailableResourceLocation.ps1')
. (Join-Path $env:GITHUB_WORKSPACE 'avm' 'utilities' 'pipelines' 'e2eValidation' 'regionSelector' 'Get-AvailableResourceLocation.ps1')
# Set function input parameters
$functionInput = @{
Expand All @@ -84,7 +88,12 @@ runs:
Write-Verbose "Invoke function with" -Verbose
Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
$resourceLocation = Get-AzAvailableResourceLocation @functionInput -Verbose
if([String]::IsNullOrEmpty('${{ inputs.customLocation }}')) {
$resourceLocation = Get-AvailableResourceLocation @functionInput -Verbose
} else {
$resourceLocation = '${{ inputs.customLocation }}'
Write-Verbose 'Using specified location [${{ inputs.customLocation }}]' -Verbose
}
Write-Verbose ('{0}-{1}' -f 'resourceLocation', $resourceLocation) -Verbose
Write-Output ('{0}={1}' -f 'resourceLocation', $resourceLocation) >> $env:GITHUB_OUTPUT
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.ptn.authorization.policy-assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.ptn.authorization.role-assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.ptn.policy-insights.remediation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.ptn.security.security-center.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.aad.domain-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.analysis-services.server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.api-management.service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.app.container-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.app.managed-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.automation.automation-account.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.batch.batch-account.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.cache.redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.cdn.profile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.cognitive-services.account.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.availability-set.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.disk-encryption-set.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.disk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.gallery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.ssh-public-key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.compute.virtual-machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.consumption.budget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.container-registry.registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/avm.res.data-factory.factory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
Expand Down
Loading

0 comments on commit bdcd0c0

Please sign in to comment.