Skip to content

Commit 2d27480

Browse files
Refactor SQL database module configuration: streamline parameters, adjust SKU settings, and remove sql elastic pool
1 parent 625a506 commit 2d27480

File tree

1 file changed

+6
-47
lines changed

1 file changed

+6
-47
lines changed

infra/main.bicep

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,52 +1090,23 @@ module sqlDBModule 'br/public:avm/res/sql/server:0.20.1' = {
10901090
connectionPolicy: 'Redirect'
10911091
databases: [
10921092
{
1093-
availabilityZone: 1
1094-
backupLongTermRetentionPolicy: {
1095-
monthlyRetention: 'P6M'
1096-
}
1097-
backupShortTermRetentionPolicy: {
1098-
retentionDays: 14
1099-
}
1093+
availabilityZone: enableRedundancy ? 1 : -1
11001094
collation: 'SQL_Latin1_General_CP1_CI_AS'
11011095
diagnosticSettings: enableMonitoring
1102-
? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
1096+
? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }]
11031097
: null
1104-
elasticPoolResourceId: resourceId('Microsoft.Sql/servers/elasticPools', 'sql-${solutionSuffix}', 'sqlswaf-ep-001')
11051098
licenseType: 'LicenseIncluded'
11061099
maxSizeBytes: 34359738368
11071100
name: 'sqldb-${solutionSuffix}'
1101+
minCapacity: '1'
11081102
sku: {
1109-
capacity: 0
1110-
name: 'ElasticPool'
1103+
name: 'GP_S_Gen5'
11111104
tier: 'GeneralPurpose'
1105+
family: 'Gen5'
1106+
capacity: 2
11121107
}
11131108
}
11141109
]
1115-
elasticPools: [
1116-
{
1117-
availabilityZone: -1
1118-
//maintenanceConfigurationId: '<maintenanceConfigurationId>'
1119-
name: 'sqlswaf-ep-001'
1120-
sku: {
1121-
capacity: 10
1122-
name: 'GP_Gen5'
1123-
tier: 'GeneralPurpose'
1124-
}
1125-
roleAssignments: [
1126-
{
1127-
principalId: userAssignedIdentity.outputs.principalId
1128-
principalType: 'ServicePrincipal'
1129-
roleDefinitionIdOrName: 'db_datareader'
1130-
}
1131-
{
1132-
principalId: userAssignedIdentity.outputs.principalId
1133-
principalType: 'ServicePrincipal'
1134-
roleDefinitionIdOrName: 'db_datawriter'
1135-
}
1136-
]
1137-
}
1138-
]
11391110
location: solutionLocation
11401111
managedIdentities: {
11411112
systemAssigned: true
@@ -1160,7 +1131,6 @@ module sqlDBModule 'br/public:avm/res/sql/server:0.20.1' = {
11601131
}
11611132
]
11621133
: []
1163-
restrictOutboundNetworkAccess: 'Disabled'
11641134
firewallRules: (!enablePrivateNetworking) ? [
11651135
{
11661136
endIpAddress: '255.255.255.255'
@@ -1173,18 +1143,7 @@ module sqlDBModule 'br/public:avm/res/sql/server:0.20.1' = {
11731143
startIpAddress: '0.0.0.0'
11741144
}
11751145
] : []
1176-
securityAlertPolicies: [
1177-
{
1178-
emailAccountAdmins: true
1179-
name: 'Default'
1180-
state: 'Enabled'
1181-
}
1182-
]
11831146
tags: tags
1184-
vulnerabilityAssessmentsObj: {
1185-
name: 'default'
1186-
storageAccountResourceId: avmStorageAccount.outputs.resourceId
1187-
}
11881147
}
11891148
}
11901149

0 commit comments

Comments
 (0)