Azure
/
data-management-zone
зеркало из https://github.com/Azure/data-management-zone.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix privateDnsZoneGroups Bug (#215)

This commit is contained in:
Marvin Buss 2021-10-29 08:50:35 +02:00 коммит произвёл GitHub
Родитель a7cea70cd3
Коммит 09fe695d60
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 19 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
infra/main.json
Просмотреть файл

@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "9106325363285277016"
"templateHash": "16584189192184544370"
}
},
"parameters": {
@ -2879,7 +2879,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "13922209701302207861"
"templateHash": "7590531782081910607"
}
},
"parameters": {
@ -2938,7 +2938,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "3281195981325252632"
"templateHash": "15554382069101917536"
}
},
"parameters": {
@ -3032,7 +3032,7 @@
]
},
{
"condition": "[empty(parameters('privateDnsZoneIdContainerRegistry'))]",
"condition": "[not(empty(parameters('privateDnsZoneIdContainerRegistry')))]",
"type": "Microsoft.Network/privateEndpoints/privateDnsZoneGroups",
"apiVersion": "2020-11-01",
"name": "[format('{0}/{1}', variables('containerRegistryPrivateEndpointName'), 'default')]",

12
infra/modules/network.bicep
Просмотреть файл

@ -105,7 +105,7 @@ resource vnet 'Microsoft.Network/virtualNetworks@2020-06-01' = {
}
}
resource publicIpPrefixes 'Microsoft.Network/publicIPPrefixes@2020-11-01' = if (enableDnsAndFirewallDeployment) {
resource publicIpPrefixes 'Microsoft.Network/publicIPPrefixes@2020-11-01' = if(enableDnsAndFirewallDeployment) {
name: '${prefix}-publicipprefix'
location: location
tags: tags
@ -119,7 +119,7 @@ resource publicIpPrefixes 'Microsoft.Network/publicIPPrefixes@2020-11-01' = if (
}
}
resource publicIp 'Microsoft.Network/publicIPAddresses@2020-11-01' = if (enableDnsAndFirewallDeployment) {
resource publicIp 'Microsoft.Network/publicIPAddresses@2020-11-01' = if(enableDnsAndFirewallDeployment) {
name: '${prefix}-publicip001'
location: location
tags: tags
@ -139,7 +139,7 @@ resource publicIp 'Microsoft.Network/publicIPAddresses@2020-11-01' = if (enableD
}
}
resource firewallPolicy 'Microsoft.Network/firewallPolicies@2020-11-01' = if (enableDnsAndFirewallDeployment) {
resource firewallPolicy 'Microsoft.Network/firewallPolicies@2020-11-01' = if(enableDnsAndFirewallDeployment) {
name: '${prefix}-firewallpolicy'
location: location
tags: tags
@ -166,7 +166,7 @@ resource firewallPolicy 'Microsoft.Network/firewallPolicies@2020-11-01' = if (en
}
}
module firewallPolicyRules 'services/firewallPolicyRules.bicep' = if (enableDnsAndFirewallDeployment) {
module firewallPolicyRules 'services/firewallPolicyRules.bicep' = if(enableDnsAndFirewallDeployment) {
name: '${prefix}-firewallpolicy-rules'
scope: resourceGroup()
dependsOn: [
@ -177,7 +177,7 @@ module firewallPolicyRules 'services/firewallPolicyRules.bicep' = if (enableDnsA
}
}
module firewallPolicyRulesToExistingFirewallPolicy 'services/firewallPolicyRules.bicep' = if (!enableDnsAndFirewallDeployment && !empty(firewallPolicyId)) {
module firewallPolicyRulesToExistingFirewallPolicy 'services/firewallPolicyRules.bicep' = if(!enableDnsAndFirewallDeployment && !empty(firewallPolicyId)) {
name: '${prefix}-firewallpolicy-rules-toExistingFirewallPolicy'
scope: resourceGroup(firewallPolicySubscriptionId, firewallPolicyResourceGroupName)
params: {
@ -185,7 +185,7 @@ module firewallPolicyRulesToExistingFirewallPolicy 'services/firewallPolicyRules
}
}
resource firewall 'Microsoft.Network/azureFirewalls@2020-11-01' = if (enableDnsAndFirewallDeployment) {
resource firewall 'Microsoft.Network/azureFirewalls@2020-11-01' = if(enableDnsAndFirewallDeployment) {
name: '${prefix}-firewall'
dependsOn: [
firewallPolicyRules

2
infra/modules/services/containerregistry.bicep
Просмотреть файл

@ -78,7 +78,7 @@ resource containerRegistryPrivateEndpoint 'Microsoft.Network/privateEndpoints@20
}
}
resource containerRegistryPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (empty(privateDnsZoneIdContainerRegistry)) {
resource containerRegistryPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdContainerRegistry)) {
parent: containerRegistryPrivateEndpoint
name: 'default'
properties: {

2
infra/modules/services/keyvault.bicep
Просмотреть файл

@ -67,7 +67,7 @@ resource keyVaultPrivateEndpoint 'Microsoft.Network/privateEndpoints@2020-11-01'
}
}
resource keyVaultPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdKeyVault)) {
resource keyVaultPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdKeyVault)) {
parent: keyVaultPrivateEndpoint
name: 'default'
properties: {

2
infra/modules/services/powerbiprivatelink.bicep
Просмотреть файл

@ -50,7 +50,7 @@ resource powerbiPrivateLinkPrivateEndpoint 'Microsoft.Network/privateEndpoints@2
}
}
resource powerbiPrivateLinkPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdAnalysis) && !empty(privateDnsZoneIdPbiDedicated) && !empty(privateDnsZoneIdPowerQuery)) {
resource powerbiPrivateLinkPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdAnalysis) && !empty(privateDnsZoneIdPbiDedicated) && !empty(privateDnsZoneIdPowerQuery)) {
parent: powerbiPrivateLinkPrivateEndpoint
name: 'default'
properties: {

10
infra/modules/services/purview.bicep
Просмотреть файл

@ -77,7 +77,7 @@ resource purviewPrivateEndpointPortal 'Microsoft.Network/privateEndpoints@2020-1
}
}
resource purviewPrivateEndpointPortalARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdPurviewPortal)) {
resource purviewPrivateEndpointPortalARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdPurviewPortal)) {
parent: purviewPrivateEndpointPortal
name: 'default'
properties: {
@ -116,7 +116,7 @@ resource purviewPrivateEndpointAccount 'Microsoft.Network/privateEndpoints@2020-
}
}
resource purviewPrivateEndpointAccountARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdPurview)) {
resource purviewPrivateEndpointAccountARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdPurview)) {
parent: purviewPrivateEndpointAccount
name: 'default'
properties: {
@ -155,7 +155,7 @@ resource purviewPrivateEndpointBlob 'Microsoft.Network/privateEndpoints@2020-11-
}
}
resource purviewPrivateEndpointBlobARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdStorageBlob)) {
resource purviewPrivateEndpointBlobARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdStorageBlob)) {
parent: purviewPrivateEndpointBlob
name: 'default'
properties: {
@ -194,7 +194,7 @@ resource purviewPrivateEndpointQueue 'Microsoft.Network/privateEndpoints@2020-11
}
}
resource purviewPrivateEndpointQueueARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdStorageQueue)) {
resource purviewPrivateEndpointQueueARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdStorageQueue)) {
parent: purviewPrivateEndpointQueue
name: 'default'
properties: {
@ -233,7 +233,7 @@ resource purviewPrivateEndpointNamespace 'Microsoft.Network/privateEndpoints@202
}
}
resource purviewPrivateEndpointNamespaceARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdEventhubNamespace)) {
resource purviewPrivateEndpointNamespaceARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdEventhubNamespace)) {
parent: purviewPrivateEndpointNamespace
name: 'default'
properties: {

2
infra/modules/services/synapseprivatelinkhub.bicep
Просмотреть файл

@ -47,7 +47,7 @@ resource synapsePrivatelinkHubPrivateEndpoint 'Microsoft.Network/privateEndpoint
}
}
resource synapsePrivatelinkHubPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if (!empty(privateDnsZoneIdSynapseprivatelinkhub)) {
resource synapsePrivatelinkHubPrivateEndpointARecord 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2020-11-01' = if(!empty(privateDnsZoneIdSynapseprivatelinkhub)) {
parent: synapsePrivatelinkHubPrivateEndpoint
name: 'default'
properties: {