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..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 @@ -65,10 +65,10 @@ }, "resourceGroups": { "value": { - "automation": "rgAutomation102021W1", - "networking": "rgVnet102021W1", + "automation": "rgAutomation2022Q1", + "networking": "rgVnet2022Q1", "networkWatcher": "NetworkWatcherRG", - "backupRecoveryVault":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault2022Q1" } }, "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" ], 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..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "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..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/docs/archetypes/generic-subscription.md b/docs/archetypes/generic-subscription.md index 151ed406..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { 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 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 diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsFalse.json index 3d870b47..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json b/tests/schemas/lz-generic-subscription/BackupRecoveryVaultIsTrue.json index ef704703..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsFalse.json b/tests/schemas/lz-generic-subscription/BudgetIsFalse.json index ef704703..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/BudgetIsTrue.json b/tests/schemas/lz-generic-subscription/BudgetIsTrue.json index ce871312..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptyResourceTags.json b/tests/schemas/lz-generic-subscription/EmptyResourceTags.json index ba027de6..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json b/tests/schemas/lz-generic-subscription/EmptySubscriptionTags.json index dc71341d..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":"rgRecovervyVault102021W1" + "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 decadecf..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":"rgRecovervyVault102021W1" + "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 fd1432e0..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithOptionalSubnets.json index ef704703..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json b/tests/schemas/lz-generic-subscription/WithoutCustomDNS.json index 027154c4..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":"rgRecovervyVault102021W1" + "backupRecoveryVault":"rgRecoveryVault" } }, "automation": { diff --git a/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json b/tests/schemas/lz-generic-subscription/WithoutOptionalSubnets.json index 9197ad05..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":"rgRecovervyVault102021W1" + "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" ],