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.

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

Add Data Landing Zone Subs to Storage Firewall #223

Merged
merged 3 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/linters/.arm-ttk.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
@{
# Test = @( )
Skip = @(
'Template Should Not Contain Blanks',
'DeploymentTemplate Must Not Contain Hardcoded Uri',
'DependsOn Best Practices',
'Outputs Must Not Contain Secrets',
'IDs Should Be Derived From ResourceIDs',
'Template Should Not Contain Blanks'
'DeploymentTemplate Must Not Contain Hardcoded Uri'
'DependsOn Best Practices'
'Outputs Must Not Contain Secrets'
'IDs Should Be Derived From ResourceIDs'
'apiVersions Should Be Recent'
'Parameters Must Be Referenced'
'Variables Must Be Referenced'
Expand Down
1 change: 1 addition & 0 deletions docs/DataManagementAnalytics-AzureDevOpsDeployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ To begin, please open the [infra/params.dev.json](/infra/params.dev.json). In th
| `purviewManagedEventHubId` | Specifies the Resource ID of the managed event hub of the central Purview instance. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.EventHub/namespaces/{eventhub-namespace-name}` |
| `purviewSelfHostedIntegrationRuntimeAuthKey` | Specifies the Auth Key for the Self-hosted integration runtime of Purview. | `<your-purview-shir-auth-key>` |
| `deploySelfHostedIntegrationRuntimes` | Specifies whether the self-hosted integration runtimes should be installed. This only works, if the pwsh script was uploded and is available. | `true` or `false` |
| `dataLandingZoneSubscriptionIds` | Specifies the subscription IDs of the other Data Landing Zones. | `[ '{subscriptionId1}', '{subscriptionId2}' ]` |
| `privateDnsZoneIdKeyVault` | Specifies the Resource ID of the private DNS zone for KeyVault. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net` |
| `privateDnsZoneIdDataFactory` | Specifies the Resource ID of the private DNS zone for Data Factory. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.datafactory.azure.net` |
| `privateDnsZoneIdDataFactoryPortal` | Specifies the Resource ID of the private DNS zone for Data Factory Portal. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.adf.azure.com` |
Expand Down
1 change: 1 addition & 0 deletions docs/DataManagementAnalytics-GitHubActionsDeployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ To begin, please open the [infra/params.dev.json](/infra/params.dev.json). In th
| `purviewManagedEventHubId` | Specifies the Resource ID of the managed event hub of the central purview instance. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.EventHub/namespaces/{eventhub-namespace-name}` |
| `purviewSelfHostedIntegrationRuntimeAuthKey` | Specifies the Auth Key for the Self-hosted integration runtime of Purview. | `<your-purview-shir-auth-key>` |
| `deploySelfHostedIntegrationRuntimes` | Specifies whether the self-hosted integration runtimes should be deployed. This only works, if the pwsh script was uploded and is available. | `true` or `false` |
| `dataLandingZoneSubscriptionIds` | Specifies the subscription IDs of the other Data Landing Zones. | `[ '{subscriptionId1}', '{subscriptionId2}' ]` |
| `privateDnsZoneIdKeyVault` | Specifies the Resource ID of the private DNS zone for KeyVault. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net` |
| `privateDnsZoneIdDataFactory` | Specifies the Resource ID of the private DNS zone for Data Factory. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.datafactory.azure.net` |
| `privateDnsZoneIdDataFactoryPortal` | Specifies the Resource ID of the private DNS zone for Data Factory Portal. | `/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Network/privateDnsZones/privatelink.adf.azure.com` |
Expand Down
66 changes: 66 additions & 0 deletions docs/reference/portal.dataLandingZone.json
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,71 @@
}
}
]
},
{
"name": "dataLandingZoneSubscriptions",
"label": "Other Data Landing Zone Subscriptions",
"type": "Microsoft.Common.Section",
"visible": true,
"elements": [
{
"name": "selfhostedIntegrationRuntimeText",
"type": "Microsoft.Common.TextBlock",
"visible": true,
"options": {
"text": "Specify the subscriptions that are used for your other Data Landing Zones.",
"link": {
"label": "",
"uri": ""
}
}
},
{
"name": "subscriptionApi",
"type": "Microsoft.Solutions.ArmApiControl",
"request": {
"method": "GET",
"path": "subscriptions?api-version=2020-01-01"
}
},
{
"name": "dataLandingZoneSubscriptionIds",
"ariaLabel": "Enter information per Data Landing Zone",
"label": "Data Landing Zone Subscriptions",
"type": "Microsoft.Common.EditableGrid",
"visible": true,
"constraints": {
"width": "Full",
"rows": {
"count": {
"min": 0,
"max": 50
}
},
"columns": [
{
"id": "subscription",
"header": "Subscription",
"width": "1fr",
"element": {
"name": "subscription",
"type": "Microsoft.Common.DropDown",
"placeholder": "Select a subscription...",
"multiselect": false,
"selectAll": false,
"filter": true,
"filterPlaceholder": "Filter items ...",
"multiLine": true,
"constraints": {
"allowedValues": "[map(steps('generalSettings').dataLandingZoneSubscriptions.subscriptionApi.value, (item) => parse(concat('{\"label\":\"', item.displayName, '\",\"value\":\"', item.subscriptionId, '\",\"description\":\"', 'ID: ', item.subscriptionId, '\"}')))]",
"required": true
}
}
}
]
}
}
]
}
]
},
Expand Down Expand Up @@ -1406,6 +1471,7 @@
"purviewId": "[if(empty(steps('generalSettings').dataGovernanceSettings.purviewId.id), '', steps('generalSettings').dataGovernanceSettings.purviewId.id)]",
"purviewManagedStorageId": "[if(empty(steps('generalSettings').dataGovernanceSettings.purviewId.id), '', steps('generalSettings').dataGovernanceSettings.purviewApi.properties.managedResources.storageAccount)]",
"purviewManagedEventHubId": "[if(empty(steps('generalSettings').dataGovernanceSettings.purviewId.id), '', steps('generalSettings').dataGovernanceSettings.purviewApi.properties.managedResources.eventHubNamespace)]",
"dataLandingZoneSubscriptionIds": "[if(empty(steps('generalSettings').dataLandingZoneSubscriptions.dataLandingZoneSubscriptionIds), parse('[]'), map(steps('generalSettings').dataLandingZoneSubscriptions.dataLandingZoneSubscriptionIds, (item) => item.subscription))]",
"privateDnsZoneIdKeyVault": "[if(empty(steps('connectivitySettings').privateDnsZones.privateDnsZoneIdKeyVault), '', steps('connectivitySettings').privateDnsZones.privateDnsZoneIdKeyVault)]",
"privateDnsZoneIdDataFactory": "[if(empty(steps('connectivitySettings').privateDnsZones.privateDnsZoneIdDataFactory), '', steps('connectivitySettings').privateDnsZones.privateDnsZoneIdDataFactory)]",
"privateDnsZoneIdDataFactoryPortal": "[if(empty(steps('connectivitySettings').privateDnsZones.privateDnsZoneIdDataFactoryPortal), '', steps('connectivitySettings').privateDnsZones.privateDnsZoneIdDataFactoryPortal)]",
Expand Down
5 changes: 5 additions & 0 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ param purviewManagedEventHubId string = ''
param purviewSelfHostedIntegrationRuntimeAuthKey string = ''
@description('Specifies whether the self-hosted integration runtimes should be deployed.')
param deploySelfHostedIntegrationRuntimes bool = false
@description('Specifies the subscription IDs of the other Data Landing Zones.')
param dataLandingZoneSubscriptionIds array = []

// Private DNS Zone parameters
@description('Specifies the resource ID of the private DNS zone for Key Vault.')
Expand Down Expand Up @@ -210,6 +212,7 @@ module storageServices 'modules/storage.bicep' = {
purviewId: purviewId
privateDnsZoneIdBlob: privateDnsZoneIdBlob
privateDnsZoneIdDfs: privateDnsZoneIdDfs
dataLandingZoneSubscriptionIds: dataLandingZoneSubscriptionIds
}
}

Expand All @@ -231,6 +234,7 @@ module externalStorageServices 'modules/externalstorage.bicep' = {
purviewId: purviewId
subnetId: networkServices.outputs.servicesSubnetId
privateDnsZoneIdBlob: privateDnsZoneIdBlob
dataLandingZoneSubscriptionIds: dataLandingZoneSubscriptionIds
}
}

Expand Down Expand Up @@ -386,6 +390,7 @@ output mySqlServer001ResourceGroupName string = split(metadataServices.outputs.m
output mySqlServer001Name string = last(split(metadataServices.outputs.mySqlServer001Id, '/'))
output mySqlServer001KeyVaultid string = metadataServices.outputs.keyVault001Id
output mySqlServer001UsernameSecretName string = metadataServices.outputs.mySqlServer001UsernameSecretName
#disable-next-line outputs-should-not-contain-secrets
output mySqlServer001PasswordSecretName string = metadataServices.outputs.mySqlServer001PasswordSecretName
output mySqlServer001ConnectionStringSecretName string = metadataServices.outputs.mySqlServer001ConnectionStringSecretName
output logAnalyticsWorkspaceKeyVaultId string = loggingServices.outputs.logAnalytics001WorkspaceKeyVaultId
Expand Down
Loading