Fix #19726 (#19755)

* Fix #19726 Add type check to avoid errors when the thrown exception is an object * Format the code
microsoft · Apr 9, 2024 · 5f964db · 5f964db
1 parent e496052
commit 5f964db
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 74 deletions.
diff --git a/Tasks/AzureCLIV1/azureclitask.ts b/Tasks/AzureCLIV1/azureclitask.ts
@@ -108,16 +108,19 @@ export class azureclitask {
 
             //set the task result to either succeeded or failed based on error was thrown or not
             if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+                let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
-                let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
-                if (serviceEndpointSecretIsExpired) {
+                if (typeof toolExecutionError === 'string') {
+                  const expiredSecretErrorCode = 'AADSTS7000222';
+                  let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
+                  if (serviceEndpointSecretIsExpired) {
                     const organizationURL = tl.getVariable('System.CollectionUri');
                     const projectName = tl.getVariable('System.TeamProject');
                     const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
+
                     message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  }
                 }
 
                 tl.setResult(tl.TaskResult.Failed, message);

diff --git a/Tasks/AzureCLIV1/task.json b/Tasks/AzureCLIV1/task.json
@@ -20,7 +20,7 @@
     "version": {
         "Major": 1,
         "Minor": 238,
-        "Patch": 0
+        "Patch": 2
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",

diff --git a/Tasks/AzureCLIV1/task.loc.json b/Tasks/AzureCLIV1/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 1,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/AzureCLIV2/azureclitask.ts b/Tasks/AzureCLIV2/azureclitask.ts
@@ -95,19 +95,22 @@ export class azureclitask {
             if(toolExecutionError === FAIL_ON_STDERR) {
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedStdErr"));
             } else if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+              let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
+              if (typeof toolExecutionError === 'string') {
+                const expiredSecretErrorCode = 'AADSTS7000222';
                 let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
                 if (serviceEndpointSecretIsExpired) {
-                    const organizationURL = tl.getVariable('System.CollectionUri');
-                    const projectName = tl.getVariable('System.TeamProject');
-                    const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
-                    message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  const organizationURL = tl.getVariable('System.CollectionUri');
+                  const projectName = tl.getVariable('System.TeamProject');
+                  const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
+
+                  message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
                 }
-
-                tl.setResult(tl.TaskResult.Failed, message);
+              }
+
+              tl.setResult(tl.TaskResult.Failed, message);
             } else if (exitCode != 0){
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedWithExitCode", exitCode));
             }

diff --git a/Tasks/AzureCLIV2/task.json b/Tasks/AzureCLIV2/task.json
@@ -20,7 +20,7 @@
     "version": {
         "Major": 2,
         "Minor": 238,
-        "Patch": 0
+        "Patch": 2
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",

diff --git a/Tasks/AzureCLIV2/task.loc.json b/Tasks/AzureCLIV2/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/_generated/AzureCLIV1.versionmap.txt b/_generated/AzureCLIV1.versionmap.txt
@@ -1,2 +1,2 @@
-Default|1.238.0
-Node20_229_2|1.238.1
+Default|1.238.2
+Node20_229_2|1.238.3
diff --git a/_generated/AzureCLIV1/azureclitask.ts b/_generated/AzureCLIV1/azureclitask.ts
@@ -108,16 +108,19 @@ export class azureclitask {
 
             //set the task result to either succeeded or failed based on error was thrown or not
             if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+                let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
-                let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
-                if (serviceEndpointSecretIsExpired) {
+                if (typeof toolExecutionError === 'string') {
+                  const expiredSecretErrorCode = 'AADSTS7000222';
+                  let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
+                  if (serviceEndpointSecretIsExpired) {
                     const organizationURL = tl.getVariable('System.CollectionUri');
                     const projectName = tl.getVariable('System.TeamProject');
                     const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
+
                     message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  }
                 }
 
                 tl.setResult(tl.TaskResult.Failed, message);

diff --git a/_generated/AzureCLIV1/task.json b/_generated/AzureCLIV1/task.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 1,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -161,7 +161,7 @@
     "ExpiredServicePrincipalMessageWithLink": "Secret expired, update service connection at\u00A0%s See\u00A0https://aka.ms/azdo-rm-workload-identity-conversion to learn more about conversion to secret-less service connections."
   },
   "_buildConfigMapping": {
-    "Default": "1.238.0",
-    "Node20_229_2": "1.238.1"
+    "Default": "1.238.2",
+    "Node20_229_2": "1.238.3"
   }
 }
diff --git a/_generated/AzureCLIV1/task.loc.json b/_generated/AzureCLIV1/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 1,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -161,7 +161,7 @@
     "ExpiredServicePrincipalMessageWithLink": "ms-resource:loc.messages.ExpiredServicePrincipalMessageWithLink"
   },
   "_buildConfigMapping": {
-    "Default": "1.238.0",
-    "Node20_229_2": "1.238.1"
+    "Default": "1.238.2",
+    "Node20_229_2": "1.238.3"
   }
 }
diff --git a/_generated/AzureCLIV1_Node20/azureclitask.ts b/_generated/AzureCLIV1_Node20/azureclitask.ts
@@ -108,16 +108,19 @@ export class azureclitask {
 
             //set the task result to either succeeded or failed based on error was thrown or not
             if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+                let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
-                let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
-                if (serviceEndpointSecretIsExpired) {
+                if (typeof toolExecutionError === 'string') {
+                  const expiredSecretErrorCode = 'AADSTS7000222';
+                  let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
+                  if (serviceEndpointSecretIsExpired) {
                     const organizationURL = tl.getVariable('System.CollectionUri');
                     const projectName = tl.getVariable('System.TeamProject');
                     const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
+
                     message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  }
                 }
 
                 tl.setResult(tl.TaskResult.Failed, message);

diff --git a/_generated/AzureCLIV1_Node20/task.json b/_generated/AzureCLIV1_Node20/task.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 1,
     "Minor": 238,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -165,7 +165,7 @@
     "ExpiredServicePrincipalMessageWithLink": "Secret expired, update service connection at\u00A0%s See\u00A0https://aka.ms/azdo-rm-workload-identity-conversion to learn more about conversion to secret-less service connections."
   },
   "_buildConfigMapping": {
-    "Default": "1.238.0",
-    "Node20_229_2": "1.238.1"
+    "Default": "1.238.2",
+    "Node20_229_2": "1.238.3"
   }
 }
diff --git a/_generated/AzureCLIV1_Node20/task.loc.json b/_generated/AzureCLIV1_Node20/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 1,
     "Minor": 238,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -165,7 +165,7 @@
     "ExpiredServicePrincipalMessageWithLink": "ms-resource:loc.messages.ExpiredServicePrincipalMessageWithLink"
   },
   "_buildConfigMapping": {
-    "Default": "1.238.0",
-    "Node20_229_2": "1.238.1"
+    "Default": "1.238.2",
+    "Node20_229_2": "1.238.3"
   }
 }
