Skip to content
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

Dev #257

Closed
wants to merge 3 commits into from
Closed

Dev #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2328dc
Update metadata.bicep
benleroux May 22, 2024
bac2bb3
Update params.dev.json
benleroux May 22, 2024
b38fa36
Update dataLandingZoneDeployment.yml
benleroux May 22, 2024
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 .github/workflows/dataLandingZoneDeployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ on:
- ".github/workflows/dataLandingZoneDeployment.yml"

env:
AZURE_SUBSCRIPTION_ID: "2150d511-458f-43b9-8691-6819ba2e6c7b" # Update to '{dataLandingZoneSubscriptionId}'
AZURE_LOCATION: "northeurope" # Update to '{regionName}'
AZURE_SUBSCRIPTION_ID: "99e6ceb1-c273-4e61-892d-164779c0b1c9" # Update to '{dataLandingZoneSubscriptionId}'
AZURE_LOCATION: "eastus" # Update to '{regionName}'

jobs:
validation:
Expand Down
34 changes: 17 additions & 17 deletions infra/modules/metadata.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,21 @@ module sqlServer001 'services/sql.bicep' = {
}
}

module mySqlServer001 'services/mysql.bicep' = {
name: 'mysqlserver001'
scope: resourceGroup()
params: {
location: location
tags: tags
subnetId: subnetId
mysqlserverName: mySqlServer001Name
administratorUsername: administratorUsername
administratorPassword: administratorPassword
mysqlserverAdminGroupName: mysqlserverAdminGroupName
mysqlserverAdminGroupObjectID: mysqlserverAdminGroupObjectID
privateDnsZoneIdMySqlServer: privateDnsZoneIdMySqlServer
}
}
#module mySqlServer001 'services/mysql.bicep' = {
# name: 'mysqlserver001'
# scope: resourceGroup()
# params: {
#location: location
#tags: tags
# subnetId: subnetId
# mysqlserverName: mySqlServer001Name
# administratorUsername: administratorUsername
# administratorPassword: administratorPassword
# mysqlserverAdminGroupName: mysqlserverAdminGroupName
# mysqlserverAdminGroupObjectID: mysqlserverAdminGroupObjectID
# privateDnsZoneIdMySqlServer: privateDnsZoneIdMySqlServer
# }
#}

resource mysqlserver001UsernameSecretDeployment 'Microsoft.KeyVault/vaults/secrets@2021-04-01-preview' = {
name: '${keyVault002Name}/${mySqlServer001UsernameSecretName}'
Expand Down Expand Up @@ -125,15 +125,15 @@ resource mysqlserver001ConnectionStringSecretDeployment 'Microsoft.KeyVault/vaul
enabled: true
}
contentType: 'text/plain'
value: 'jdbc:mysql://${mySqlServer001Name}.mysql.database.azure.com:3306/${mySqlServer001.outputs.mySqlServerDatabaseName}?useSSL=true&requireSSL=false&enabledSslProtocolSuites=TLSv1.2'
value: 'none'
}
}

// Outputs
output keyVault001Id string = keyVault001.outputs.keyvaultId
output sqlServer001Id string = sqlServer001.outputs.sqlServerId
output sqlServer001DatabaseName string = sqlServer001.outputs.sqlServerDatabaseName
output mySqlServer001Id string = mySqlServer001.outputs.mySqlServerId
output mySqlServer001Id string = '' #mySqlServer001.outputs.mySqlServerId
output mySqlServer001UsernameSecretName string = mySqlServer001UsernameSecretName
#disable-next-line outputs-should-not-contain-secrets
output mySqlServer001PasswordSecretName string = mySqlServer001PasswordSecretName
Expand Down
34 changes: 17 additions & 17 deletions infra/params.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"contentVersion": "1.0.0.0",
"parameters": {
"location": {
"value": "northeurope"
"value": "eastus"
},
"environment": {
"value": "dev"
},
"prefix": {
"value": "dlz01"
"value": "bl-01-dlz"
},
"tags": {
"value": {}
Expand Down Expand Up @@ -48,7 +48,7 @@
"value": "10.1.9.0/24"
},
"dataManagementZoneVnetId": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-network/providers/Microsoft.Network/virtualNetworks/dmz-dev-vnet"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-network/providers/Microsoft.Network/virtualNetworks/bl-01-dmz-dev-vnet"
},
"firewallPrivateIp": {
"value": "10.0.0.4"
Expand All @@ -62,13 +62,13 @@
"value": "<your-secure-password>"
},
"purviewId": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-governance/providers/Microsoft.Purview/accounts/dmz-dev-purview001"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-governance/providers/Microsoft.Purview/accounts/bl-01-dmz-dev-purview001"
},
"purviewManagedStorageId": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-purview001/providers/Microsoft.Storage/storageAccounts/scannortheuropekkkshlo"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-purview001/providers/Microsoft.Storage/storageAccounts/scannortheuropekkkshlo"
},
"purviewManagedEventHubId": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-purview001/providers/Microsoft.EventHub/namespaces/Atlas-a487e969-df29-4159-8858-9e68d81285e9"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-purview001/providers/Microsoft.EventHub/namespaces/Atlas-f0d21d74-1894-44a5-ae71-98aa243a577b"
},
"purviewSelfHostedIntegrationRuntimeAuthKey": {
"value": ""
Expand All @@ -80,34 +80,34 @@
"value": []
},
"privateDnsZoneIdKeyVault": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"
},
"privateDnsZoneIdDataFactory": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.datafactory.azure.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.datafactory.azure.net"
},
"privateDnsZoneIdDataFactoryPortal": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.adf.azure.com"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.adf.azure.com"
},
"privateDnsZoneIdBlob": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
},
"privateDnsZoneIdDfs": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.dfs.core.windows.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.dfs.core.windows.net"
},
"privateDnsZoneIdSqlServer": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.database.windows.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.database.windows.net"
},
"privateDnsZoneIdMySqlServer": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.mysql.database.azure.com"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.mysql.database.azure.com"
},
"privateDnsZoneIdEventhubNamespace": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net"
},
"privateDnsZoneIdSynapseDev": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.dev.azuresynapse.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.dev.azuresynapse.net"
},
"privateDnsZoneIdSynapseSql": {
"value": "/subscriptions/17588eb2-2943-461a-ab3f-00a3ceac3112/resourceGroups/dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.sql.azuresynapse.net"
"value": "/subscriptions/99e6ceb1-c273-4e61-892d-164779c0b1c9/resourceGroups/bl-01-dmz-dev-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.sql.azuresynapse.net"
}
}
}
}
Loading