Skip to content

Commit f4d1ffa

Browse files
alrios-msalrios-ms
committed
Updated ADF templates
1 parent 90f34b8 commit f4d1ffa

File tree

6 files changed

+36
-149
lines changed

6 files changed

+36
-149
lines changed

‎Deployment/adfHRResources.bicep‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ param solutionAbbreviation string
55
param tenantId string
66

77
var sqlServerName = '${solutionAbbreviation}-data-${environmentAbbreviation}'
8+
var sqlDataBaseName = '${solutionAbbreviation}-data-${environmentAbbreviation}-hr'
9+
10+
module sqlForHRData '../Infrastructure/adf/sql/template.bicep' = {
11+
name: 'sqlForHRDataTemplate'
12+
params: {
13+
location: location
14+
environmentAbbreviation: environmentAbbreviation
15+
solutionAbbreviation: solutionAbbreviation
16+
tenantId: tenantId
17+
sqlServerName: sqlServerName
18+
sqlDataBaseName: sqlDataBaseName
19+
}
20+
}
21+
822
module adfForHRData '../Infrastructure/adf/pipeline/template.bicep' = {
923
name: 'adfForHRDataTemplate'
1024
params: {
@@ -13,5 +27,9 @@ module adfForHRData '../Infrastructure/adf/pipeline/template.bicep' = {
1327
solutionAbbreviation: solutionAbbreviation
1428
tenantId: tenantId
1529
sqlServerName: sqlServerName
30+
sqlDataBaseName: sqlDataBaseName
1631
}
32+
dependsOn: [
33+
sqlForHRData
34+
]
1735
}

‎Infrastructure/adf/pipeline/azureDataFactory.bicep‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ param location string
1010
@description('Name of SQL Server')
1111
param sqlServerName string
1212

13-
@secure()
14-
param sqlAdminPassword string
13+
@description('Name of SQL Server')
14+
param sqlDataBaseName string
1515

1616
@description('AzureUserReader function url.')
1717
@secure()
@@ -25,6 +25,9 @@ param azureUserReaderFunctionKey string
2525
@secure()
2626
param storageAccountConnectionString string
2727

28+
var sqlServerUrl = 'Server=tcp:${sqlServerName}${environment().suffixes.sqlServerHostname},1433'
29+
30+
2831
resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = {
2932
name: factoryName
3033
identity: {
@@ -61,7 +64,7 @@ resource linkedService_DestinationDatabase 'Microsoft.DataFactory/factories/link
6164
annotations: []
6265
type: 'SqlServer'
6366
typeProperties: {
64-
connectionString: 'Server=tcp:${sqlServerName}.database.windows.net,1433;Initial Catalog=${sqlServerName};Persist Security Info=False;User ID=SQLDBAdmin;Password=${sqlAdminPassword};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;'
67+
connectionString: '${sqlServerUrl};${sqlDataBaseName};Authentication=Active Directory Default;TrustServerCertificate=True;Encrypt=True;Connection Timeout=90;'
6568
}
6669
}
6770
dependsOn: [

‎Infrastructure/adf/pipeline/template.bicep‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ param location string
1515
param tenantId string
1616

1717
@description('Name of SQL Server')
18-
param sqlServerName string = '${solutionAbbreviation}-data-${environmentAbbreviation}-destination'
18+
param sqlServerName string = '${solutionAbbreviation}-data-${environmentAbbreviation}'
19+
20+
@description('Name of SQL Server')
21+
param sqlDataBaseName string = '${solutionAbbreviation}-data-${environmentAbbreviation}-destination'
1922

2023
@description('Name of Azure Data Factory')
2124
param azureDataFactoryName string = '${solutionAbbreviation}-data-${environmentAbbreviation}-adf'
@@ -33,10 +36,10 @@ module azureDataFactoryTemplate 'azureDataFactory.bicep' = {
3336
factoryName: azureDataFactoryName
3437
environmentAbbreviation: environmentAbbreviation
3538
location: location
36-
sqlAdminPassword: dataKeyVault.getSecret('sqlAdminPassword')
3739
sqlServerName: sqlServerName
40+
sqlDataBaseName: sqlDataBaseName
3841
azureUserReaderUrl: dataKeyVault.getSecret('azureUserReaderUrl')
3942
azureUserReaderFunctionKey: dataKeyVault.getSecret('azureUserReaderKey')
40-
storageAccountConnectionString: dataKeyVault.getSecret('storageAccountConnectionString')
43+
storageAccountConnectionString: dataKeyVault.getSecret('adfStorageAccountConnectionString')
4144
}
4245
}

‎Infrastructure/adf/sql/sqlServer.bicep‎

Lines changed: 1 addition & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,14 @@
1-
@minLength(2)
2-
@maxLength(3)
3-
@description('Enter an abbreviation for the solution.')
4-
param solutionAbbreviation string
5-
6-
@minLength(2)
7-
@maxLength(6)
8-
@description('Enter an abbreviation for the environment.')
9-
param environmentAbbreviation string
10-
111
@description('Resource location.')
122
param location string
133

14-
@description('Tenant Id.')
15-
param tenantId string
16-
174
@description('Name of SQL Server')
185
param sqlServerName string
196

207
@description('Name of SQL Database')
218
param sqlDatabaseName string
229

23-
@description('Administrator user name')
24-
param sqlAdminUserName string
25-
26-
@secure()
27-
@description('Administrator password')
28-
param sqlAdminPassword string
29-
30-
@description('Administrators Azure AD Group Object Id')
31-
param sqlAdministratorsGroupId string
32-
33-
@description('Administrators Azure AD Group Name')
34-
param sqlAdministratorsGroupName string
35-
36-
@description('Key vault name.')
37-
param keyVaultName string
38-
39-
var logAnalyticsName = '${solutionAbbreviation}-data-${environmentAbbreviation}'
40-
var sqlServerUrl = 'Server=tcp:${sqlServerName}${environment().suffixes.sqlServerHostname},1433;'
41-
var sqlServerDataBaseName = 'Initial Catalog=${sqlDatabaseName};'
42-
var sqlServerAdditionalSettings = 'MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=90;'
43-
44-
resource sqlServer 'Microsoft.Sql/servers@2022-11-01-preview' = {
10+
resource sqlServer 'Microsoft.Sql/servers@2022-11-01-preview' existing = {
4511
name: sqlServerName
46-
location: location
47-
identity: {
48-
type: 'SystemAssigned'
49-
}
50-
properties: {
51-
administratorLogin: sqlAdminUserName
52-
administratorLoginPassword: sqlAdminPassword
53-
administrators: {
54-
administratorType: 'ActiveDirectory'
55-
principalType: 'Group'
56-
login: sqlAdministratorsGroupName
57-
sid: sqlAdministratorsGroupId
58-
tenantId: tenantId
59-
}
60-
}
61-
62-
resource sqlServerFirewall 'firewallRules@2022-11-01-preview' = {
63-
name: 'AllowAllWindowsAzureIps'
64-
properties: {
65-
startIpAddress: '0.0.0.0'
66-
endIpAddress: '0.0.0.0'
67-
}
68-
}
69-
70-
resource masterDataBase 'databases@2022-11-01-preview' = {
71-
location: location
72-
name: 'master'
73-
properties: {}
74-
}
75-
76-
resource auditingSettings 'auditingSettings@2022-11-01-preview' = {
77-
name: 'default'
78-
properties: {
79-
state: 'Enabled'
80-
isAzureMonitorTargetEnabled: true
81-
}
82-
}
8312
}
8413

8514
resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-02-01-preview' = {
@@ -93,51 +22,3 @@ resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-02-01-preview' = {
9322
capacity: 0
9423
}
9524
}
96-
97-
resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
98-
name: logAnalyticsName
99-
}
100-
101-
resource diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = {
102-
scope: sqlServer::masterDataBase
103-
name: 'diagnosticSettings'
104-
properties: {
105-
workspaceId: logAnalytics.id
106-
logs: [
107-
{
108-
category: 'SQLSecurityAuditEvents'
109-
enabled: true
110-
retentionPolicy: {
111-
days: 0
112-
enabled: false
113-
}
114-
}
115-
]
116-
}
117-
dependsOn: [
118-
sqlServer
119-
]
120-
}
121-
122-
module secureKeyvaultSecrets 'keyVaultSecretsSecure.bicep' = {
123-
name: 'secureKeyvaultSecrets'
124-
params: {
125-
keyVaultName: keyVaultName
126-
keyVaultSecrets: {
127-
secrets: [
128-
{
129-
name: 'sqlAdminUserName'
130-
value: sqlAdminUserName
131-
}
132-
{
133-
name: 'sqlAdminPassword'
134-
value: sqlAdminPassword
135-
}
136-
{
137-
name: 'sqlServerBasicConnectionString'
138-
value: '${sqlServerUrl}${sqlServerDataBaseName}${sqlServerAdditionalSettings}'
139-
}
140-
]
141-
}
142-
}
143-
}