diff --git a/_generated/AzureCLIV2.versionmap.txt b/_generated/AzureCLIV2.versionmap.txt
@@ -1,2 +1,2 @@
-Default|2.238.0
-Node20_229_2|2.238.1
+Default|2.238.2
+Node20_229_2|2.238.3
diff --git a/_generated/AzureCLIV2/azureclitask.ts b/_generated/AzureCLIV2/azureclitask.ts
@@ -95,19 +95,22 @@ export class azureclitask {
             if(toolExecutionError === FAIL_ON_STDERR) {
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedStdErr"));
             } else if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+              let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
+              if (typeof toolExecutionError === 'string') {
+                const expiredSecretErrorCode = 'AADSTS7000222';
                 let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
                 if (serviceEndpointSecretIsExpired) {
-                    const organizationURL = tl.getVariable('System.CollectionUri');
-                    const projectName = tl.getVariable('System.TeamProject');
-                    const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
-                    message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  const organizationURL = tl.getVariable('System.CollectionUri');
+                  const projectName = tl.getVariable('System.TeamProject');
+                  const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
+
+                  message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
                 }
-
-                tl.setResult(tl.TaskResult.Failed, message);
+              }
+
+              tl.setResult(tl.TaskResult.Failed, message);
             } else if (exitCode != 0){
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedWithExitCode", exitCode));
             }

