From 6fdc22d7ff9967d2fa980dbc6ff212668688bf8f Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 07:35:18 -0500 Subject: [PATCH 1/8] Remove obsolete directory --- isv/SampleGenericSubscription/main.bicep | 64 ------- .../networking.bicep | 167 ------------------ isv/SampleGenericSubscription/readme.md | 9 - 3 files changed, 240 deletions(-) delete mode 100644 isv/SampleGenericSubscription/main.bicep delete mode 100644 isv/SampleGenericSubscription/networking.bicep delete mode 100644 isv/SampleGenericSubscription/readme.md diff --git a/isv/SampleGenericSubscription/main.bicep b/isv/SampleGenericSubscription/main.bicep deleted file mode 100644 index d4453553..00000000 --- a/isv/SampleGenericSubscription/main.bicep +++ /dev/null @@ -1,64 +0,0 @@ -// ---------------------------------------------------------------------------------- -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. -// -// THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -// EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES -// OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -// ---------------------------------------------------------------------------------- - -targetScope = 'subscription' - -// Resource Groups -param rgVnetName string = 'networkingRG' - -// VNET -param vnetName string = 'vnet' -param vnetAddressSpace string = '10.0.0.0/16' - -// Presentation Zone (PAZ) Subnet -param subnetPresentationName string = 'paz' -param subnetPresentationPrefix string = '10.0.1.0/24' - -// Internal Foundational Elements (OZ) Subnet -param subnetFoundationalElementsName string = 'oz' -param subnetFoundationalElementsPrefix string = '10.0.2.0/24' - -// Application zone (RZ) Subnet -param subnetApplicationName string = 'rz' -param subnetApplicationPrefix string = '10.0.3.0/24' - -// Data Zone (HRZ) Subnet -param subnetDataName string = 'hrz' -param subnetDataPrefix string = '10.0.4.0/24' - -// Resource Groups -resource rgVnet 'Microsoft.Resources/resourceGroups@2020-06-01' = { - name: rgVnetName - location: deployment().location -} - -// Virtual Network -module vnet 'networking.bicep' = { - name: 'vnet' - scope: resourceGroup(rgVnet.name) - params: { - vnetName: vnetName - vnetAddressSpace: vnetAddressSpace - subnetFoundationalElementsName: subnetFoundationalElementsName - subnetFoundationalElementsPrefix: subnetFoundationalElementsPrefix - subnetPresentationName: subnetPresentationName - subnetPresentationPrefix: subnetPresentationPrefix - subnetApplicationName: subnetApplicationName - subnetApplicationPrefix: subnetApplicationPrefix - subnetDataName: subnetDataName - subnetDataPrefix: subnetDataPrefix - } -} - -// Outputs -output vnetId string = vnet.outputs.vnetId -output foundationalElementSubnetId string = vnet.outputs.foundationalElementSubnetId -output presentationSubnetId string = vnet.outputs.presentationSubnetId -output applicationSubnetId string = vnet.outputs.applicationSubnetId -output dataSubnetId string = vnet.outputs.dataSubnetId diff --git a/isv/SampleGenericSubscription/networking.bicep b/isv/SampleGenericSubscription/networking.bicep deleted file mode 100644 index 123ba507..00000000 --- a/isv/SampleGenericSubscription/networking.bicep +++ /dev/null @@ -1,167 +0,0 @@ -// ---------------------------------------------------------------------------------- -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. -// -// THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -// EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES -// OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -// ---------------------------------------------------------------------------------- - -// VNET -param vnetName string -param vnetAddressSpace string - -// Presentation Zone (PAZ) Subnet -param subnetPresentationName string -param subnetPresentationPrefix string - -// Internal Foundational Elements (OZ) Subnet -param subnetFoundationalElementsName string -param subnetFoundationalElementsPrefix string - -// Application zone (RZ) Subnet -param subnetApplicationName string -param subnetApplicationPrefix string - -// Data Zone (HRZ) Subnet -param subnetDataName string -param subnetDataPrefix string - -// Network Security Groups -resource nsgFoundationalElements 'Microsoft.Network/networkSecurityGroups@2020-06-01' = { - name: '${subnetFoundationalElementsName}Nsg' - location: resourceGroup().location - properties: { - securityRules: [] - } -} - -resource nsgPresentation 'Microsoft.Network/networkSecurityGroups@2020-06-01' = { - name: '${subnetPresentationName}Nsg' - location: resourceGroup().location - properties: { - securityRules: [] - } -} - -resource nsgApplication 'Microsoft.Network/networkSecurityGroups@2020-06-01' = { - name: '${subnetApplicationName}Nsg' - location: resourceGroup().location - properties: { - securityRules: [] - } -} - -resource nsgData 'Microsoft.Network/networkSecurityGroups@2020-06-01' = { - name: '${subnetDataName}Nsg' - location: resourceGroup().location - properties: { - securityRules: [] - } -} - -// Route Tables -resource udrFoundationalElements 'Microsoft.Network/routeTables@2020-06-01' = { - name: '${subnetFoundationalElementsName}Udr' - location: resourceGroup().location - properties: { - routes: [ - ] - } -} - -resource udrPresentation 'Microsoft.Network/routeTables@2020-06-01' = { - name: '${subnetPresentationName}Udr' - location: resourceGroup().location - properties: { - routes: [ - ] - } -} - -resource udrApplication 'Microsoft.Network/routeTables@2020-06-01' = { - name: '${subnetApplicationName}Udr' - location: resourceGroup().location - properties: { - routes: [ - ] - } -} - -resource udrData 'Microsoft.Network/routeTables@2020-06-01' = { - name: '${subnetDataName}Udr' - location: resourceGroup().location - properties: { - routes: [ - ] - } -} - -// Virtual Network -resource vnetNew 'Microsoft.Network/virtualNetworks@2020-06-01' = { - name: vnetName - location: resourceGroup().location - properties: { - addressSpace: { - addressPrefixes: [ - vnetAddressSpace - ] - } - subnets: [ - { - name: subnetFoundationalElementsName - properties: { - addressPrefix: subnetFoundationalElementsPrefix - routeTable: { - id: udrFoundationalElements.id - } - networkSecurityGroup: { - id: nsgFoundationalElements.id - } - } - } - { - name: subnetPresentationName - properties: { - addressPrefix: subnetPresentationPrefix - routeTable: { - id: udrPresentation.id - } - networkSecurityGroup: { - id: nsgPresentation.id - } - } - } - { - name: subnetApplicationName - properties: { - addressPrefix: subnetApplicationPrefix - routeTable: { - id: udrApplication.id - } - networkSecurityGroup: { - id: nsgApplication.id - } - } - } - { - name: subnetDataName - properties: { - addressPrefix: subnetDataPrefix - routeTable: { - id: udrData.id - } - networkSecurityGroup: { - id: nsgData.id - } - } - } - ] - } -} - -output vnetId string = vnetNew.id -output foundationalElementSubnetId string = '${vnetName}/subnets/${subnetFoundationalElementsName}' -output presentationSubnetId string = '${vnetName}/subnets/${subnetPresentationName}' -output applicationSubnetId string = '${vnetName}/subnets/${subnetApplicationName}' -output dataSubnetId string = '${vnetName}/subnets/${subnetDataName}' diff --git a/isv/SampleGenericSubscription/readme.md b/isv/SampleGenericSubscription/readme.md deleted file mode 100644 index 2b1a857a..00000000 --- a/isv/SampleGenericSubscription/readme.md +++ /dev/null @@ -1,9 +0,0 @@ -## Deployment - -Use Azure CLI to deploy the generic subscription landing zone. - -Replace ___SUBSCRIPTION_ID___ with the Subscription ID Guid. - -```bash -az deployment sub create --subscription ___SUBSCRIPTION_ID___ --template-file main.bicep -l canadacentral -``` \ No newline at end of file From 24018de126910107631e80c25f24d1950f2948d6 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 07:39:03 -0500 Subject: [PATCH 2/8] Rotate resource group names for E2E deployments --- ...268c0_generic-subscription_canadacentral.json | 6 +++--- ...b7-cbed91ab29a7_healthcare_canadacentral.json | 16 ++++++++-------- ...47804f2c98_machinelearning_canadacentral.json | 16 ++++++++-------- ...4a51dd0e27_machinelearning_canadacentral.json | 16 ++++++++-------- ...f355b60c30_machinelearning_canadacentral.json | 16 ++++++++-------- ...6828a144aa_machinelearning_canadacentral.json | 16 ++++++++-------- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json index aa3d4df5..0d7f1f51 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json @@ -65,10 +65,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation2022Q1", + "networking": "rgVnet2022Q1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecovervyVault2022Q1" } }, "automation": { diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json index 8fb82f9e..c8ab1945 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json @@ -65,13 +65,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "health2022Q1Automation", + "compute": "health2022Q1Compute", + "monitor": "health2022Q1Monitor", + "networking": "health2022Q1Network", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "health2022Q1Security", + "storage": "health2022Q1Storage" } }, "useCMK": { @@ -84,7 +84,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "health2022Q1automation" } }, "sqldb": { @@ -114,7 +114,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "health2022Q1vnet", "dnsServers": [ "10.18.1.4" ], diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json index 357a4057..6c01c3e7 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json @@ -58,13 +58,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlsqlauth102021W1Automation", - "compute": "azmlsqlauth102021W1Compute", - "monitor": "azmlsqlauth102021W1Monitor", - "networking": "azmlsqlauth102021W1Network", + "automation": "azmlsqlauth2022Q1Automation", + "compute": "azmlsqlauth2022Q1Compute", + "monitor": "azmlsqlauth2022Q1Monitor", + "networking": "azmlsqlauth2022Q1Network", "networkWatcher": "NetworkWatcherRG", - "security": "azmlsqlauth102021W1Security", - "storage": "azmlsqlauth102021W1Storage" + "security": "azmlsqlauth2022Q1Security", + "storage": "azmlsqlauth2022Q1Storage" } }, "useCMK": { @@ -72,7 +72,7 @@ }, "automation": { "value": { - "name": "azmlsqlauth102021W1automation" + "name": "azmlsqlauth2022Q1automation" } }, "keyVault": { @@ -135,7 +135,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlsqlauth102021W1vnet", + "name": "azmlsqlauth2022Q1vnet", "dnsServers": [ "10.18.1.4" ], diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json index 54c19d5b..c5981cf2 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json @@ -65,13 +65,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmk2022Q1Automation", + "compute": "azmlcmk2022Q1Compute", + "monitor": "azmlcmk2022Q1Monitor", + "networking": "azmlcmk2022Q1Network", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmk2022Q1Security", + "storage": "azmlcmk2022Q1Storage" } }, "useCMK": { @@ -79,7 +79,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmk2022Q1automation" } }, "keyVault": { @@ -139,7 +139,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmk2022Q1vnet", "dnsServers": [ "10.18.1.4" ], diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json index 428de61d..3f6e4cc9 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json @@ -65,13 +65,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlnocmk102021W1Automation", - "compute": "azmlnocmk102021W1Compute", - "monitor": "azmlnocmk102021W1Monitor", - "networking": "azmlnocmk102021W1Network", + "automation": "azmlnocmk2022Q1Automation", + "compute": "azmlnocmk2022Q1Compute", + "monitor": "azmlnocmk2022Q1Monitor", + "networking": "azmlnocmk2022Q1Network", "networkWatcher": "NetworkWatcherRG", - "security": "azmlnocmk102021W1Security", - "storage": "azmlnocmk102021W1Storage" + "security": "azmlnocmk2022Q1Security", + "storage": "azmlnocmk2022Q1Storage" } }, "useCMK": { @@ -79,7 +79,7 @@ }, "automation": { "value": { - "name": "azmlnocmk102021W1automation" + "name": "azmlnocmk2022Q1automation" } }, "keyVault": { @@ -139,7 +139,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlnocmk102021W1vnet", + "name": "azmlnocmk2022Q1vnet", "dnsServers": [ "10.18.1.4" ], diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json index 9e3df610..f3ca7fed 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json @@ -65,13 +65,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmksqlmi102021W1Automation", - "compute": "azmlcmksqlmi102021W1Compute", - "monitor": "azmlcmksqlmi102021W1Monitor", - "networking": "azmlcmksqlmi102021W1Network", + "automation": "azmlcmksqlmi2022Q1Automation", + "compute": "azmlcmksqlmi2022Q1Compute", + "monitor": "azmlcmksqlmi2022Q1Monitor", + "networking": "azmlcmksqlmi2022Q1Network", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmksqlmi102021W1Security", - "storage": "azmlcmksqlmi102021W1Storage" + "security": "azmlcmksqlmi2022Q1Security", + "storage": "azmlcmksqlmi2022Q1Storage" } }, "useCMK": { @@ -79,7 +79,7 @@ }, "automation": { "value": { - "name": "azmlcmksqlmi102021W1automation" + "name": "azmlcmksqlmi2022Q1automation" } }, "keyVault": { @@ -140,7 +140,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmksqlmi102021W1vnet", + "name": "azmlcmksqlmi2022Q1vnet", "dnsServers": [ "10.18.1.4" ], From b479c2c5407ee62daa9f3ec63b07d7f667b6ef79 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 07:41:16 -0500 Subject: [PATCH 3/8] Fix typo --- ...6d-af60-4bc0473268c0_generic-subscription_canadacentral.json | 2 +- ...e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json | 2 +- ...10-86da-7fbb8f660a10_generic-subscription_canadacentral.json | 2 +- docs/archetypes/generic-subscription.md | 2 +- .../lz-generic-subscription/BackupRecoveryVaultIsFalse.json | 2 +- .../lz-generic-subscription/BackupRecoveryVaultIsTrue.json | 2 +- tests/schemas/lz-generic-subscription/BudgetIsFalse.json | 2 +- tests/schemas/lz-generic-subscription/BudgetIsTrue.json | 2 +- tests/schemas/lz-generic-subscription/EmptyResourceTags.json | 2 +- .../schemas/lz-generic-subscription/EmptySubscriptionTags.json | 2 +- .../lz-generic-subscription/FullDeployment-With-Hub.json | 2 +- .../lz-generic-subscription/FullDeployment-Without-Hub.json | 2 +- tests/schemas/lz-generic-subscription/WithOptionalSubnets.json | 2 +- tests/schemas/lz-generic-subscription/WithoutCustomDNS.json | 2 +- .../schemas/lz-generic-subscription/WithoutOptionalSubnets.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json index 0d7f1f51..fd52a386 100644 --- a/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json +++ b/config/subscriptions/CanadaESLZ-main/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json @@ -68,7 +68,7 @@ "automation": "rgAutomation2022Q1", "networking": "rgVnet2022Q1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault2022Q1" + "backupRecoveryVault":"rgRecoveryVault2022Q1" } }, "automation": { diff --git a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json index 16a153c0..c8d81b93 100644 --- a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json +++ b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json @@ -68,7 +68,7 @@ "automation": "rgAutomation", "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json index da1e529b..d5aa8691 100644 --- a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json +++ b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json @@ -68,7 +68,7 @@ "automation": "rgAutomation", "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/docs/archetypes/generic-subscription.md b/docs/archetypes/generic-subscription.md index 151ed406..ded6b4d1 100644 --- a/docs/archetypes/generic-subscription.md +++ b/docs/archetypes/generic-subscription.md @@ -207,7 +207,7 @@ This example configures: "automation": "rgAutomation092021W3", "networking": "rgVnet092021W3", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json index 3d870b47..9ad24a06 100644 --- a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json +++ b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json index ef704703..a645140a 100644 --- a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json +++ b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsFalse.json b/tests/schemas/lz-generic-subscription/BudgetIsFalse.json index ef704703..a645140a 100644 --- a/tests/schemas/lz-generic-subscription/BudgetIsFalse.json +++ b/tests/schemas/lz-generic-subscription/BudgetIsFalse.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsTrue.json b/tests/schemas/lz-generic-subscription/BudgetIsTrue.json index ce871312..c8a62236 100644 --- a/tests/schemas/lz-generic-subscription/BudgetIsTrue.json +++ b/tests/schemas/lz-generic-subscription/BudgetIsTrue.json @@ -95,7 +95,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptyResourceTags.json b/tests/schemas/lz-generic-subscription/EmptyResourceTags.json index ba027de6..b740a2c8 100644 --- a/tests/schemas/lz-generic-subscription/EmptyResourceTags.json +++ b/tests/schemas/lz-generic-subscription/EmptyResourceTags.json @@ -82,7 +82,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json b/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json index dc71341d..a9f7debf 100644 --- a/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json +++ b/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json @@ -93,7 +93,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json b/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json index decadecf..2fbc5038 100644 --- a/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json +++ b/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json @@ -95,7 +95,7 @@ "automation": "rgAutomation092021W3", "networking": "rgVnet092021W3", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json b/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json index fd1432e0..da6fef71 100644 --- a/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json +++ b/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json @@ -95,7 +95,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json index ef704703..a645140a 100644 --- a/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json +++ b/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json b/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json index 027154c4..4d520aa2 100644 --- a/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json +++ b/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json index 9197ad05..d87d3c4f 100644 --- a/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json +++ b/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json @@ -89,7 +89,7 @@ "automation": "rgAutomation102021W1", "networking": "rgVnet102021W1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault102021W1" } }, "automation": { From 236ede5bbd1411d5d2787db08488a7e419f70ecc Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 07:44:59 -0500 Subject: [PATCH 4/8] Add branch config for testing --- ...c0_generic-subscription_canadacentral.json | 170 +++++++++++ ...cbed91ab29a7_healthcare_canadacentral.json | 169 +++++++++++ ...04f2c98_machinelearning_canadacentral.json | 200 ++++++++++++ ...1dd0e27_machinelearning_canadacentral.json | 204 +++++++++++++ ...5b60c30_machinelearning_canadacentral.json | 204 +++++++++++++ ...8a144aa_machinelearning_canadacentral.json | 205 +++++++++++++ config/variables/CanadaESLZ-cleanup.yml | 284 ++++++++++++++++++ 7 files changed, 1436 insertions(+) create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json create mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json create mode 100644 config/variables/CanadaESLZ-cleanup.yml diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json new file mode 100644 index 00000000..fd52a386 --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json @@ -0,0 +1,170 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub1 ALZ action group", + "actionGroupShortName": "sub1-alert", + "alertRuleName": "Sub1 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + }, + { + "comments": "Custom Role: Landing Zone Application Owner", + "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "rgAutomation2022Q1", + "networking": "rgVnet2022Q1", + "networkWatcher": "NetworkWatcherRG", + "backupRecoveryVault":"rgRecoveryVault2022Q1" + } + }, + "automation": { + "value": { + "name": "automation" + } + }, + "backupRecoveryVault":{ + "value": { + "enabled":true, + "name":"bkupvault" + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4" + } + }, + "network": { + "value": { + "deployVnet": true, + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.2.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.2.1.0/25", + "nsg": { + "enabled": true + }, + "udr": { + "enabled": true + } + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.2.2.0/25", + "nsg": { + "enabled": true + }, + "udr": { + "enabled": true + } + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.2.3.0/25", + "nsg": { + "enabled": true + }, + "udr": { + "enabled": true + } + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.2.4.0/25", + "nsg": { + "enabled": true + }, + "udr": { + "enabled": true + } + }, + "optional": [ + { + "comments": "App Service", + "name": "appservice", + "addressPrefix": "10.2.5.0/25", + "nsg": { + "enabled": false + }, + "udr": { + "enabled": false + }, + "delegations": { + "serviceName": "Microsoft.Web/serverFarms" + } + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json new file mode 100644 index 00000000..c8ab1945 --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json @@ -0,0 +1,169 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub2 ALZ action group", + "actionGroupShortName": "sub2-alert", + "alertRuleName": "Sub2 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + }, + { + "comments": "Custom Role: Landing Zone Application Owner", + "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "health2022Q1Automation", + "compute": "health2022Q1Compute", + "monitor": "health2022Q1Monitor", + "networking": "health2022Q1Network", + "networkWatcher": "NetworkWatcherRG", + "security": "health2022Q1Security", + "storage": "health2022Q1Storage" + } + }, + "useCMK": { + "value": true + }, + "keyVault": { + "value": { + "secretExpiryInDays": 3650 + } + }, + "automation": { + "value": { + "name": "health2022Q1automation" + } + }, + "sqldb": { + "value": { + "enabled": true, + "sqlAuthenticationUsername": "azadmin", + "aadAuthenticationOnly":false + } + }, + "synapse": { + "value": { + "username": "azadmin" + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4", + "privateDnsManagedByHub": true, + "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", + "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" + } + }, + "network": { + "value": { + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "health2022Q1vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.5.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.5.1.0/25" + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.5.2.0/25" + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.5.3.0/25" + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.5.4.0/25" + }, + "databricksPublic": { + "comments": "Databricks Public Delegated Subnet", + "name": "databrickspublic", + "addressPrefix": "10.5.5.0/25" + }, + "databricksPrivate": { + "comments": "Databricks Private Delegated Subnet", + "name": "databricksprivate", + "addressPrefix": "10.5.6.0/25" + }, + "privateEndpoints": { + "comments": "Private Endpoints Subnet", + "name": "privateendpoints", + "addressPrefix": "10.5.7.0/25" + }, + "web": { + "comments": "Azure Web App Delegated Subnet", + "name": "webapp", + "addressPrefix": "10.5.8.0/25" + } + } + } + } + } +} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json new file mode 100644 index 00000000..6c01c3e7 --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json @@ -0,0 +1,200 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub5 ALZ action group", + "actionGroupShortName": "sub5-alert", + "alertRuleName": "Sub5 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "azmlsqlauth2022Q1Automation", + "compute": "azmlsqlauth2022Q1Compute", + "monitor": "azmlsqlauth2022Q1Monitor", + "networking": "azmlsqlauth2022Q1Network", + "networkWatcher": "NetworkWatcherRG", + "security": "azmlsqlauth2022Q1Security", + "storage": "azmlsqlauth2022Q1Storage" + } + }, + "useCMK": { + "value": false + }, + "automation": { + "value": { + "name": "azmlsqlauth2022Q1automation" + } + }, + "keyVault": { + "value": { + "secretExpiryInDays": 3650 + } + }, + "aks": { + "value": { + "version": "1.21.2", + "enabled": true, + "networkPlugin": "kubenet" , + "networkPolicy": "calico", + "podCidr": "11.0.0.0/16", + "serviceCidr": "20.0.0.0/16" , + "dnsServiceIP": "20.0.0.10", + "dockerBridgeCidr": "30.0.0.1/16" + } + }, + "appServiceLinuxContainer": { + "value": { + "enabled": true, + "skuName": "P1V2", + "skuTier": "Premium", + "enablePrivateEndpoint": true + } + }, + "sqldb": { + "value": { + "enabled": true, + "sqlAuthenticationUsername": "azadmin", + "aadAuthenticationOnly": false, + "aadLoginName":"DBA Security Group", + "aadLoginObjectID":"e0357d81-55d8-44e9-9d9c-ab09dc710785", + "aadLoginType":"Group" + } + }, + "sqlmi": { + "value": { + "enabled": false + } + }, + "aml": { + "value": { + "enableHbiWorkspace": false + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4", + "privateDnsManagedByHub": true, + "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", + "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" + } + }, + "network": { + "value": { + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "azmlsqlauth2022Q1vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.6.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.6.1.0/25" + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.6.2.0/25" + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.6.3.0/25" + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.6.4.0/25" + }, + "sqlmi": { + "comments": "SQL Managed Instances Delegated Subnet", + "name": "sqlmi", + "addressPrefix": "10.6.5.0/25" + }, + "databricksPublic": { + "comments": "Databricks Public Delegated Subnet", + "name": "databrickspublic", + "addressPrefix": "10.6.6.0/25" + }, + "databricksPrivate": { + "comments": "Databricks Private Delegated Subnet", + "name": "databricksprivate", + "addressPrefix": "10.6.7.0/25" + }, + "privateEndpoints": { + "comments": "Private Endpoints Subnet", + "name": "privateendpoints", + "addressPrefix": "10.6.8.0/25" + }, + "aks": { + "comments": "AKS Subnet", + "name": "aks", + "addressPrefix": "10.6.9.0/25" + }, + "appService": { + "comments": "App Service Subnet", + "name": "appService", + "addressPrefix": "10.6.10.0/25" + } + } + } + } + } +} diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json new file mode 100644 index 00000000..c5981cf2 --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json @@ -0,0 +1,204 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub3 ALZ action group", + "actionGroupShortName": "sub3-alert", + "alertRuleName": "Sub3 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + }, + { + "comments": "Custom Role: Landing Zone Application Owner", + "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "azmlcmk2022Q1Automation", + "compute": "azmlcmk2022Q1Compute", + "monitor": "azmlcmk2022Q1Monitor", + "networking": "azmlcmk2022Q1Network", + "networkWatcher": "NetworkWatcherRG", + "security": "azmlcmk2022Q1Security", + "storage": "azmlcmk2022Q1Storage" + } + }, + "useCMK": { + "value": true + }, + "automation": { + "value": { + "name": "azmlcmk2022Q1automation" + } + }, + "keyVault": { + "value": { + "secretExpiryInDays": 3650 + } + }, + "aks": { + "value": { + "version": "1.21.2", + "enabled": true, + "networkPlugin": "kubenet" , + "networkPolicy": "calico", + "podCidr": "11.0.0.0/16", + "serviceCidr": "20.0.0.0/16" , + "dnsServiceIP": "20.0.0.10", + "dockerBridgeCidr": "30.0.0.1/16" + } + }, + "appServiceLinuxContainer": { + "value": { + "enabled": true, + "skuName": "P1V2", + "skuTier": "Premium", + "enablePrivateEndpoint": true + } + }, + "sqldb": { + "value": { + "enabled": true, + "sqlAuthenticationUsername": "azadmin", + "aadAuthenticationOnly":false + } + }, + "sqlmi": { + "value": { + "enabled": false + } + }, + "aml": { + "value": { + "enableHbiWorkspace": false + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4", + "privateDnsManagedByHub": true, + "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", + "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" + } + }, + "network": { + "value": { + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "azmlcmk2022Q1vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.1.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.1.1.0/25" + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.1.2.0/25" + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.1.3.0/25" + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.1.4.0/25" + }, + "sqlmi": { + "comments": "SQL Managed Instances Delegated Subnet", + "name": "sqlmi", + "addressPrefix": "10.1.5.0/25" + }, + "databricksPublic": { + "comments": "Databricks Public Delegated Subnet", + "name": "databrickspublic", + "addressPrefix": "10.1.6.0/25" + }, + "databricksPrivate": { + "comments": "Databricks Private Delegated Subnet", + "name": "databricksprivate", + "addressPrefix": "10.1.7.0/25" + }, + "privateEndpoints": { + "comments": "Private Endpoints Subnet", + "name": "privateendpoints", + "addressPrefix": "10.1.8.0/25" + }, + "aks": { + "comments": "AKS Subnet", + "name": "aks", + "addressPrefix": "10.1.9.0/25" + }, + "appService": { + "comments": "App Service Subnet", + "name": "appService", + "addressPrefix": "10.1.10.0/25" + } + } + } + } + } +} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json new file mode 100644 index 00000000..3f6e4cc9 --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json @@ -0,0 +1,204 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub4 ALZ action group", + "actionGroupShortName": "sub4-alert", + "alertRuleName": "Sub4 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + }, + { + "comments": "Custom Role: Landing Zone Application Owner", + "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "azmlnocmk2022Q1Automation", + "compute": "azmlnocmk2022Q1Compute", + "monitor": "azmlnocmk2022Q1Monitor", + "networking": "azmlnocmk2022Q1Network", + "networkWatcher": "NetworkWatcherRG", + "security": "azmlnocmk2022Q1Security", + "storage": "azmlnocmk2022Q1Storage" + } + }, + "useCMK": { + "value": false + }, + "automation": { + "value": { + "name": "azmlnocmk2022Q1automation" + } + }, + "keyVault": { + "value": { + "secretExpiryInDays": 3650 + } + }, + "aks": { + "value": { + "version": "1.21.2", + "enabled": true, + "networkPlugin": "kubenet" , + "networkPolicy": "calico", + "podCidr": "11.0.0.0/16", + "serviceCidr": "20.0.0.0/16" , + "dnsServiceIP": "20.0.0.10", + "dockerBridgeCidr": "30.0.0.1/16" + } + }, + "appServiceLinuxContainer": { + "value": { + "enabled": true, + "skuName": "P1V2", + "skuTier": "Premium", + "enablePrivateEndpoint": true + } + }, + "sqldb": { + "value": { + "enabled": true, + "sqlAuthenticationUsername": "azadmin", + "aadAuthenticationOnly":false + } + }, + "sqlmi": { + "value": { + "enabled": false + } + }, + "aml": { + "value": { + "enableHbiWorkspace": false + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4", + "privateDnsManagedByHub": true, + "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", + "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" + } + }, + "network": { + "value": { + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "azmlnocmk2022Q1vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.3.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.3.1.0/25" + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.3.2.0/25" + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.3.3.0/25" + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.3.4.0/25" + }, + "sqlmi": { + "comments": "SQL Managed Instances Delegated Subnet", + "name": "sqlmi", + "addressPrefix": "10.3.5.0/25" + }, + "databricksPublic": { + "comments": "Databricks Public Delegated Subnet", + "name": "databrickspublic", + "addressPrefix": "10.3.6.0/25" + }, + "databricksPrivate": { + "comments": "Databricks Private Delegated Subnet", + "name": "databricksprivate", + "addressPrefix": "10.3.7.0/25" + }, + "privateEndpoints": { + "comments": "Private Endpoints Subnet", + "name": "privateendpoints", + "addressPrefix": "10.3.8.0/25" + }, + "aks": { + "comments": "AKS Subnet", + "name": "aks", + "addressPrefix": "10.3.9.0/25" + }, + "appService": { + "comments": "App Service Subnet", + "name": "appService", + "addressPrefix": "10.3.10.0/25" + } + } + } + } + } +} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json new file mode 100644 index 00000000..f3ca7fed --- /dev/null +++ b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json @@ -0,0 +1,205 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "serviceHealthAlerts": { + "value": { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], + "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] + }, + "actionGroupName": "Sub5 ALZ action group", + "actionGroupShortName": "sub5-alert", + "alertRuleName": "Sub5 ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + }, + "securityCenter": { + "value": { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + }, + "subscriptionRoleAssignments": { + "value": [ + { + "comments": "Built-in Role: Contributor", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + }, + { + "comments": "Custom Role: Landing Zone Application Owner", + "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + }, + "subscriptionBudget": { + "value": { + "createBudget": false + } + }, + "subscriptionTags": { + "value": { + "ISSO": "isso-tag" + } + }, + "resourceTags": { + "value": { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + }, + "resourceGroups": { + "value": { + "automation": "azmlcmksqlmi2022Q1Automation", + "compute": "azmlcmksqlmi2022Q1Compute", + "monitor": "azmlcmksqlmi2022Q1Monitor", + "networking": "azmlcmksqlmi2022Q1Network", + "networkWatcher": "NetworkWatcherRG", + "security": "azmlcmksqlmi2022Q1Security", + "storage": "azmlcmksqlmi2022Q1Storage" + } + }, + "useCMK": { + "value": true + }, + "automation": { + "value": { + "name": "azmlcmksqlmi2022Q1automation" + } + }, + "keyVault": { + "value": { + "secretExpiryInDays": 3650 + } + }, + "aks": { + "value": { + "version": "1.21.2", + "enabled": true, + "networkPlugin": "kubenet" , + "networkPolicy": "calico", + "podCidr": "11.0.0.0/16", + "serviceCidr": "20.0.0.0/16" , + "dnsServiceIP": "20.0.0.10", + "dockerBridgeCidr": "30.0.0.1/16" + } + }, + "appServiceLinuxContainer": { + "value": { + "enabled": true, + "skuName": "P1V2", + "skuTier": "Premium", + "enablePrivateEndpoint": true + } + }, + "sqldb": { + "value": { + "enabled": true, + "sqlAuthenticationUsername": "azadmin", + "aadAuthenticationOnly":false + } + }, + "sqlmi": { + "value": { + "enabled": true, + "username": "azadmin" + } + }, + "aml": { + "value": { + "enableHbiWorkspace": false + } + }, + "hubNetwork": { + "value": { + "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", + "rfc1918IPRange": "10.18.0.0/22", + "rfc6598IPRange": "100.60.0.0/16", + "egressVirtualApplianceIp": "10.18.1.4", + "privateDnsManagedByHub": true, + "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", + "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" + } + }, + "network": { + "value": { + "peerToHubVirtualNetwork": true, + "useRemoteGateway": false, + "name": "azmlcmksqlmi2022Q1vnet", + "dnsServers": [ + "10.18.1.4" + ], + "addressPrefixes": [ + "10.4.0.0/16" + ], + "subnets": { + "oz": { + "comments": "Foundational Elements Zone (OZ)", + "name": "oz", + "addressPrefix": "10.4.1.0/25" + }, + "paz": { + "comments": "Presentation Zone (PAZ)", + "name": "paz", + "addressPrefix": "10.4.2.0/25" + }, + "rz": { + "comments": "Application Zone (RZ)", + "name": "rz", + "addressPrefix": "10.4.3.0/25" + }, + "hrz": { + "comments": "Data Zone (HRZ)", + "name": "hrz", + "addressPrefix": "10.4.4.0/25" + }, + "sqlmi": { + "comments": "SQL Managed Instances Delegated Subnet", + "name": "sqlmi", + "addressPrefix": "10.4.5.0/25" + }, + "databricksPublic": { + "comments": "Databricks Public Delegated Subnet", + "name": "databrickspublic", + "addressPrefix": "10.4.6.0/25" + }, + "databricksPrivate": { + "comments": "Databricks Private Delegated Subnet", + "name": "databricksprivate", + "addressPrefix": "10.4.7.0/25" + }, + "privateEndpoints": { + "comments": "Private Endpoints Subnet", + "name": "privateendpoints", + "addressPrefix": "10.4.8.0/25" + }, + "aks": { + "comments": "AKS Subnet", + "name": "aks", + "addressPrefix": "10.4.9.0/25" + }, + "appService": { + "comments": "App Service Subnet", + "name": "appService", + "addressPrefix": "10.4.10.0/25" + } + } + } + } + } +} \ No newline at end of file diff --git a/config/variables/CanadaESLZ-cleanup.yml b/config/variables/CanadaESLZ-cleanup.yml new file mode 100644 index 00000000..fa06e803 --- /dev/null +++ b/config/variables/CanadaESLZ-cleanup.yml @@ -0,0 +1,284 @@ +# ---------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. +# +# THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, +# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. +# ---------------------------------------------------------------------------------- + +# Environment YAML files can be used to supplement +# the variables specified in 'config/variables/common.yml'. You can: +# * Override existing common-vars.yml variable value settings, and +# * Create new variable values not present in common-vars.yml +# +# The naming convention for these YAML files is: +# {organization}-{branch}.yml +# +# where {organization} is the organization variable from the +# common.yml file +# and {branch} is the Azure Repos branch name used by the +# currently executing pipeline. + +variables: + # Management Groups + var-parentManagementGroupId: 343ddfdb-bef5-46d9-99cf-ed67d5948783 + var-topLevelManagementGroupName: pubsec + + # Logging + var-logging-managementGroupId: pubsecPlatformManagement + var-logging-subscriptionId: bc0a4f9f-07fa-4284-b1bd-fbad38578d3a + var-logging-logAnalyticsResourceGroupName: pubsec-central-logging-rg + var-logging-logAnalyticsWorkspaceName: log-analytics-workspace + var-logging-logAnalyticsRetentionInDays: 730 + var-logging-logAnalyticsAutomationAccountName: automation-account + var-logging-diagnosticSettingsforNetworkSecurityGroupsStoragePrefix: pubsecnsg + var-logging-serviceHealthAlerts: > + { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ + { "countryCode": "1", "phoneNumber": "5555555555" } + ], + "voice": [ + { "countryCode": "1", "phoneNumber": "5555555555" } + ] + }, + "actionGroupName": "ALZ action group", + "actionGroupShortName": "alz-alert", + "alertRuleName": "ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + var-logging-securityCenter: > + { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + var-logging-subscriptionRoleAssignments: > + [ + { + "comments": "Built-in Contributor Role", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + var-logging-subscriptionBudget: > + { + "createBudget": false, + "name": "MonthlySubscriptionBudget", + "amount": 1000, + "timeGrain": "Monthly", + "contactEmails": [ "alzcanadapubsec@microsoft.com" ] + } + var-logging-subscriptionTags: > + { + "ISSO": "isso-tbd" + } + var-logging-resourceTags: > + { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + + # Hub Networking + var-hubnetwork-managementGroupId: pubsecPlatformConnectivity + var-hubnetwork-subscriptionId: ed7f4eed-9010-4227-b115-2a5e37728f27 + var-hubnetwork-serviceHealthAlerts: > + { + "resourceGroupName": "pubsec-service-health", + "incidentTypes": [ "Incident", "Security" ], + "regions": [ "Global", "Canada East", "Canada Central" ], + "receivers": { + "app": [ "alzcanadapubsec@microsoft.com" ], + "email": [ "alzcanadapubsec@microsoft.com" ], + "sms": [ + { "countryCode": "1", "phoneNumber": "5555555555" } + ], + "voice": [ + { "countryCode": "1", "phoneNumber": "5555555555" } + ] + }, + "actionGroupName": "ALZ action group", + "actionGroupShortName": "alz-alert", + "alertRuleName": "ALZ alert rule", + "alertRuleDescription": "Alert rule for Azure Landing Zone" + } + var-hubnetwork-securityCenter: > + { + "email": "alzcanadapubsec@microsoft.com", + "phone": "5555555555" + } + var-hubnetwork-subscriptionRoleAssignments: > + [ + { + "comments": "Built-in Contributor Role", + "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", + "securityGroupObjectIds": [ + "38f33f7e-a471-4630-8ce9-c6653495a2ee" + ] + } + ] + var-hubnetwork-subscriptionBudget: > + { + "createBudget": false, + "name": "MonthlySubscriptionBudget", + "amount": 1000, + "timeGrain": "Monthly", + "contactEmails": [ "alzcanadapubsec@microsoft.com" ] + } + var-hubnetwork-subscriptionTags: > + { + "ISSO": "isso-tbd" + } + var-hubnetwork-resourceTags: > + { + "ClientOrganization": "client-organization-tag", + "CostCenter": "cost-center-tag", + "DataSensitivity": "data-sensitivity-tag", + "ProjectContact": "project-contact-tag", + "ProjectName": "project-name-tag", + "TechnicalContact": "technical-contact-tag" + } + + ## Hub Networking - Private Dns Zones + var-hubnetwork-deployPrivateDnsZones: true + var-hubnetwork-rgPrivateDnsZonesName: pubsec-dns-rg + + ## Hub Networking - DDOS + var-hubnetwork-deployDdosStandard: false + var-hubnetwork-rgDdosName: pubsec-ddos-rg + var-hubnetwork-ddosPlanName: ddos-plan + + ## Hub Networking - Public Zone + var-hubnetwork-rgPazName: pubsec-public-access-zone-rg + + ## Hub Networking - Management Restricted Zone Virtual Network + var-hubnetwork-rgMrzName: pubsec-management-restricted-zone-rg + var-hubnetwork-mrzVnetName: management-restricted-vnet + var-hubnetwork-mrzVnetAddressPrefixRFC1918: 10.18.4.0/22 + + var-hubnetwork-mrzMazSubnetName: MazSubnet + var-hubnetwork-mrzMazSubnetAddressPrefix: 10.18.4.0/25 + + var-hubnetwork-mrzInfSubnetName: InfSubnet + var-hubnetwork-mrzInfSubnetAddressPrefix: 10.18.4.128/25 + + var-hubnetwork-mrzSecSubnetName: SecSubnet + var-hubnetwork-mrzSecSubnetAddressPrefix: 10.18.5.0/26 + + var-hubnetwork-mrzLogSubnetName: LogSubnet + var-hubnetwork-mrzLogSubnetAddressPrefix: 10.18.5.64/26 + + var-hubnetwork-mrzMgmtSubnetName: MgmtSubnet + var-hubnetwork-mrzMgmtSubnetAddressPrefix: 10.18.5.128/26 + + var-hubnetwork-bastionName: bastion + var-hubnetwork-bastionSku: Standard + var-hubnetwork-bastionScaleUnits: 2 + + #################################################################################### + ### Hub Networking with Azure Firewall ### + #################################################################################### + var-hubnetwork-azfw-rgPolicyName: pubsec-azure-firewall-policy-rg + var-hubnetwork-azfw-policyName: pubsecAzureFirewallPolicy + + var-hubnetwork-azfw-rgHubName: pubsec-hub-networking-rg + var-hubnetwork-azfw-hubVnetName: hub-vnet + var-hubnetwork-azfw-hubVnetAddressPrefixRFC1918: 10.18.0.0/22 + var-hubnetwork-azfw-hubVnetAddressPrefixRFC6598: 100.60.0.0/16 + var-hubnetwork-azfw-hubVnetAddressPrefixBastion: 192.168.0.0/16 + + var-hubnetwork-azfw-hubPazSubnetName: PAZSubnet + var-hubnetwork-azfw-hubPazSubnetAddressPrefix: 100.60.1.0/24 + + var-hubnetwork-azfw-hubGatewaySubnetPrefix: 10.18.0.0/27 + var-hubnetwork-azfw-hubAzureFirewallSubnetAddressPrefix: 10.18.1.0/24 + var-hubnetwork-azfw-hubAzureFirewallManagementSubnetAddressPrefix: 10.18.2.0/26 + var-hubnetwork-azfw-hubBastionSubnetAddressPrefix: 192.168.0.0/24 + + var-hubnetwork-azfw-azureFirewallName: pubsecAzureFirewall + var-hubnetwork-azfw-azureFirewallZones: '["1", "2", "3"]' + var-hubnetwork-azfw-azureFirewallForcedTunnelingEnabled: false + var-hubnetwork-azfw-azureFirewallForcedTunnelingNextHop: 10.17.1.4 + + #################################################################################### + ### Hub Networking with Fortinet Firewalls ### + #################################################################################### + + ## Hub Networking - Core Virtual Network + var-hubnetwork-nva-rgHubName: pubsec-hub-networking-rg + var-hubnetwork-nva-hubVnetName: hub-vnet + var-hubnetwork-nva-hubVnetAddressPrefixRFC1918: 10.18.0.0/22 + var-hubnetwork-nva-hubVnetAddressPrefixRFC6598: 100.60.0.0/16 + var-hubnetwork-nva-hubVnetAddressPrefixBastion: 192.168.0.0/16 + + var-hubnetwork-nva-hubEanSubnetName: EanSubnet + var-hubnetwork-nva-hubEanSubnetAddressPrefix: 10.18.0.0/27 + + var-hubnetwork-nva-hubPublicSubnetName: PublicSubnet + var-hubnetwork-nva-hubPublicSubnetAddressPrefix: 100.60.0.0/24 + + var-hubnetwork-nva-hubPazSubnetName: PAZSubnet + var-hubnetwork-nva-hubPazSubnetAddressPrefix: 100.60.1.0/24 + + var-hubnetwork-nva-hubDevIntSubnetName: DevIntSubnet + var-hubnetwork-nva-hubDevIntSubnetAddressPrefix: 10.18.0.64/27 + + var-hubnetwork-nva-hubProdIntSubnetName: PrdIntSubnet + var-hubnetwork-nva-hubProdIntSubnetAddressPrefix: 10.18.0.32/27 + + var-hubnetwork-nva-hubMrzIntSubnetName: MrzSubnet + var-hubnetwork-nva-hubMrzIntSubnetAddressPrefix: 10.18.0.96/27 + + var-hubnetwork-nva-hubHASubnetName: HASubnet + var-hubnetwork-nva-hubHASubnetAddressPrefix: 10.18.0.128/28 + + var-hubnetwork-nva-hubGatewaySubnetPrefix: 10.18.1.0/27 + + var-hubnetwork-nva-hubBastionSubnetAddressPrefix: 192.168.0.0/24 + + ## Hub Networking - Firewall Virtual Appliances + var-hubnetwork-nva-deployFirewallVMs: false + var-hubnetwork-nva-useFortigateFW: false + + ### Hub Networking - Firewall Virtual Appliances - For Non-production Traffic + var-hubnetwork-nva-fwDevILBName: pubsecDevFWILB + var-hubnetwork-nva-fwDevVMSku: Standard_D8s_v4 + var-hubnetwork-nva-fwDevVM1Name: pubsecDevFW1 + var-hubnetwork-nva-fwDevVM2Name: pubsecDevFW2 + var-hubnetwork-nva-fwDevILBExternalFacingIP: 100.60.0.7 + var-hubnetwork-nva-fwDevVM1ExternalFacingIP: 100.60.0.8 + var-hubnetwork-nva-fwDevVM2ExternalFacingIP: 100.60.0.9 + var-hubnetwork-nva-fwDevVM1MrzIntIP: 10.18.0.104 + var-hubnetwork-nva-fwDevVM2MrzIntIP: 10.18.0.105 + var-hubnetwork-nva-fwDevILBDevIntIP: 10.18.0.68 + var-hubnetwork-nva-fwDevVM1DevIntIP: 10.18.0.69 + var-hubnetwork-nva-fwDevVM2DevIntIP: 10.18.0.70 + var-hubnetwork-nva-fwDevVM1HAIP: 10.18.0.134 + var-hubnetwork-nva-fwDevVM2HAIP: 10.18.0.135 + + ### Hub Networking - Firewall Virtual Appliances - For Production Traffic + var-hubnetwork-nva-fwProdILBName: pubsecProdFWILB + var-hubnetwork-nva-fwProdVMSku: Standard_F8s_v2 + var-hubnetwork-nva-fwProdVM1Name: pubsecProdFW1 + var-hubnetwork-nva-fwProdVM2Name: pubsecProdFW2 + var-hubnetwork-nva-fwProdILBExternalFacingIP: 100.60.0.4 + var-hubnetwork-nva-fwProdVM1ExternalFacingIP: 100.60.0.5 + var-hubnetwork-nva-fwProdVM2ExternalFacingIP: 100.60.0.6 + var-hubnetwork-nva-fwProdVM1MrzIntIP: 10.18.0.101 + var-hubnetwork-nva-fwProdVM2MrzIntIP: 10.18.0.102 + var-hubnetwork-nva-fwProdILBPrdIntIP: 10.18.0.36 + var-hubnetwork-nva-fwProdVM1PrdIntIP: 10.18.0.37 + var-hubnetwork-nva-fwProdVM2PrdIntIP: 10.18.0.38 + var-hubnetwork-nva-fwProdVM1HAIP: 10.18.0.132 + var-hubnetwork-nva-fwProdVM2HAIP: 10.18.0.133 \ No newline at end of file From 24942b74ef9f6d97ac7cc829a93082a6330a0ff8 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 07:48:11 -0500 Subject: [PATCH 5/8] Fix typo --- landingzones/lz-platform-connectivity-hub-nva/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landingzones/lz-platform-connectivity-hub-nva/main.bicep b/landingzones/lz-platform-connectivity-hub-nva/main.bicep index aaadf3bd..ba9eadd9 100644 --- a/landingzones/lz-platform-connectivity-hub-nva/main.bicep +++ b/landingzones/lz-platform-connectivity-hub-nva/main.bicep @@ -271,7 +271,7 @@ param hubBastionSubnetAddressPrefix string //= '192.168.0.0/24' @description('Boolean flag to determine whether virtual machines will be deployed, either Ubuntu (for internal testing) or Fortinet (for workloads). Default: true') param deployFirewallVMs bool = true -@description('Boolean flag to dtermine whether Fortinet firewalls will eb deployed. Default: true') +@description('Boolean flag to determine whether Fortinet firewalls will be deployed. Default: true') param useFortigateFW bool = true // Firewall Virtual Appliances - For Non-production Traffic From 0b84cab95d397763b144053113e19c029fd24b62 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 13:47:40 -0500 Subject: [PATCH 6/8] Remove branch configs --- ...c0_generic-subscription_canadacentral.json | 170 ----------- ...cbed91ab29a7_healthcare_canadacentral.json | 169 ----------- ...04f2c98_machinelearning_canadacentral.json | 200 ------------ ...1dd0e27_machinelearning_canadacentral.json | 204 ------------- ...5b60c30_machinelearning_canadacentral.json | 204 ------------- ...8a144aa_machinelearning_canadacentral.json | 205 ------------- config/variables/CanadaESLZ-cleanup.yml | 284 ------------------ 7 files changed, 1436 deletions(-) delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json delete mode 100644 config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json delete mode 100644 config/variables/CanadaESLZ-cleanup.yml diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json deleted file mode 100644 index fd52a386..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub1 ALZ action group", - "actionGroupShortName": "sub1-alert", - "alertRuleName": "Sub1 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - }, - { - "comments": "Custom Role: Landing Zone Application Owner", - "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "rgAutomation2022Q1", - "networking": "rgVnet2022Q1", - "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault2022Q1" - } - }, - "automation": { - "value": { - "name": "automation" - } - }, - "backupRecoveryVault":{ - "value": { - "enabled":true, - "name":"bkupvault" - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4" - } - }, - "network": { - "value": { - "deployVnet": true, - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.2.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.2.1.0/25", - "nsg": { - "enabled": true - }, - "udr": { - "enabled": true - } - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.2.2.0/25", - "nsg": { - "enabled": true - }, - "udr": { - "enabled": true - } - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.2.3.0/25", - "nsg": { - "enabled": true - }, - "udr": { - "enabled": true - } - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.2.4.0/25", - "nsg": { - "enabled": true - }, - "udr": { - "enabled": true - } - }, - "optional": [ - { - "comments": "App Service", - "name": "appservice", - "addressPrefix": "10.2.5.0/25", - "nsg": { - "enabled": false - }, - "udr": { - "enabled": false - }, - "delegations": { - "serviceName": "Microsoft.Web/serverFarms" - } - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json deleted file mode 100644 index c8ab1945..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub2 ALZ action group", - "actionGroupShortName": "sub2-alert", - "alertRuleName": "Sub2 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - }, - { - "comments": "Custom Role: Landing Zone Application Owner", - "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "health2022Q1Automation", - "compute": "health2022Q1Compute", - "monitor": "health2022Q1Monitor", - "networking": "health2022Q1Network", - "networkWatcher": "NetworkWatcherRG", - "security": "health2022Q1Security", - "storage": "health2022Q1Storage" - } - }, - "useCMK": { - "value": true - }, - "keyVault": { - "value": { - "secretExpiryInDays": 3650 - } - }, - "automation": { - "value": { - "name": "health2022Q1automation" - } - }, - "sqldb": { - "value": { - "enabled": true, - "sqlAuthenticationUsername": "azadmin", - "aadAuthenticationOnly":false - } - }, - "synapse": { - "value": { - "username": "azadmin" - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4", - "privateDnsManagedByHub": true, - "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", - "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" - } - }, - "network": { - "value": { - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "health2022Q1vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.5.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.5.1.0/25" - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.5.2.0/25" - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.5.3.0/25" - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.5.4.0/25" - }, - "databricksPublic": { - "comments": "Databricks Public Delegated Subnet", - "name": "databrickspublic", - "addressPrefix": "10.5.5.0/25" - }, - "databricksPrivate": { - "comments": "Databricks Private Delegated Subnet", - "name": "databricksprivate", - "addressPrefix": "10.5.6.0/25" - }, - "privateEndpoints": { - "comments": "Private Endpoints Subnet", - "name": "privateendpoints", - "addressPrefix": "10.5.7.0/25" - }, - "web": { - "comments": "Azure Web App Delegated Subnet", - "name": "webapp", - "addressPrefix": "10.5.8.0/25" - } - } - } - } - } -} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json deleted file mode 100644 index 6c01c3e7..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub5 ALZ action group", - "actionGroupShortName": "sub5-alert", - "alertRuleName": "Sub5 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "azmlsqlauth2022Q1Automation", - "compute": "azmlsqlauth2022Q1Compute", - "monitor": "azmlsqlauth2022Q1Monitor", - "networking": "azmlsqlauth2022Q1Network", - "networkWatcher": "NetworkWatcherRG", - "security": "azmlsqlauth2022Q1Security", - "storage": "azmlsqlauth2022Q1Storage" - } - }, - "useCMK": { - "value": false - }, - "automation": { - "value": { - "name": "azmlsqlauth2022Q1automation" - } - }, - "keyVault": { - "value": { - "secretExpiryInDays": 3650 - } - }, - "aks": { - "value": { - "version": "1.21.2", - "enabled": true, - "networkPlugin": "kubenet" , - "networkPolicy": "calico", - "podCidr": "11.0.0.0/16", - "serviceCidr": "20.0.0.0/16" , - "dnsServiceIP": "20.0.0.10", - "dockerBridgeCidr": "30.0.0.1/16" - } - }, - "appServiceLinuxContainer": { - "value": { - "enabled": true, - "skuName": "P1V2", - "skuTier": "Premium", - "enablePrivateEndpoint": true - } - }, - "sqldb": { - "value": { - "enabled": true, - "sqlAuthenticationUsername": "azadmin", - "aadAuthenticationOnly": false, - "aadLoginName":"DBA Security Group", - "aadLoginObjectID":"e0357d81-55d8-44e9-9d9c-ab09dc710785", - "aadLoginType":"Group" - } - }, - "sqlmi": { - "value": { - "enabled": false - } - }, - "aml": { - "value": { - "enableHbiWorkspace": false - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4", - "privateDnsManagedByHub": true, - "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", - "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" - } - }, - "network": { - "value": { - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "azmlsqlauth2022Q1vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.6.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.6.1.0/25" - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.6.2.0/25" - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.6.3.0/25" - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.6.4.0/25" - }, - "sqlmi": { - "comments": "SQL Managed Instances Delegated Subnet", - "name": "sqlmi", - "addressPrefix": "10.6.5.0/25" - }, - "databricksPublic": { - "comments": "Databricks Public Delegated Subnet", - "name": "databrickspublic", - "addressPrefix": "10.6.6.0/25" - }, - "databricksPrivate": { - "comments": "Databricks Private Delegated Subnet", - "name": "databricksprivate", - "addressPrefix": "10.6.7.0/25" - }, - "privateEndpoints": { - "comments": "Private Endpoints Subnet", - "name": "privateendpoints", - "addressPrefix": "10.6.8.0/25" - }, - "aks": { - "comments": "AKS Subnet", - "name": "aks", - "addressPrefix": "10.6.9.0/25" - }, - "appService": { - "comments": "App Service Subnet", - "name": "appService", - "addressPrefix": "10.6.10.0/25" - } - } - } - } - } -} diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json deleted file mode 100644 index c5981cf2..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub3 ALZ action group", - "actionGroupShortName": "sub3-alert", - "alertRuleName": "Sub3 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - }, - { - "comments": "Custom Role: Landing Zone Application Owner", - "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "azmlcmk2022Q1Automation", - "compute": "azmlcmk2022Q1Compute", - "monitor": "azmlcmk2022Q1Monitor", - "networking": "azmlcmk2022Q1Network", - "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk2022Q1Security", - "storage": "azmlcmk2022Q1Storage" - } - }, - "useCMK": { - "value": true - }, - "automation": { - "value": { - "name": "azmlcmk2022Q1automation" - } - }, - "keyVault": { - "value": { - "secretExpiryInDays": 3650 - } - }, - "aks": { - "value": { - "version": "1.21.2", - "enabled": true, - "networkPlugin": "kubenet" , - "networkPolicy": "calico", - "podCidr": "11.0.0.0/16", - "serviceCidr": "20.0.0.0/16" , - "dnsServiceIP": "20.0.0.10", - "dockerBridgeCidr": "30.0.0.1/16" - } - }, - "appServiceLinuxContainer": { - "value": { - "enabled": true, - "skuName": "P1V2", - "skuTier": "Premium", - "enablePrivateEndpoint": true - } - }, - "sqldb": { - "value": { - "enabled": true, - "sqlAuthenticationUsername": "azadmin", - "aadAuthenticationOnly":false - } - }, - "sqlmi": { - "value": { - "enabled": false - } - }, - "aml": { - "value": { - "enableHbiWorkspace": false - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4", - "privateDnsManagedByHub": true, - "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", - "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" - } - }, - "network": { - "value": { - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "azmlcmk2022Q1vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.1.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.1.1.0/25" - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.1.2.0/25" - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.1.3.0/25" - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.1.4.0/25" - }, - "sqlmi": { - "comments": "SQL Managed Instances Delegated Subnet", - "name": "sqlmi", - "addressPrefix": "10.1.5.0/25" - }, - "databricksPublic": { - "comments": "Databricks Public Delegated Subnet", - "name": "databrickspublic", - "addressPrefix": "10.1.6.0/25" - }, - "databricksPrivate": { - "comments": "Databricks Private Delegated Subnet", - "name": "databricksprivate", - "addressPrefix": "10.1.7.0/25" - }, - "privateEndpoints": { - "comments": "Private Endpoints Subnet", - "name": "privateendpoints", - "addressPrefix": "10.1.8.0/25" - }, - "aks": { - "comments": "AKS Subnet", - "name": "aks", - "addressPrefix": "10.1.9.0/25" - }, - "appService": { - "comments": "App Service Subnet", - "name": "appService", - "addressPrefix": "10.1.10.0/25" - } - } - } - } - } -} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json deleted file mode 100644 index 3f6e4cc9..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub4 ALZ action group", - "actionGroupShortName": "sub4-alert", - "alertRuleName": "Sub4 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - }, - { - "comments": "Custom Role: Landing Zone Application Owner", - "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "azmlnocmk2022Q1Automation", - "compute": "azmlnocmk2022Q1Compute", - "monitor": "azmlnocmk2022Q1Monitor", - "networking": "azmlnocmk2022Q1Network", - "networkWatcher": "NetworkWatcherRG", - "security": "azmlnocmk2022Q1Security", - "storage": "azmlnocmk2022Q1Storage" - } - }, - "useCMK": { - "value": false - }, - "automation": { - "value": { - "name": "azmlnocmk2022Q1automation" - } - }, - "keyVault": { - "value": { - "secretExpiryInDays": 3650 - } - }, - "aks": { - "value": { - "version": "1.21.2", - "enabled": true, - "networkPlugin": "kubenet" , - "networkPolicy": "calico", - "podCidr": "11.0.0.0/16", - "serviceCidr": "20.0.0.0/16" , - "dnsServiceIP": "20.0.0.10", - "dockerBridgeCidr": "30.0.0.1/16" - } - }, - "appServiceLinuxContainer": { - "value": { - "enabled": true, - "skuName": "P1V2", - "skuTier": "Premium", - "enablePrivateEndpoint": true - } - }, - "sqldb": { - "value": { - "enabled": true, - "sqlAuthenticationUsername": "azadmin", - "aadAuthenticationOnly":false - } - }, - "sqlmi": { - "value": { - "enabled": false - } - }, - "aml": { - "value": { - "enableHbiWorkspace": false - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4", - "privateDnsManagedByHub": true, - "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", - "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" - } - }, - "network": { - "value": { - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "azmlnocmk2022Q1vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.3.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.3.1.0/25" - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.3.2.0/25" - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.3.3.0/25" - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.3.4.0/25" - }, - "sqlmi": { - "comments": "SQL Managed Instances Delegated Subnet", - "name": "sqlmi", - "addressPrefix": "10.3.5.0/25" - }, - "databricksPublic": { - "comments": "Databricks Public Delegated Subnet", - "name": "databrickspublic", - "addressPrefix": "10.3.6.0/25" - }, - "databricksPrivate": { - "comments": "Databricks Private Delegated Subnet", - "name": "databricksprivate", - "addressPrefix": "10.3.7.0/25" - }, - "privateEndpoints": { - "comments": "Private Endpoints Subnet", - "name": "privateendpoints", - "addressPrefix": "10.3.8.0/25" - }, - "aks": { - "comments": "AKS Subnet", - "name": "aks", - "addressPrefix": "10.3.9.0/25" - }, - "appService": { - "comments": "App Service Subnet", - "name": "appService", - "addressPrefix": "10.3.10.0/25" - } - } - } - } - } -} \ No newline at end of file diff --git a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json b/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json deleted file mode 100644 index f3ca7fed..00000000 --- a/config/subscriptions/CanadaESLZ-cleanup/pubsec/LandingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "serviceHealthAlerts": { - "value": { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ], - "voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ] - }, - "actionGroupName": "Sub5 ALZ action group", - "actionGroupShortName": "sub5-alert", - "alertRuleName": "Sub5 ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - }, - "securityCenter": { - "value": { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - }, - "subscriptionRoleAssignments": { - "value": [ - { - "comments": "Built-in Role: Contributor", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - }, - { - "comments": "Custom Role: Landing Zone Application Owner", - "roleDefinitionId": "b4c87314-c1a1-5320-9c43-779585186bcc", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - }, - "subscriptionBudget": { - "value": { - "createBudget": false - } - }, - "subscriptionTags": { - "value": { - "ISSO": "isso-tag" - } - }, - "resourceTags": { - "value": { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - }, - "resourceGroups": { - "value": { - "automation": "azmlcmksqlmi2022Q1Automation", - "compute": "azmlcmksqlmi2022Q1Compute", - "monitor": "azmlcmksqlmi2022Q1Monitor", - "networking": "azmlcmksqlmi2022Q1Network", - "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmksqlmi2022Q1Security", - "storage": "azmlcmksqlmi2022Q1Storage" - } - }, - "useCMK": { - "value": true - }, - "automation": { - "value": { - "name": "azmlcmksqlmi2022Q1automation" - } - }, - "keyVault": { - "value": { - "secretExpiryInDays": 3650 - } - }, - "aks": { - "value": { - "version": "1.21.2", - "enabled": true, - "networkPlugin": "kubenet" , - "networkPolicy": "calico", - "podCidr": "11.0.0.0/16", - "serviceCidr": "20.0.0.0/16" , - "dnsServiceIP": "20.0.0.10", - "dockerBridgeCidr": "30.0.0.1/16" - } - }, - "appServiceLinuxContainer": { - "value": { - "enabled": true, - "skuName": "P1V2", - "skuTier": "Premium", - "enablePrivateEndpoint": true - } - }, - "sqldb": { - "value": { - "enabled": true, - "sqlAuthenticationUsername": "azadmin", - "aadAuthenticationOnly":false - } - }, - "sqlmi": { - "value": { - "enabled": true, - "username": "azadmin" - } - }, - "aml": { - "value": { - "enableHbiWorkspace": false - } - }, - "hubNetwork": { - "value": { - "virtualNetworkId": "/subscriptions/ed7f4eed-9010-4227-b115-2a5e37728f27/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet", - "rfc1918IPRange": "10.18.0.0/22", - "rfc6598IPRange": "100.60.0.0/16", - "egressVirtualApplianceIp": "10.18.1.4", - "privateDnsManagedByHub": true, - "privateDnsManagedByHubSubscriptionId": "ed7f4eed-9010-4227-b115-2a5e37728f27", - "privateDnsManagedByHubResourceGroupName": "pubsec-dns-rg" - } - }, - "network": { - "value": { - "peerToHubVirtualNetwork": true, - "useRemoteGateway": false, - "name": "azmlcmksqlmi2022Q1vnet", - "dnsServers": [ - "10.18.1.4" - ], - "addressPrefixes": [ - "10.4.0.0/16" - ], - "subnets": { - "oz": { - "comments": "Foundational Elements Zone (OZ)", - "name": "oz", - "addressPrefix": "10.4.1.0/25" - }, - "paz": { - "comments": "Presentation Zone (PAZ)", - "name": "paz", - "addressPrefix": "10.4.2.0/25" - }, - "rz": { - "comments": "Application Zone (RZ)", - "name": "rz", - "addressPrefix": "10.4.3.0/25" - }, - "hrz": { - "comments": "Data Zone (HRZ)", - "name": "hrz", - "addressPrefix": "10.4.4.0/25" - }, - "sqlmi": { - "comments": "SQL Managed Instances Delegated Subnet", - "name": "sqlmi", - "addressPrefix": "10.4.5.0/25" - }, - "databricksPublic": { - "comments": "Databricks Public Delegated Subnet", - "name": "databrickspublic", - "addressPrefix": "10.4.6.0/25" - }, - "databricksPrivate": { - "comments": "Databricks Private Delegated Subnet", - "name": "databricksprivate", - "addressPrefix": "10.4.7.0/25" - }, - "privateEndpoints": { - "comments": "Private Endpoints Subnet", - "name": "privateendpoints", - "addressPrefix": "10.4.8.0/25" - }, - "aks": { - "comments": "AKS Subnet", - "name": "aks", - "addressPrefix": "10.4.9.0/25" - }, - "appService": { - "comments": "App Service Subnet", - "name": "appService", - "addressPrefix": "10.4.10.0/25" - } - } - } - } - } -} \ No newline at end of file diff --git a/config/variables/CanadaESLZ-cleanup.yml b/config/variables/CanadaESLZ-cleanup.yml deleted file mode 100644 index fa06e803..00000000 --- a/config/variables/CanadaESLZ-cleanup.yml +++ /dev/null @@ -1,284 +0,0 @@ -# ---------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT license. -# -# THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -# ---------------------------------------------------------------------------------- - -# Environment YAML files can be used to supplement -# the variables specified in 'config/variables/common.yml'. You can: -# * Override existing common-vars.yml variable value settings, and -# * Create new variable values not present in common-vars.yml -# -# The naming convention for these YAML files is: -# {organization}-{branch}.yml -# -# where {organization} is the organization variable from the -# common.yml file -# and {branch} is the Azure Repos branch name used by the -# currently executing pipeline. - -variables: - # Management Groups - var-parentManagementGroupId: 343ddfdb-bef5-46d9-99cf-ed67d5948783 - var-topLevelManagementGroupName: pubsec - - # Logging - var-logging-managementGroupId: pubsecPlatformManagement - var-logging-subscriptionId: bc0a4f9f-07fa-4284-b1bd-fbad38578d3a - var-logging-logAnalyticsResourceGroupName: pubsec-central-logging-rg - var-logging-logAnalyticsWorkspaceName: log-analytics-workspace - var-logging-logAnalyticsRetentionInDays: 730 - var-logging-logAnalyticsAutomationAccountName: automation-account - var-logging-diagnosticSettingsforNetworkSecurityGroupsStoragePrefix: pubsecnsg - var-logging-serviceHealthAlerts: > - { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ - { "countryCode": "1", "phoneNumber": "5555555555" } - ], - "voice": [ - { "countryCode": "1", "phoneNumber": "5555555555" } - ] - }, - "actionGroupName": "ALZ action group", - "actionGroupShortName": "alz-alert", - "alertRuleName": "ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - var-logging-securityCenter: > - { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - var-logging-subscriptionRoleAssignments: > - [ - { - "comments": "Built-in Contributor Role", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - var-logging-subscriptionBudget: > - { - "createBudget": false, - "name": "MonthlySubscriptionBudget", - "amount": 1000, - "timeGrain": "Monthly", - "contactEmails": [ "alzcanadapubsec@microsoft.com" ] - } - var-logging-subscriptionTags: > - { - "ISSO": "isso-tbd" - } - var-logging-resourceTags: > - { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - - # Hub Networking - var-hubnetwork-managementGroupId: pubsecPlatformConnectivity - var-hubnetwork-subscriptionId: ed7f4eed-9010-4227-b115-2a5e37728f27 - var-hubnetwork-serviceHealthAlerts: > - { - "resourceGroupName": "pubsec-service-health", - "incidentTypes": [ "Incident", "Security" ], - "regions": [ "Global", "Canada East", "Canada Central" ], - "receivers": { - "app": [ "alzcanadapubsec@microsoft.com" ], - "email": [ "alzcanadapubsec@microsoft.com" ], - "sms": [ - { "countryCode": "1", "phoneNumber": "5555555555" } - ], - "voice": [ - { "countryCode": "1", "phoneNumber": "5555555555" } - ] - }, - "actionGroupName": "ALZ action group", - "actionGroupShortName": "alz-alert", - "alertRuleName": "ALZ alert rule", - "alertRuleDescription": "Alert rule for Azure Landing Zone" - } - var-hubnetwork-securityCenter: > - { - "email": "alzcanadapubsec@microsoft.com", - "phone": "5555555555" - } - var-hubnetwork-subscriptionRoleAssignments: > - [ - { - "comments": "Built-in Contributor Role", - "roleDefinitionId": "b24988ac-6180-42a0-ab88-20f7382dd24c", - "securityGroupObjectIds": [ - "38f33f7e-a471-4630-8ce9-c6653495a2ee" - ] - } - ] - var-hubnetwork-subscriptionBudget: > - { - "createBudget": false, - "name": "MonthlySubscriptionBudget", - "amount": 1000, - "timeGrain": "Monthly", - "contactEmails": [ "alzcanadapubsec@microsoft.com" ] - } - var-hubnetwork-subscriptionTags: > - { - "ISSO": "isso-tbd" - } - var-hubnetwork-resourceTags: > - { - "ClientOrganization": "client-organization-tag", - "CostCenter": "cost-center-tag", - "DataSensitivity": "data-sensitivity-tag", - "ProjectContact": "project-contact-tag", - "ProjectName": "project-name-tag", - "TechnicalContact": "technical-contact-tag" - } - - ## Hub Networking - Private Dns Zones - var-hubnetwork-deployPrivateDnsZones: true - var-hubnetwork-rgPrivateDnsZonesName: pubsec-dns-rg - - ## Hub Networking - DDOS - var-hubnetwork-deployDdosStandard: false - var-hubnetwork-rgDdosName: pubsec-ddos-rg - var-hubnetwork-ddosPlanName: ddos-plan - - ## Hub Networking - Public Zone - var-hubnetwork-rgPazName: pubsec-public-access-zone-rg - - ## Hub Networking - Management Restricted Zone Virtual Network - var-hubnetwork-rgMrzName: pubsec-management-restricted-zone-rg - var-hubnetwork-mrzVnetName: management-restricted-vnet - var-hubnetwork-mrzVnetAddressPrefixRFC1918: 10.18.4.0/22 - - var-hubnetwork-mrzMazSubnetName: MazSubnet - var-hubnetwork-mrzMazSubnetAddressPrefix: 10.18.4.0/25 - - var-hubnetwork-mrzInfSubnetName: InfSubnet - var-hubnetwork-mrzInfSubnetAddressPrefix: 10.18.4.128/25 - - var-hubnetwork-mrzSecSubnetName: SecSubnet - var-hubnetwork-mrzSecSubnetAddressPrefix: 10.18.5.0/26 - - var-hubnetwork-mrzLogSubnetName: LogSubnet - var-hubnetwork-mrzLogSubnetAddressPrefix: 10.18.5.64/26 - - var-hubnetwork-mrzMgmtSubnetName: MgmtSubnet - var-hubnetwork-mrzMgmtSubnetAddressPrefix: 10.18.5.128/26 - - var-hubnetwork-bastionName: bastion - var-hubnetwork-bastionSku: Standard - var-hubnetwork-bastionScaleUnits: 2 - - #################################################################################### - ### Hub Networking with Azure Firewall ### - #################################################################################### - var-hubnetwork-azfw-rgPolicyName: pubsec-azure-firewall-policy-rg - var-hubnetwork-azfw-policyName: pubsecAzureFirewallPolicy - - var-hubnetwork-azfw-rgHubName: pubsec-hub-networking-rg - var-hubnetwork-azfw-hubVnetName: hub-vnet - var-hubnetwork-azfw-hubVnetAddressPrefixRFC1918: 10.18.0.0/22 - var-hubnetwork-azfw-hubVnetAddressPrefixRFC6598: 100.60.0.0/16 - var-hubnetwork-azfw-hubVnetAddressPrefixBastion: 192.168.0.0/16 - - var-hubnetwork-azfw-hubPazSubnetName: PAZSubnet - var-hubnetwork-azfw-hubPazSubnetAddressPrefix: 100.60.1.0/24 - - var-hubnetwork-azfw-hubGatewaySubnetPrefix: 10.18.0.0/27 - var-hubnetwork-azfw-hubAzureFirewallSubnetAddressPrefix: 10.18.1.0/24 - var-hubnetwork-azfw-hubAzureFirewallManagementSubnetAddressPrefix: 10.18.2.0/26 - var-hubnetwork-azfw-hubBastionSubnetAddressPrefix: 192.168.0.0/24 - - var-hubnetwork-azfw-azureFirewallName: pubsecAzureFirewall - var-hubnetwork-azfw-azureFirewallZones: '["1", "2", "3"]' - var-hubnetwork-azfw-azureFirewallForcedTunnelingEnabled: false - var-hubnetwork-azfw-azureFirewallForcedTunnelingNextHop: 10.17.1.4 - - #################################################################################### - ### Hub Networking with Fortinet Firewalls ### - #################################################################################### - - ## Hub Networking - Core Virtual Network - var-hubnetwork-nva-rgHubName: pubsec-hub-networking-rg - var-hubnetwork-nva-hubVnetName: hub-vnet - var-hubnetwork-nva-hubVnetAddressPrefixRFC1918: 10.18.0.0/22 - var-hubnetwork-nva-hubVnetAddressPrefixRFC6598: 100.60.0.0/16 - var-hubnetwork-nva-hubVnetAddressPrefixBastion: 192.168.0.0/16 - - var-hubnetwork-nva-hubEanSubnetName: EanSubnet - var-hubnetwork-nva-hubEanSubnetAddressPrefix: 10.18.0.0/27 - - var-hubnetwork-nva-hubPublicSubnetName: PublicSubnet - var-hubnetwork-nva-hubPublicSubnetAddressPrefix: 100.60.0.0/24 - - var-hubnetwork-nva-hubPazSubnetName: PAZSubnet - var-hubnetwork-nva-hubPazSubnetAddressPrefix: 100.60.1.0/24 - - var-hubnetwork-nva-hubDevIntSubnetName: DevIntSubnet - var-hubnetwork-nva-hubDevIntSubnetAddressPrefix: 10.18.0.64/27 - - var-hubnetwork-nva-hubProdIntSubnetName: PrdIntSubnet - var-hubnetwork-nva-hubProdIntSubnetAddressPrefix: 10.18.0.32/27 - - var-hubnetwork-nva-hubMrzIntSubnetName: MrzSubnet - var-hubnetwork-nva-hubMrzIntSubnetAddressPrefix: 10.18.0.96/27 - - var-hubnetwork-nva-hubHASubnetName: HASubnet - var-hubnetwork-nva-hubHASubnetAddressPrefix: 10.18.0.128/28 - - var-hubnetwork-nva-hubGatewaySubnetPrefix: 10.18.1.0/27 - - var-hubnetwork-nva-hubBastionSubnetAddressPrefix: 192.168.0.0/24 - - ## Hub Networking - Firewall Virtual Appliances - var-hubnetwork-nva-deployFirewallVMs: false - var-hubnetwork-nva-useFortigateFW: false - - ### Hub Networking - Firewall Virtual Appliances - For Non-production Traffic - var-hubnetwork-nva-fwDevILBName: pubsecDevFWILB - var-hubnetwork-nva-fwDevVMSku: Standard_D8s_v4 - var-hubnetwork-nva-fwDevVM1Name: pubsecDevFW1 - var-hubnetwork-nva-fwDevVM2Name: pubsecDevFW2 - var-hubnetwork-nva-fwDevILBExternalFacingIP: 100.60.0.7 - var-hubnetwork-nva-fwDevVM1ExternalFacingIP: 100.60.0.8 - var-hubnetwork-nva-fwDevVM2ExternalFacingIP: 100.60.0.9 - var-hubnetwork-nva-fwDevVM1MrzIntIP: 10.18.0.104 - var-hubnetwork-nva-fwDevVM2MrzIntIP: 10.18.0.105 - var-hubnetwork-nva-fwDevILBDevIntIP: 10.18.0.68 - var-hubnetwork-nva-fwDevVM1DevIntIP: 10.18.0.69 - var-hubnetwork-nva-fwDevVM2DevIntIP: 10.18.0.70 - var-hubnetwork-nva-fwDevVM1HAIP: 10.18.0.134 - var-hubnetwork-nva-fwDevVM2HAIP: 10.18.0.135 - - ### Hub Networking - Firewall Virtual Appliances - For Production Traffic - var-hubnetwork-nva-fwProdILBName: pubsecProdFWILB - var-hubnetwork-nva-fwProdVMSku: Standard_F8s_v2 - var-hubnetwork-nva-fwProdVM1Name: pubsecProdFW1 - var-hubnetwork-nva-fwProdVM2Name: pubsecProdFW2 - var-hubnetwork-nva-fwProdILBExternalFacingIP: 100.60.0.4 - var-hubnetwork-nva-fwProdVM1ExternalFacingIP: 100.60.0.5 - var-hubnetwork-nva-fwProdVM2ExternalFacingIP: 100.60.0.6 - var-hubnetwork-nva-fwProdVM1MrzIntIP: 10.18.0.101 - var-hubnetwork-nva-fwProdVM2MrzIntIP: 10.18.0.102 - var-hubnetwork-nva-fwProdILBPrdIntIP: 10.18.0.36 - var-hubnetwork-nva-fwProdVM1PrdIntIP: 10.18.0.37 - var-hubnetwork-nva-fwProdVM2PrdIntIP: 10.18.0.38 - var-hubnetwork-nva-fwProdVM1HAIP: 10.18.0.132 - var-hubnetwork-nva-fwProdVM2HAIP: 10.18.0.133 \ No newline at end of file From cc0b54d2d54f4785512a3f0a1b61229fe8c3faf8 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 16:36:20 -0500 Subject: [PATCH 7/8] Remove timestamp from sample JSON templates. Timestamps are kept for E2E testing. --- ...ca842_generic-subscription_canadacentral.json | 2 +- docs/archetypes/generic-subscription.md | 6 +++--- .../BackupRecoveryVaultIsFalse.json | 6 +++--- .../BackupRecoveryVaultIsTrue.json | 6 +++--- .../lz-generic-subscription/BudgetIsFalse.json | 6 +++--- .../lz-generic-subscription/BudgetIsTrue.json | 6 +++--- .../EmptyResourceTags.json | 6 +++--- .../EmptySubscriptionTags.json | 6 +++--- .../FullDeployment-With-Hub.json | 2 +- .../FullDeployment-Without-Hub.json | 6 +++--- .../WithOptionalSubnets.json | 6 +++--- .../WithoutCustomDNS.json | 6 +++--- .../WithoutOptionalSubnets.json | 6 +++--- tests/schemas/lz-healthcare/BudgetIsFalse.json | 16 ++++++++-------- tests/schemas/lz-healthcare/BudgetIsTrue.json | 16 ++++++++-------- .../schemas/lz-healthcare/EmptyResourceTags.json | 16 ++++++++-------- .../lz-healthcare/EmptySubscriptionTags.json | 16 ++++++++-------- .../lz-healthcare/FullDeployment-With-Hub.json | 16 ++++++++-------- .../FullDeployment-Without-Hub.json | 16 ++++++++-------- .../schemas/lz-healthcare/SQLDB-aadAuthOnly.json | 16 ++++++++-------- tests/schemas/lz-healthcare/SQLDB-mixedAuth.json | 16 ++++++++-------- tests/schemas/lz-healthcare/SQLDB-sqlAuth.json | 16 ++++++++-------- tests/schemas/lz-healthcare/SQLDBIsFalse.json | 16 ++++++++-------- tests/schemas/lz-healthcare/WithoutCMK.json | 16 ++++++++-------- .../lz-machinelearning/AKS-AzureCNI-AzureNP.json | 16 ++++++++-------- .../lz-machinelearning/AKS-AzureCNI-Calico.json | 16 ++++++++-------- .../lz-machinelearning/AKS-Kubenet-Calico.json | 16 ++++++++-------- tests/schemas/lz-machinelearning/AKSIsFalse.json | 16 ++++++++-------- .../AppServiceLinuxContainerIsFalse.json | 16 ++++++++-------- ...viceLinuxContainerPrivateEndpointIsFalse.json | 16 ++++++++-------- .../lz-machinelearning/BudgetIsFalse.json | 16 ++++++++-------- .../schemas/lz-machinelearning/BudgetIsTrue.json | 16 ++++++++-------- .../lz-machinelearning/EmptyResourceTags.json | 16 ++++++++-------- .../EmptySubscriptionTags.json | 16 ++++++++-------- .../FullDeployment-With-Hub.json | 16 ++++++++-------- .../FullDeployment-Without-Hub.json | 16 ++++++++-------- .../lz-machinelearning/SQLDB-aadAuthOnly.json | 16 ++++++++-------- .../lz-machinelearning/SQLDB-mixedAuth.json | 16 ++++++++-------- .../lz-machinelearning/SQLDB-sqlAuth.json | 16 ++++++++-------- .../schemas/lz-machinelearning/SQLDBIsFalse.json | 16 ++++++++-------- .../schemas/lz-machinelearning/SQLMIIsFalse.json | 16 ++++++++-------- tests/schemas/lz-machinelearning/WithoutCMK.json | 16 ++++++++-------- 42 files changed, 267 insertions(+), 267 deletions(-) diff --git a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json index c8d81b93..4c014141 100644 --- a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json +++ b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json @@ -68,7 +68,7 @@ "automation": "rgAutomation", "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/docs/archetypes/generic-subscription.md b/docs/archetypes/generic-subscription.md index ded6b4d1..c86dfbbf 100644 --- a/docs/archetypes/generic-subscription.md +++ b/docs/archetypes/generic-subscription.md @@ -204,10 +204,10 @@ This example configures: }, "resourceGroups": { "value": { - "automation": "rgAutomation092021W3", - "networking": "rgVnet092021W3", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json index 9ad24a06..79750b77 100644 --- a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json +++ b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json index a645140a..90cf50e8 100644 --- a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json +++ b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsFalse.json b/tests/schemas/lz-generic-subscription/BudgetIsFalse.json index a645140a..90cf50e8 100644 --- a/tests/schemas/lz-generic-subscription/BudgetIsFalse.json +++ b/tests/schemas/lz-generic-subscription/BudgetIsFalse.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsTrue.json b/tests/schemas/lz-generic-subscription/BudgetIsTrue.json index c8a62236..b00ed7d5 100644 --- a/tests/schemas/lz-generic-subscription/BudgetIsTrue.json +++ b/tests/schemas/lz-generic-subscription/BudgetIsTrue.json @@ -92,10 +92,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptyResourceTags.json b/tests/schemas/lz-generic-subscription/EmptyResourceTags.json index b740a2c8..58084f78 100644 --- a/tests/schemas/lz-generic-subscription/EmptyResourceTags.json +++ b/tests/schemas/lz-generic-subscription/EmptyResourceTags.json @@ -79,10 +79,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json b/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json index a9f7debf..c8014a4d 100644 --- a/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json +++ b/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json @@ -90,10 +90,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json b/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json index 2fbc5038..84453bfc 100644 --- a/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json +++ b/tests/schemas/lz-generic-subscription/FullDeployment-With-Hub.json @@ -95,7 +95,7 @@ "automation": "rgAutomation092021W3", "networking": "rgVnet092021W3", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json b/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json index da6fef71..688c2418 100644 --- a/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json +++ b/tests/schemas/lz-generic-subscription/FullDeployment-Without-Hub.json @@ -92,10 +92,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json index a645140a..90cf50e8 100644 --- a/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json +++ b/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json b/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json index 4d520aa2..86f302b1 100644 --- a/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json +++ b/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json index d87d3c4f..cda76b16 100644 --- a/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json +++ b/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json @@ -86,10 +86,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation", + "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-healthcare/BudgetIsFalse.json b/tests/schemas/lz-healthcare/BudgetIsFalse.json index 0fbb5de2..b5f6c4c6 100644 --- a/tests/schemas/lz-healthcare/BudgetIsFalse.json +++ b/tests/schemas/lz-healthcare/BudgetIsFalse.json @@ -86,13 +86,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -105,7 +105,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -135,7 +135,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/BudgetIsTrue.json b/tests/schemas/lz-healthcare/BudgetIsTrue.json index 911adc11..623429db 100644 --- a/tests/schemas/lz-healthcare/BudgetIsTrue.json +++ b/tests/schemas/lz-healthcare/BudgetIsTrue.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -141,7 +141,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/EmptyResourceTags.json b/tests/schemas/lz-healthcare/EmptyResourceTags.json index 2d8e8020..6ef02aea 100644 --- a/tests/schemas/lz-healthcare/EmptyResourceTags.json +++ b/tests/schemas/lz-healthcare/EmptyResourceTags.json @@ -85,13 +85,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -104,7 +104,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -136,7 +136,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/EmptySubscriptionTags.json b/tests/schemas/lz-healthcare/EmptySubscriptionTags.json index fcc80700..f6464d69 100644 --- a/tests/schemas/lz-healthcare/EmptySubscriptionTags.json +++ b/tests/schemas/lz-healthcare/EmptySubscriptionTags.json @@ -90,13 +90,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -109,7 +109,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -141,7 +141,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/FullDeployment-With-Hub.json b/tests/schemas/lz-healthcare/FullDeployment-With-Hub.json index 5aac20be..9d855789 100644 --- a/tests/schemas/lz-healthcare/FullDeployment-With-Hub.json +++ b/tests/schemas/lz-healthcare/FullDeployment-With-Hub.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -143,7 +143,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/FullDeployment-Without-Hub.json b/tests/schemas/lz-healthcare/FullDeployment-Without-Hub.json index 1ed36219..05a1283b 100644 --- a/tests/schemas/lz-healthcare/FullDeployment-Without-Hub.json +++ b/tests/schemas/lz-healthcare/FullDeployment-Without-Hub.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -143,7 +143,7 @@ "value": { "peerToHubVirtualNetwork": false, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/SQLDB-aadAuthOnly.json b/tests/schemas/lz-healthcare/SQLDB-aadAuthOnly.json index 5aac20be..9d855789 100644 --- a/tests/schemas/lz-healthcare/SQLDB-aadAuthOnly.json +++ b/tests/schemas/lz-healthcare/SQLDB-aadAuthOnly.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -143,7 +143,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/SQLDB-mixedAuth.json b/tests/schemas/lz-healthcare/SQLDB-mixedAuth.json index 4469aad1..46e4cc15 100644 --- a/tests/schemas/lz-healthcare/SQLDB-mixedAuth.json +++ b/tests/schemas/lz-healthcare/SQLDB-mixedAuth.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -144,7 +144,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/SQLDB-sqlAuth.json b/tests/schemas/lz-healthcare/SQLDB-sqlAuth.json index 911adc11..623429db 100644 --- a/tests/schemas/lz-healthcare/SQLDB-sqlAuth.json +++ b/tests/schemas/lz-healthcare/SQLDB-sqlAuth.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -141,7 +141,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/SQLDBIsFalse.json b/tests/schemas/lz-healthcare/SQLDBIsFalse.json index e0c9d26a..1a2ad8a4 100644 --- a/tests/schemas/lz-healthcare/SQLDBIsFalse.json +++ b/tests/schemas/lz-healthcare/SQLDBIsFalse.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -139,7 +139,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-healthcare/WithoutCMK.json b/tests/schemas/lz-healthcare/WithoutCMK.json index 1447b15f..4c144eeb 100644 --- a/tests/schemas/lz-healthcare/WithoutCMK.json +++ b/tests/schemas/lz-healthcare/WithoutCMK.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "health102021W1Automation", - "compute": "health102021W1Compute", - "monitor": "health102021W1Monitor", - "networking": "health102021W1Network", + "automation": "healthAutomation", + "compute": "healthCompute", + "monitor": "healthMonitor", + "networking": "healthNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "health102021W1Security", - "storage": "health102021W1Storage" + "security": "healthSecurity", + "storage": "healthStorage" } }, "useCMK": { @@ -111,7 +111,7 @@ }, "automation": { "value": { - "name": "health102021W1automation" + "name": "healthautomation" } }, "sqldb": { @@ -143,7 +143,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "health102021W1vnet", + "name": "healthvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AKS-AzureCNI-AzureNP.json b/tests/schemas/lz-machinelearning/AKS-AzureCNI-AzureNP.json index f1ee5e3e..17af026b 100644 --- a/tests/schemas/lz-machinelearning/AKS-AzureCNI-AzureNP.json +++ b/tests/schemas/lz-machinelearning/AKS-AzureCNI-AzureNP.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -171,7 +171,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AKS-AzureCNI-Calico.json b/tests/schemas/lz-machinelearning/AKS-AzureCNI-Calico.json index dec62141..864fa9e3 100644 --- a/tests/schemas/lz-machinelearning/AKS-AzureCNI-Calico.json +++ b/tests/schemas/lz-machinelearning/AKS-AzureCNI-Calico.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -171,7 +171,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AKS-Kubenet-Calico.json b/tests/schemas/lz-machinelearning/AKS-Kubenet-Calico.json index 81f05b7d..66902bfa 100644 --- a/tests/schemas/lz-machinelearning/AKS-Kubenet-Calico.json +++ b/tests/schemas/lz-machinelearning/AKS-Kubenet-Calico.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -171,7 +171,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AKSIsFalse.json b/tests/schemas/lz-machinelearning/AKSIsFalse.json index 42015a95..b511a67f 100644 --- a/tests/schemas/lz-machinelearning/AKSIsFalse.json +++ b/tests/schemas/lz-machinelearning/AKSIsFalse.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -164,7 +164,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AppServiceLinuxContainerIsFalse.json b/tests/schemas/lz-machinelearning/AppServiceLinuxContainerIsFalse.json index 418c3162..f1128703 100644 --- a/tests/schemas/lz-machinelearning/AppServiceLinuxContainerIsFalse.json +++ b/tests/schemas/lz-machinelearning/AppServiceLinuxContainerIsFalse.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -168,7 +168,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/AppServiceLinuxContainerPrivateEndpointIsFalse.json b/tests/schemas/lz-machinelearning/AppServiceLinuxContainerPrivateEndpointIsFalse.json index 3b3f069d..dba7ccb6 100644 --- a/tests/schemas/lz-machinelearning/AppServiceLinuxContainerPrivateEndpointIsFalse.json +++ b/tests/schemas/lz-machinelearning/AppServiceLinuxContainerPrivateEndpointIsFalse.json @@ -93,13 +93,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -107,7 +107,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -171,7 +171,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/BudgetIsFalse.json b/tests/schemas/lz-machinelearning/BudgetIsFalse.json index 57932000..17b71428 100644 --- a/tests/schemas/lz-machinelearning/BudgetIsFalse.json +++ b/tests/schemas/lz-machinelearning/BudgetIsFalse.json @@ -86,13 +86,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -100,7 +100,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -161,7 +161,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/BudgetIsTrue.json b/tests/schemas/lz-machinelearning/BudgetIsTrue.json index 3c149380..1e370139 100644 --- a/tests/schemas/lz-machinelearning/BudgetIsTrue.json +++ b/tests/schemas/lz-machinelearning/BudgetIsTrue.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -167,7 +167,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/EmptyResourceTags.json b/tests/schemas/lz-machinelearning/EmptyResourceTags.json index 8a7ea0cf..b95932f6 100644 --- a/tests/schemas/lz-machinelearning/EmptyResourceTags.json +++ b/tests/schemas/lz-machinelearning/EmptyResourceTags.json @@ -85,13 +85,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -99,7 +99,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -160,7 +160,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/EmptySubscriptionTags.json b/tests/schemas/lz-machinelearning/EmptySubscriptionTags.json index a8baab4d..bd05a3e5 100644 --- a/tests/schemas/lz-machinelearning/EmptySubscriptionTags.json +++ b/tests/schemas/lz-machinelearning/EmptySubscriptionTags.json @@ -90,13 +90,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -104,7 +104,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -165,7 +165,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/FullDeployment-With-Hub.json b/tests/schemas/lz-machinelearning/FullDeployment-With-Hub.json index 156c7b51..bc83d809 100644 --- a/tests/schemas/lz-machinelearning/FullDeployment-With-Hub.json +++ b/tests/schemas/lz-machinelearning/FullDeployment-With-Hub.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -169,7 +169,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/FullDeployment-Without-Hub.json b/tests/schemas/lz-machinelearning/FullDeployment-Without-Hub.json index 945e45fa..c89e4fbc 100644 --- a/tests/schemas/lz-machinelearning/FullDeployment-Without-Hub.json +++ b/tests/schemas/lz-machinelearning/FullDeployment-Without-Hub.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -169,7 +169,7 @@ "value": { "peerToHubVirtualNetwork": false, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [], "addressPrefixes": [ "10.1.0.0/16" diff --git a/tests/schemas/lz-machinelearning/SQLDB-aadAuthOnly.json b/tests/schemas/lz-machinelearning/SQLDB-aadAuthOnly.json index 156c7b51..bc83d809 100644 --- a/tests/schemas/lz-machinelearning/SQLDB-aadAuthOnly.json +++ b/tests/schemas/lz-machinelearning/SQLDB-aadAuthOnly.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -169,7 +169,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/SQLDB-mixedAuth.json b/tests/schemas/lz-machinelearning/SQLDB-mixedAuth.json index c3c2fd35..c432f52b 100644 --- a/tests/schemas/lz-machinelearning/SQLDB-mixedAuth.json +++ b/tests/schemas/lz-machinelearning/SQLDB-mixedAuth.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -170,7 +170,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/SQLDB-sqlAuth.json b/tests/schemas/lz-machinelearning/SQLDB-sqlAuth.json index 3c149380..1e370139 100644 --- a/tests/schemas/lz-machinelearning/SQLDB-sqlAuth.json +++ b/tests/schemas/lz-machinelearning/SQLDB-sqlAuth.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -167,7 +167,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/SQLDBIsFalse.json b/tests/schemas/lz-machinelearning/SQLDBIsFalse.json index 7c72df97..fd00bb36 100644 --- a/tests/schemas/lz-machinelearning/SQLDBIsFalse.json +++ b/tests/schemas/lz-machinelearning/SQLDBIsFalse.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -165,7 +165,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/SQLMIIsFalse.json b/tests/schemas/lz-machinelearning/SQLMIIsFalse.json index 35338ba5..96ce8a61 100644 --- a/tests/schemas/lz-machinelearning/SQLMIIsFalse.json +++ b/tests/schemas/lz-machinelearning/SQLMIIsFalse.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -164,7 +164,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], diff --git a/tests/schemas/lz-machinelearning/WithoutCMK.json b/tests/schemas/lz-machinelearning/WithoutCMK.json index 3fa13b7b..39fcdc4b 100644 --- a/tests/schemas/lz-machinelearning/WithoutCMK.json +++ b/tests/schemas/lz-machinelearning/WithoutCMK.json @@ -92,13 +92,13 @@ }, "resourceGroups": { "value": { - "automation": "azmlcmk102021W1Automation", - "compute": "azmlcmk102021W1Compute", - "monitor": "azmlcmk102021W1Monitor", - "networking": "azmlcmk102021W1Network", + "automation": "azmlcmkAutomation", + "compute": "azmlcmkCompute", + "monitor": "azmlcmkMonitor", + "networking": "azmlcmkNetwork", "networkWatcher": "NetworkWatcherRG", - "security": "azmlcmk102021W1Security", - "storage": "azmlcmk102021W1Storage" + "security": "azmlcmkSecurity", + "storage": "azmlcmkStorage" } }, "useCMK": { @@ -106,7 +106,7 @@ }, "automation": { "value": { - "name": "azmlcmk102021W1automation" + "name": "azmlcmkautomation" } }, "keyVault": { @@ -169,7 +169,7 @@ "value": { "peerToHubVirtualNetwork": true, "useRemoteGateway": false, - "name": "azmlcmk102021W1vnet", + "name": "azmlcmkvnet", "dnsServers": [ "10.18.1.4" ], From 41b1aa16af1321def19f861987318d23a21b9875 Mon Sep 17 00:00:00 2001 From: Senthuran Sivananthan Date: Thu, 10 Feb 2022 16:44:43 -0500 Subject: [PATCH 8/8] Remove date stamp --- ...10-86da-7fbb8f660a10_generic-subscription_canadacentral.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json index d5aa8691..587a75a4 100644 --- a/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json +++ b/config/subscriptions/devopsincanada-main/pubsec/LandingZones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json @@ -68,7 +68,7 @@ "automation": "rgAutomation", "networking": "rgVnet", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecoveryVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": {