From 350472ad7c3cd716a47e2ed760ab763463b6c3ba Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 3 Dec 2021 19:59:43 +0100 Subject: [PATCH] align sql deployments --- .../managedInstances/databases/deploy.bicep | 4 ++-- arm/Microsoft.Sql/managedInstances/deploy.bicep | 14 +++++++------- arm/Microsoft.Sql/servers/deploy.bicep | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep b/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep index b1d101c530..9a3f3b527b 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep @@ -154,7 +154,7 @@ resource database_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2017 } module database_backupShortTermRetentionPolicy 'backupShortTermRetentionPolicies/deploy.bicep' = if (!empty(backupShortTermRetentionPoliciesObj)) { - name: '${deployment().name}-backupShortTRetenPol' + name: '${deployment().name}-BackupShortTRetPol' params: { managedInstanceName: managedInstanceName databaseName: last(split(database.name, '/')) @@ -164,7 +164,7 @@ module database_backupShortTermRetentionPolicy 'backupShortTermRetentionPolicies } module database_backupLongTermRetentionPolicy 'backupLongTermRetentionPolicies/deploy.bicep' = if (!empty(backupLongTermRetentionPoliciesObj)) { - name: '${deployment().name}-backupLongTRetenPol' + name: '${deployment().name}-BackupLongTRetPol' params: { managedInstanceName: managedInstanceName databaseName: last(split(database.name, '/')) diff --git a/arm/Microsoft.Sql/managedInstances/deploy.bicep b/arm/Microsoft.Sql/managedInstances/deploy.bicep index 6429d6fde5..99a3834241 100644 --- a/arm/Microsoft.Sql/managedInstances/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/deploy.bicep @@ -235,7 +235,7 @@ resource managedInstance_diagnosticSettings 'Microsoft.Insights/diagnosticsettin } module managedInstance_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-SqlMi-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName @@ -244,7 +244,7 @@ module managedInstance_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i }] module managedInstance_databases 'databases/deploy.bicep' = [for (database, index) in databases: { - name: '${uniqueString(deployment().name, location)}-db-${index}' + name: '${uniqueString(deployment().name, location)}-SqlMi-DB-${index}' params: { name: database.name managedInstanceName: managedInstance.name @@ -272,7 +272,7 @@ module managedInstance_databases 'databases/deploy.bicep' = [for (database, inde }] module managedInstance_securityAlertPolicy 'securityAlertPolicies/deploy.bicep' = if (!empty(securityAlertPoliciesObj)) { - name: '${uniqueString(deployment().name, location)}-secAlertPol' + name: '${uniqueString(deployment().name, location)}-SqlMi-SecAlertPol' params: { managedInstanceName: managedInstance.name name: securityAlertPoliciesObj.name @@ -282,7 +282,7 @@ module managedInstance_securityAlertPolicy 'securityAlertPolicies/deploy.bicep' } module managedInstance_vulnerabilityAssessment 'vulnerabilityAssessments/deploy.bicep' = if (!empty(vulnerabilityAssessmentsObj)) { - name: '${uniqueString(deployment().name, location)}-vulnAssessm' + name: '${uniqueString(deployment().name, location)}-SqlMi-VulnAssessm' params: { managedInstanceName: managedInstance.name name: vulnerabilityAssessmentsObj.name @@ -297,7 +297,7 @@ module managedInstance_vulnerabilityAssessment 'vulnerabilityAssessments/deploy. } module managedInstance_key 'keys/deploy.bicep' = [for (key, index) in keys: { - name: '${uniqueString(deployment().name, location)}-key-${index}' + name: '${uniqueString(deployment().name, location)}-SqlMi-Key-${index}' params: { managedInstanceName: managedInstance.name name: contains(key, 'name') ? key.name : '' @@ -307,7 +307,7 @@ module managedInstance_key 'keys/deploy.bicep' = [for (key, index) in keys: { }] module managedInstance_encryptionProtector 'encryptionProtector/deploy.bicep' = if (!empty(encryptionProtectorObj)) { - name: '${uniqueString(deployment().name, location)}-encryProtector' + name: '${uniqueString(deployment().name, location)}-SqlMi-EncryProtector' params: { managedInstanceName: managedInstance.name serverKeyName: contains(encryptionProtectorObj, 'serverKeyName') ? encryptionProtectorObj.serverKeyName : managedInstance_key[0].outputs.keyName @@ -318,7 +318,7 @@ module managedInstance_encryptionProtector 'encryptionProtector/deploy.bicep' = } module managedInstance_administrator 'administrators/deploy.bicep' = if (!empty(administratorsObj)) { - name: '${uniqueString(deployment().name, location)}-admin' + name: '${uniqueString(deployment().name, location)}-SqlMi-Admin' params: { managedInstanceName: managedInstance.name login: administratorsObj.name diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index 0bb9ed0970..cd2fc6746e 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -77,7 +77,7 @@ resource server_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != 'N } module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-Sql-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName @@ -86,7 +86,7 @@ module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: { - name: '${deployment().name}-db-${index}' + name: '${uniqueString(deployment().name, location)}-Sql-DB-${index}' params: { name: database.name serverName: server.name @@ -110,7 +110,7 @@ module server_databases 'databases/deploy.bicep' = [for (database, index) in dat }] module server_firewallRules 'firewallRules/deploy.bicep' = [for (firewallRule, index) in firewallRules: { - name: '${deployment().name}-firewallRules-${index}' + name: '${uniqueString(deployment().name, location)}-Sql-FirewallRules-${index}' params: { name: firewallRule.name serverName: server.name @@ -120,7 +120,7 @@ module server_firewallRules 'firewallRules/deploy.bicep' = [for (firewallRule, i }] module server_securityAlertPolicies 'securityAlertPolicies/deploy.bicep' = [for (securityAlertPolicy, index) in securityAlertPolicies: { - name: '${deployment().name}-securityAlertPolicy-${index}' + name: '${uniqueString(deployment().name, location)}-Sql-SecAlertPolicy-${index}' params: { name: securityAlertPolicy.name serverName: server.name