From aab11e04674427e8f15fdea06b24a2ec29bd06b2 Mon Sep 17 00:00:00 2001
From: Guy Pritchard <guypritchard@microsoft.com>
Date: Thu, 30 Mar 2023 18:43:45 +0100
Subject: [PATCH] Assigning correct subscriptions to correct groups

---
 .../alz-bicep-config/v0.14.1-pre.config.json  | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json b/src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json
index feb58ad0..3b90186c 100644
--- a/src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json
+++ b/src/ALZ/Assets/alz-bicep-config/v0.14.1-pre.config.json
@@ -43,8 +43,8 @@
             "destination": "config/custom-parameters/roleAssignmentManagementGroupMany.servicePrincipal.parameters.all.json"
         },
         {
-            "source": "infra-as-code/bicep/modules/subscriptionPlacement/parameters/subscriptionPlacement.parameters.all.json",
-            "destination": "config/custom-parameters/subscriptionPlacement.parameters.all.json"
+            "source": "infra-as-code/bicep/orchestration/subPlacementAll/parameters/subPlacementAll.parameters.all.json",
+            "destination": "config/custom-parameters/subPlacementAll.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/vwanConnectivity/parameters/vwanConnectivity.parameters.all.json",
@@ -338,17 +338,38 @@
                 }
             ]
         },
-        "AllSubscriptionIds": {
+        "ManagementSubscriptionGroup": {
+            "Type": "Computed",
+            "Value": [
+                "{%ManagementSubscriptionId%}"
+            ],
+            "Targets": [
+                {
+                    "Name": "parPlatformManagementMgSubs.value",
+                    "Destination": "Parameters"
+                }
+            ]
+        },
+        "ConnectivitySubscriptionGroup": {
+            "Type": "Computed",
+            "Value": [
+                "{%ConnectivitySubscriptionId%}"
+            ],
+            "Targets": [
+                {
+                    "Name": "parPlatformConnectivityMgSubs.value",
+                    "Destination": "Parameters"
+                }
+            ]
+        },
+        "IdentitySubscriptionGroup": {
             "Type": "Computed",
-            "Process": "@($args | ForEach-Object { $_.ToLower() } | Select-Object -Unique)",
             "Value": [
-                "{%ManagementSubscriptionId%}",
-                "{%ConnectivitySubscriptionId%}",
                 "{%IdentitySubscriptionId%}"
             ],
             "Targets": [
                 {
-                    "Name": "parSubscriptionIds.value",
+                    "Name": "parPlatformIdentityMgSubs.value",
                     "Destination": "Parameters"
                 }
             ]