Skip to content

Align MS.Sql deployment names #712

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
eriqua merged 1 commit into from
Dec 4, 2021
Merged

Align MS.Sql deployment names #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions arm/Microsoft.Sql/managedInstances/databases/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '/'))
Expand All @@ -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, '/'))
Expand Down
14 changes: 7 additions & 7 deletions arm/Microsoft.Sql/managedInstances/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 : ''
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions arm/Microsoft.Sql/servers/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down