‎Infrastructure/adf/sql/storageAccount.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module secureSecretsTemplate 'keyVaultSecretsSecure.bicep' = {
4444
keyVaultSecrets: {
4545
secrets: [
4646
{
47-
name: 'storageAccountConnectionString'
47+
name: 'adfStorageAccountConnectionString'
4848
value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount.name};AccountKey=${storageAccount.listKeys().keys[0].value}'
4949
}
5050
]

‎Infrastructure/adf/sql/template.bicep‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,19 @@ param storageAccountSku string = 'Standard_LRS'
3030
param storageAccountContainerName string = 'csvcontainer'
3131

3232
@description('Name of SQL Server')
33-
param sqlServerName string = '${solutionAbbreviation}-data-${environmentAbbreviation}-destination'
33+
param sqlServerName string = '${solutionAbbreviation}-data-${environmentAbbreviation}'
3434

35-
@description('Administrator user name')
36-
param sqlAdminUserName string = 'SQLDBAdmin'
37-
38-
@secure()
39-
@description('Administrator password')
40-
param sqlAdminPassword string = 'ADMN${toLower(newGuid())}!$#'
41-
42-
@description('Administrators Azure AD Group Object Id')
43-
param sqlAdministratorsGroupId string
44-
45-
@description('Administrators Azure AD Group Name')
46-
param sqlAdministratorsGroupName string
35+
@description('Name of SQL Server')
36+
param sqlDataBaseName string = '${solutionAbbreviation}-data-${environmentAbbreviation}-destination'
4737

4838
var dataKeyVaultName = '${solutionAbbreviation}-data-${environmentAbbreviation}'
4939

5040
module sqlServer 'sqlServer.bicep' = {
5141
name: 'sqlServerTemplate'
5242
params: {
53-
environmentAbbreviation: environmentAbbreviation
5443
location: location
55-
solutionAbbreviation: solutionAbbreviation
56-
keyVaultName: dataKeyVaultName
5744
sqlServerName: sqlServerName
58-
sqlDatabaseName: sqlServerName
59-
sqlAdminUserName: sqlAdminUserName
60-
sqlAdminPassword: sqlAdminPassword
61-
sqlAdministratorsGroupId: sqlAdministratorsGroupId
62-
sqlAdministratorsGroupName: sqlAdministratorsGroupName
63-
tenantId: tenantId
45+
sqlDatabaseName: sqlDataBaseName
6446
}
6547
}
6648

0 commit comments

Comments
 (0)