Repository clean up (#165)

* Remove obsolete directory * Rotate resource group names for E2E deployments * Fix typo * Add branch config for testing * Fix typo * Remove branch configs * Remove timestamp from sample JSON templates. Timestamps are kept for E2E testing. * Remove date stamp
Azure · Feb 10, 2022 · 6061fa0 · 6061fa0
1 parent 5104f39
commit 6061fa0
Show file tree

Hide file tree

Showing 53 changed files with 312 additions and 552 deletions.
diff --git a/...ones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json b/...ones/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/...c/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json b/...c/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/...dingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json b/...dingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json
@@ -58,21 +58,21 @@
     },
     "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": {
       "value": false
     },
     "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/...dingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json b/...dingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json
@@ -65,21 +65,21 @@
     },
     "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": {
       "value": true
     },
     "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/...dingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json b/...dingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json
@@ -65,21 +65,21 @@
     },
     "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": {
       "value": false
     },
     "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/...dingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json b/...dingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json
@@ -65,21 +65,21 @@
     },
     "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": {
       "value": true
     },
     "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/...ones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json b/...ones/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/...ones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json b/...ones/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
@@ -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