Skip to content

[Modules] Replacing hardcoded environment URLs with the environment() function #2358

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
krbar merged 5 commits into from
Nov 24, 2022
Merged

[Modules] Replacing hardcoded environment URLs with the environment() function #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c819ea7
replacing "core.windows.net"
krbar Nov 14, 2022
673341c
replacing "azurefd.net"
krbar Nov 14, 2022
1e117ff
replacing ".azurecr.io"
krbar Nov 14, 2022
85059d7
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
krbar Nov 22, 2022
2533195
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
krbar Nov 22, 2022
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
2 changes: 1 addition & 1 deletion modules/Microsoft.Compute/disks/.test/import/dependencies.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ resource copyVhdDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-
}

@description('The URI of the created VHD.')
output vhdUri string = 'https://${storageAccount.name}.blob.core.windows.net/vhds/${imageTemplateNamePrefix}.vhd'
output vhdUri string = 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/vhds/${imageTemplateNamePrefix}.vhd'

@description('The resource ID of the created Storage Account.')
output storageAccountResourceId string = storageAccount.id
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.Compute/images/.test/common/dependencies.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ resource keyPermissions 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}

@description('The URI of the created VHD.')
output vhdUri string = 'https://${storageAccount.name}.blob.core.windows.net/vhds/${imageTemplateNamePrefix}.vhd'
output vhdUri string = 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/vhds/${imageTemplateNamePrefix}.vhd'

@description('The principal ID of the created Managed Identity.')
output managedIdentityPrincipalId string = managedIdentity.properties.principalId
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = {
}

resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
name: 'privatelink.azurecr.io'
name: 'privatelink${environment().suffixes.acrLoginServer}'
location: 'global'

resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = {
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = {
}

resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
name: 'privatelink.azurecr.io'
name: 'privatelink${environment().suffixes.acrLoginServer}'
location: 'global'

resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = {
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.Network/frontDoors/.test/common/deploy.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ module testDeployment '../../deploy.bicep' = {
{
name: 'frontEnd'
properties: {
hostName: '${resourceName}.azurefd.net'
hostName: '${resourceName}.${environment().suffixes.azureFrontDoorEndpointSuffix}'
sessionAffinityEnabledState: 'Disabled'
sessionAffinityTtlSeconds: 60
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.Network/frontDoors/.test/min/deploy.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module testDeployment '../../deploy.bicep' = {
{
name: 'frontEnd'
properties: {
hostName: '${resourceName}.azurefd.net'
hostName: '${resourceName}.${environment().suffixes.azureFrontDoorEndpointSuffix}'
sessionAffinityEnabledState: 'Disabled'
sessionAffinityTtlSeconds: 60
}
Expand Down