From 337f1deb6ee4f50003039a3516e41ca9cb5f400c Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 22:02:25 +0100 Subject: [PATCH] Align Apim deployment names --- .../.bicep/nested_authorizationServers.bicep | 2 +- .../service/apis/deploy.bicep | 4 ++-- .../service/deploy.bicep | 24 +++++++++---------- .../service/products/deploy.bicep | 8 +++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep index 4874be60d3..c0dc584e85 100644 --- a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep +++ b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep @@ -77,7 +77,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' existing = { } module authorizationServer '../authorizationServers/deploy.bicep' = { - name: '${apiManagementServiceName}-authorizationServer-${name}' + name: '${deployment().name}-AuthorizationServer' params: { apiManagementServiceName: apiManagementServiceName serverDescription: serverDescription diff --git a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep index 6a666d0f38..36fb8968f9 100644 --- a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep @@ -130,8 +130,8 @@ resource api 'Microsoft.ApiManagement/service/apis@2020-06-01-preview' = { } } -module policy 'policies/deploy.bicep' = [for policy in policies: { - name: '${uniqueString(deployment().name, api.name)}-policy-${policy.name}' +module policy 'policies/deploy.bicep' = [for (policy, index) in policies: { + name: '${deployment().name}-Policy-${index}' params: { apiManagementServiceName: apiManagementServiceName apiName: api.name diff --git a/arm/Microsoft.ApiManagement/service/deploy.bicep b/arm/Microsoft.ApiManagement/service/deploy.bicep index 2930bcac40..0029cbdba3 100644 --- a/arm/Microsoft.ApiManagement/service/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/deploy.bicep @@ -209,7 +209,7 @@ resource apiManagementService 'Microsoft.ApiManagement/service@2020-12-01' = { } module apis_resource 'apis/deploy.bicep' = [for (api, index) in apis: { - name: '${uniqueString(deployment().name, location)}-api-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Api-${index}' params: { apiManagementServiceName: apiManagementService.name displayName: api.displayName @@ -243,7 +243,7 @@ module apis_resource 'apis/deploy.bicep' = [for (api, index) in apis: { }] module apiVersionSet_resource 'apiVersionSets/deploy.bicep' = [for (apiVersionSet, index) in apiVersionSets: { - name: '${uniqueString(deployment().name, location)}-apiVersionSet-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-ApiVersionSet-${index}' params: { apiManagementServiceName: apiManagementService.name name: apiVersionSet.name @@ -252,7 +252,7 @@ module apiVersionSet_resource 'apiVersionSets/deploy.bicep' = [for (apiVersionSe }] module authorizationServers_resource '.bicep/nested_authorizationServers.bicep' = [for (authorizationServer, index) in authorizationServers: { - name: '${uniqueString(deployment().name, location)}-authorizationServer-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-AuthorizationServer-${index}' params: { apiManagementServiceName: apiManagementService.name name: authorizationServer.name @@ -282,7 +282,7 @@ module authorizationServers_resource '.bicep/nested_authorizationServers.bicep' }] module backends_resource 'backends/deploy.bicep' = [for (backend, index) in backends: { - name: '${uniqueString(deployment().name, location)}-backend-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Backend-${index}' params: { apiManagementServiceName: apiManagementService.name url: contains(backend, 'url') ? backend.url : '' @@ -302,7 +302,7 @@ module backends_resource 'backends/deploy.bicep' = [for (backend, index) in back }] module caches_resource 'caches/deploy.bicep' = [for (cache, index) in caches: { - name: '${uniqueString(deployment().name, location)}-cache-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Cache-${index}' params: { apiManagementServiceName: apiManagementService.name cacheDescription: contains(cache, 'cacheDescription') ? cache.cacheDescription : '' @@ -314,7 +314,7 @@ module caches_resource 'caches/deploy.bicep' = [for (cache, index) in caches: { }] module identityProvider_resource 'identityProviders/deploy.bicep' = [for (identityProvider, index) in identityProviders: { - name: '${uniqueString(deployment().name, location)}-identityProvider-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-IdentityProvider-${index}' params: { apiManagementServiceName: apiManagementService.name name: identityProvider.name @@ -333,7 +333,7 @@ module identityProvider_resource 'identityProviders/deploy.bicep' = [for (identi }] module namedValues_resource 'namedValues/deploy.bicep' = [for (namedValue, index) in namedValues: { - name: '${uniqueString(deployment().name, location)}-namedValue-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-NamedValue-${index}' params: { apiManagementServiceName: apiManagementService.name displayName: namedValue.displayName @@ -346,7 +346,7 @@ module namedValues_resource 'namedValues/deploy.bicep' = [for (namedValue, index }] module portalSettings_resource 'portalsettings/deploy.bicep' = [for (portalSetting, index) in portalSettings: { - name: '${uniqueString(deployment().name, location)}-portalSetting-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-PortalSetting-${index}' params: { apiManagementServiceName: apiManagementService.name name: portalSetting.name @@ -355,7 +355,7 @@ module portalSettings_resource 'portalsettings/deploy.bicep' = [for (portalSetti }] module policy_resource 'policies/deploy.bicep' = [for (policy, index) in policies: { - name: '${uniqueString(deployment().name, location)}-policy-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Policy-${index}' params: { apiManagementServiceName: apiManagementService.name value: policy.value @@ -364,7 +364,7 @@ module policy_resource 'policies/deploy.bicep' = [for (policy, index) in policie }] module products_resource 'products/deploy.bicep' = [for (product, index) in products: { - name: '${uniqueString(deployment().name, location)}-product-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Product-${index}' params: { apiManagementServiceName: apiManagementService.name apis: contains(product, 'apis') ? product.apis : [] @@ -383,7 +383,7 @@ module products_resource 'products/deploy.bicep' = [for (product, index) in prod }] module subscriptions_resource 'subscriptions/deploy.bicep' = [for (subscription, index) in subscriptions: { - name: '${uniqueString(deployment().name, location)}-subscription-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Subscription-${index}' params: { apiManagementServiceName: apiManagementService.name name: contains(subscription, 'name') ? subscription.name : '' @@ -419,7 +419,7 @@ resource apiManagementService_diagnosticSettings 'Microsoft.Insights/diagnosticS } module apiManagementService_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-Apim-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.ApiManagement/service/products/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/deploy.bicep index 338503a168..c54ce33c82 100644 --- a/arm/Microsoft.ApiManagement/service/products/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/products/deploy.bicep @@ -54,8 +54,8 @@ resource product 'Microsoft.ApiManagement/service/products@2020-06-01-preview' = } } -module api 'apis/deploy.bicep' = [for api in apis: { - name: '${uniqueString(deployment().name, name)}-api-${api.name}' +module api 'apis/deploy.bicep' = [for (api, index) in apis: { + name: '${deployment().name}-Api-${index}' params: { apiManagementServiceName: apiManagementServiceName name: api.name @@ -63,8 +63,8 @@ module api 'apis/deploy.bicep' = [for api in apis: { } }] -module group 'groups/deploy.bicep' = [for group in groups: { - name: '${uniqueString(deployment().name, name)}-group-${group.name}' +module group 'groups/deploy.bicep' = [for (group, index) in groups: { + name: '${deployment().name}-Group-${index}' params: { apiManagementServiceName: apiManagementServiceName name: group.name