diff --git a/.github/workflows/dataLandingZoneDeployment.yml b/.github/workflows/dataLandingZoneDeployment.yml index 4cf11d8..8c714b1 100644 --- a/.github/workflows/dataLandingZoneDeployment.yml +++ b/.github/workflows/dataLandingZoneDeployment.yml @@ -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: diff --git a/infra/modules/metadata.bicep b/infra/modules/metadata.bicep index 3556d14..00971b8 100644 --- a/infra/modules/metadata.bicep +++ b/infra/modules/metadata.bicep @@ -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}' @@ -125,7 +125,7 @@ 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' } } @@ -133,7 +133,7 @@ resource mysqlserver001ConnectionStringSecretDeployment 'Microsoft.KeyVault/vaul 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 diff --git a/infra/params.dev.json b/infra/params.dev.json index 8638480..221321d 100644 --- a/infra/params.dev.json +++ b/infra/params.dev.json @@ -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": {} @@ -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" @@ -62,13 +62,13 @@ "value": "" }, "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": "" @@ -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" } } -} \ No newline at end of file +}