diff --git a/_generated/AzureCLIV2/task.json b/_generated/AzureCLIV2/task.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -204,7 +204,7 @@
     "ExpiredServicePrincipalMessageWithLink": "Secret expired, update service connection at\u00A0%s See\u00A0https://aka.ms/azdo-rm-workload-identity-conversion to learn more about conversion to secret-less service connections."
   },
   "_buildConfigMapping": {
-    "Default": "2.238.0",
-    "Node20_229_2": "2.238.1"
+    "Default": "2.238.2",
+    "Node20_229_2": "2.238.3"
   }
 }
diff --git a/_generated/AzureCLIV2/task.loc.json b/_generated/AzureCLIV2/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 238,
-    "Patch": 0
+    "Patch": 2
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -204,7 +204,7 @@
     "ExpiredServicePrincipalMessageWithLink": "ms-resource:loc.messages.ExpiredServicePrincipalMessageWithLink"
   },
   "_buildConfigMapping": {
-    "Default": "2.238.0",
-    "Node20_229_2": "2.238.1"
+    "Default": "2.238.2",
+    "Node20_229_2": "2.238.3"
   }
 }
diff --git a/_generated/AzureCLIV2_Node20/azureclitask.ts b/_generated/AzureCLIV2_Node20/azureclitask.ts
@@ -95,19 +95,22 @@ export class azureclitask {
             if(toolExecutionError === FAIL_ON_STDERR) {
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedStdErr"));
             } else if (toolExecutionError) {
-                let message = tl.loc("ScriptFailed", toolExecutionError);
+              let message = tl.loc('ScriptFailed', toolExecutionError);
 
-                const expiredSecretErrorCode = "AADSTS7000222";
+              if (typeof toolExecutionError === 'string') {
+                const expiredSecretErrorCode = 'AADSTS7000222';
                 let serviceEndpointSecretIsExpired = toolExecutionError.indexOf(expiredSecretErrorCode) >= 0;
+
                 if (serviceEndpointSecretIsExpired) {
-                    const organizationURL = tl.getVariable('System.CollectionUri');
-                    const projectName = tl.getVariable('System.TeamProject');
-                    const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
-                    
-                    message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
+                  const organizationURL = tl.getVariable('System.CollectionUri');
+                  const projectName = tl.getVariable('System.TeamProject');
+                  const serviceConnectionLink = encodeURI(`${organizationURL}${projectName}/_settings/adminservices?resourceId=${connectedService}`);
+
+                  message = tl.loc('ExpiredServicePrincipalMessageWithLink', serviceConnectionLink);
                 }
-
-                tl.setResult(tl.TaskResult.Failed, message);
+              }
+
+              tl.setResult(tl.TaskResult.Failed, message);
             } else if (exitCode != 0){
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailedWithExitCode", exitCode));
             }

diff --git a/_generated/AzureCLIV2_Node20/task.json b/_generated/AzureCLIV2_Node20/task.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 238,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -208,7 +208,7 @@
     "ExpiredServicePrincipalMessageWithLink": "Secret expired, update service connection at\u00A0%s See\u00A0https://aka.ms/azdo-rm-workload-identity-conversion to learn more about conversion to secret-less service connections."
   },
   "_buildConfigMapping": {
-    "Default": "2.238.0",
-    "Node20_229_2": "2.238.1"
+    "Default": "2.238.2",
+    "Node20_229_2": "2.238.3"
   }
 }
diff --git a/_generated/AzureCLIV2_Node20/task.loc.json b/_generated/AzureCLIV2_Node20/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 238,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -208,7 +208,7 @@
     "ExpiredServicePrincipalMessageWithLink": "ms-resource:loc.messages.ExpiredServicePrincipalMessageWithLink"
   },
   "_buildConfigMapping": {
-    "Default": "2.238.0",
-    "Node20_229_2": "2.238.1"
+    "Default": "2.238.2",
+    "Node20_229_2": "2.238.3"
   }
 }