From c819ea7d5c35007b85e0c28bdc9ffe0cfa8d169d Mon Sep 17 00:00:00 2001 From: Kris Baranek Date: Mon, 14 Nov 2022 22:50:05 +0100 Subject: [PATCH 1/3] replacing "core.windows.net" --- modules/Microsoft.Compute/disks/.test/import/dependencies.bicep | 2 +- .../Microsoft.Compute/images/.test/common/dependencies.bicep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep b/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep index dad8af70fe..b4956c7284 100644 --- a/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep +++ b/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep @@ -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 diff --git a/modules/Microsoft.Compute/images/.test/common/dependencies.bicep b/modules/Microsoft.Compute/images/.test/common/dependencies.bicep index d547eab677..58e74012eb 100644 --- a/modules/Microsoft.Compute/images/.test/common/dependencies.bicep +++ b/modules/Microsoft.Compute/images/.test/common/dependencies.bicep @@ -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 From 673341ca776374879b5deb59adfad1ac4e8c595b Mon Sep 17 00:00:00 2001 From: Kris Baranek Date: Mon, 14 Nov 2022 22:53:05 +0100 Subject: [PATCH 2/3] replacing "azurefd.net" --- .../Microsoft.Network/frontDoors/.test/common/deploy.test.bicep | 2 +- .../Microsoft.Network/frontDoors/.test/min/deploy.test.bicep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.Network/frontDoors/.test/common/deploy.test.bicep b/modules/Microsoft.Network/frontDoors/.test/common/deploy.test.bicep index 524c53f47d..11ec5a52bb 100644 --- a/modules/Microsoft.Network/frontDoors/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/frontDoors/.test/common/deploy.test.bicep @@ -74,7 +74,7 @@ module testDeployment '../../deploy.bicep' = { { name: 'frontEnd' properties: { - hostName: '${resourceName}.azurefd.net' + hostName: '${resourceName}.${environment().suffixes.azureFrontDoorEndpointSuffix}' sessionAffinityEnabledState: 'Disabled' sessionAffinityTtlSeconds: 60 } diff --git a/modules/Microsoft.Network/frontDoors/.test/min/deploy.test.bicep b/modules/Microsoft.Network/frontDoors/.test/min/deploy.test.bicep index f466f03f9e..fa3dc6452d 100644 --- a/modules/Microsoft.Network/frontDoors/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/frontDoors/.test/min/deploy.test.bicep @@ -37,7 +37,7 @@ module testDeployment '../../deploy.bicep' = { { name: 'frontEnd' properties: { - hostName: '${resourceName}.azurefd.net' + hostName: '${resourceName}.${environment().suffixes.azureFrontDoorEndpointSuffix}' sessionAffinityEnabledState: 'Disabled' sessionAffinityTtlSeconds: 60 } From 1e117ffc627068847049946a232f071c2cefff4f Mon Sep 17 00:00:00 2001 From: Kris Baranek Date: Mon, 14 Nov 2022 22:56:14 +0100 Subject: [PATCH 3/3] replacing ".azurecr.io" --- .../registries/.test/common/dependencies.bicep | 2 +- .../registries/.test/pe/dependencies.bicep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep b/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep index 2dbcd1afc8..5fec9e40cc 100644 --- a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep +++ b/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep @@ -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' = { diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep b/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep index 1a018e1d73..20a8ab60ea 100644 --- a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep +++ b/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep @@ -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' = {