From ae0cbfd9598955d80942a19c4a48dd6f140e59e3 Mon Sep 17 00:00:00 2001
From: Philipson Joseph V <77002750+PhilipsonJoseph@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:39:42 +0530
Subject: [PATCH] 542365460 Blank Resource group when using ARM task for
 specific subscription (#20536)

* 542365460 Blank Resource group when using ARM task for specific subscription

* fixed Tazk.loc
---
 .../package-lock.json                         | 32 ++++++++++---------
 .../task.json                                 | 13 ++++----
 .../task.loc.json                             | 13 ++++----
 ...ManagerTemplateDeploymentV3.versionmap.txt |  4 +--
 .../package-lock.json                         | 32 ++++++++++---------
 .../task.json                                 | 17 +++++-----
 .../task.loc.json                             | 17 +++++-----
 .../task.json                                 | 17 +++++-----
 .../task.loc.json                             | 17 +++++-----
 9 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json
index e3983e5475e..fa09f1518d3 100644
--- a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json
+++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json
@@ -176,14 +176,21 @@
             "typed-rest-client": "^2.0.1"
           }
         },
-        "msalv1": {
-          "version": "npm:@azure/msal-node@1.18.4",
-          "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz",
-          "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==",
+        "msalv2": {
+          "version": "npm:@azure/msal-node@2.15.0",
+          "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.15.0.tgz",
+          "integrity": "sha512-gVPW8YLz92ZeCibQH2QUw96odJoiM3k/ZPH3f2HxptozmH6+OnyyvKXo/Egg39HAM230akarQKHf0W74UHlh0Q==",
           "requires": {
-            "@azure/msal-common": "13.3.1",
+            "@azure/msal-common": "14.15.0",
             "jsonwebtoken": "^9.0.0",
             "uuid": "^8.3.0"
+          },
+          "dependencies": {
+            "@azure/msal-common": {
+              "version": "14.15.0",
+              "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz",
+              "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ=="
+            }
           }
         },
         "typed-rest-client": {
@@ -516,21 +523,16 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "msalv2": {
-      "version": "npm:@azure/msal-node@2.13.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz",
-      "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==",
+    "msalv1": {
+      "version": "npm:@azure/msal-node@1.18.4",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz",
+      "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==",
       "requires": {
-        "@azure/msal-common": "14.14.2",
+        "@azure/msal-common": "13.3.1",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "dependencies": {
-        "@azure/msal-common": {
-          "version": "14.14.2",
-          "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz",
-          "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog=="
-        },
         "uuid": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
index 516e9164ac6..42f62fd25b6 100644
--- a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
+++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 2
+    "Minor": 247,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
index 91d359f4c40..bf68f3628f3 100644
--- a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
+++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 2
+    "Minor": 247,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3.versionmap.txt b/_generated/AzureResourceManagerTemplateDeploymentV3.versionmap.txt
index ad593c87056..49463c4411b 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3.versionmap.txt
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3.versionmap.txt
@@ -1,2 +1,2 @@
-Default|3.246.2
-Node20_229_2|3.246.3
+Default|3.247.0
+Node20_229_2|3.247.1
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3/package-lock.json b/_generated/AzureResourceManagerTemplateDeploymentV3/package-lock.json
index e3983e5475e..fa09f1518d3 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3/package-lock.json
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3/package-lock.json
@@ -176,14 +176,21 @@
             "typed-rest-client": "^2.0.1"
           }
         },
-        "msalv1": {
-          "version": "npm:@azure/msal-node@1.18.4",
-          "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz",
-          "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==",
+        "msalv2": {
+          "version": "npm:@azure/msal-node@2.15.0",
+          "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.15.0.tgz",
+          "integrity": "sha512-gVPW8YLz92ZeCibQH2QUw96odJoiM3k/ZPH3f2HxptozmH6+OnyyvKXo/Egg39HAM230akarQKHf0W74UHlh0Q==",
           "requires": {
-            "@azure/msal-common": "13.3.1",
+            "@azure/msal-common": "14.15.0",
             "jsonwebtoken": "^9.0.0",
             "uuid": "^8.3.0"
+          },
+          "dependencies": {
+            "@azure/msal-common": {
+              "version": "14.15.0",
+              "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz",
+              "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ=="
+            }
           }
         },
         "typed-rest-client": {
@@ -516,21 +523,16 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "msalv2": {
-      "version": "npm:@azure/msal-node@2.13.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz",
-      "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==",
+    "msalv1": {
+      "version": "npm:@azure/msal-node@1.18.4",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz",
+      "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==",
       "requires": {
-        "@azure/msal-common": "14.14.2",
+        "@azure/msal-common": "13.3.1",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "dependencies": {
-        "@azure/msal-common": {
-          "version": "14.14.2",
-          "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz",
-          "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog=="
-        },
         "uuid": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3/task.json b/_generated/AzureResourceManagerTemplateDeploymentV3/task.json
index 8d7fa821bdf..8c428e9ebb7 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3/task.json
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3/task.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 2
+    "Minor": 247,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
@@ -336,7 +337,7 @@
     "IncompatibleAzureCLIVersionBicepParam": "Azure CLI version should be >= 2.47.0 to use .bicepparam file"
   },
   "_buildConfigMapping": {
-    "Default": "3.246.2",
-    "Node20_229_2": "3.246.3"
+    "Default": "3.247.0",
+    "Node20_229_2": "3.247.1"
   }
 }
\ No newline at end of file
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3/task.loc.json b/_generated/AzureResourceManagerTemplateDeploymentV3/task.loc.json
index cfe8dc7e902..3c7c250c146 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3/task.loc.json
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 2
+    "Minor": 247,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
@@ -336,7 +337,7 @@
     "IncompatibleAzureCLIVersionBicepParam": "ms-resource:loc.messages.IncompatibleAzureCLIVersionBicepParam"
   },
   "_buildConfigMapping": {
-    "Default": "3.246.2",
-    "Node20_229_2": "3.246.3"
+    "Default": "3.247.0",
+    "Node20_229_2": "3.247.1"
   }
 }
\ No newline at end of file
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.json b/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.json
index 607936c9f7f..094067430f9 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.json
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 3
+    "Minor": 247,
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
@@ -340,7 +341,7 @@
     "IncompatibleAzureCLIVersionBicepParam": "Azure CLI version should be >= 2.47.0 to use .bicepparam file"
   },
   "_buildConfigMapping": {
-    "Default": "3.246.2",
-    "Node20_229_2": "3.246.3"
+    "Default": "3.247.0",
+    "Node20_229_2": "3.247.1"
   }
 }
\ No newline at end of file
diff --git a/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.loc.json b/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.loc.json
index 77a6e611e26..ea68a7c4079 100644
--- a/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.loc.json
+++ b/_generated/AzureResourceManagerTemplateDeploymentV3_Node20/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 246,
-    "Patch": 3
+    "Minor": 247,
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",
@@ -246,10 +246,11 @@
     {
       "target": "resourceGroupName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureResourceGroupsByExplicitSubscription",
-      "parameters": {
-        "subscriptionId": "$(subscriptionName)"
-      }
+      "endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/resourcegroups?$skiptoken={{{skiptoken}}}&api-version=2016-02-01",
+      "callbackContextTemplate": "{\"skiptoken\": \"{{#getTokenValue response.nextLink}}{{extractUrlQueryParameter %24skiptoken}}{{/getTokenValue}}\"}",
+      "callbackRequiredTemplate": "{{isTokenPresent response.nextLink}}",
+      "initialContextTemplate": "{\"skiptoken\": \"\"}",
+      "resultSelector": "jsonpath:$.value[*].name"
     },
     {
       "target": "location",
@@ -340,7 +341,7 @@
     "IncompatibleAzureCLIVersionBicepParam": "ms-resource:loc.messages.IncompatibleAzureCLIVersionBicepParam"
   },
   "_buildConfigMapping": {
-    "Default": "3.246.2",
-    "Node20_229_2": "3.246.3"
+    "Default": "3.247.0",
+    "Node20_229_2": "3.247.1"
   }
 }
\ No newline at end of file