v5.2 (#45)

- Doesn't handle other Azure Clouds #38 - Task v5 fails if there is no output #25 - Updated dependencies of Azure SDK's
keesschollaart81 · Sep 15, 2019 · 03aa7d3 · 03aa7d3
1 parent 7e30a83
commit 03aa7d3
Show file tree

Hide file tree

Showing 8 changed files with 4,894 additions and 27 deletions.
diff --git a/arm-outputs/arm-outputsV2/arm-outputs.ts b/arm-outputs/arm-outputsV2/arm-outputs.ts
@@ -34,12 +34,10 @@ export class ArmOutputs {
             throw new Error(`Deployment '${deployments[0].name}' of Resource Group '${this.config.resourceGroupName}' did not succeed (status '${deployments[0].properties.provisioningState}')`);
         }
 
-        var outputs = deployments[0].properties.outputs;
-        if (!outputs) {
-            throw new Error(`No output parameters could be found for the deployment '${deployments[0].name}' of Resource Group '${this.config.resourceGroupName}'."`)
-        }
-
         var results: ArmOutputResult[] = [];
+
+        var outputs = deployments[0].properties.outputs;
+
         for (var output in outputs) {
 
             if (this.config.outputNames.length > 0 && !this.config.outputNames.some(x => x.trim() == output)) {

diff --git a/arm-outputs/arm-outputsV2/index.ts b/arm-outputs/arm-outputsV2/index.ts
@@ -14,6 +14,12 @@ export class AzureDevOpsArmOutputsTaskHost {
         let success = true;
 
         try {
+            const debugModeString: string = tl.getVariable('System.Debug');
+            const debugMode: boolean = debugModeString ? debugModeString.toLowerCase() != 'false' : false;
+            if (debugMode) {
+                tl.warning("You are running in debug mode (variable System.Debug is set to true), the values of your ARM Outputs will be printed to the log. If your deployment outputs any secret values, they will be shown, be careful (especially with public projects)!");
+            }
+
             let connectedServiceNameARM: string = tl.getInput("ConnectedServiceNameARM");
             var endpointAuth = tl.getEndpointAuthorization(connectedServiceNameARM, true);
             var authScheme = tl.getEndpointAuthorizationScheme(connectedServiceNameARM, true);
@@ -30,12 +36,6 @@ export class AzureDevOpsArmOutputsTaskHost {
 
             if (!prefix || prefix == "null") prefix = "";
 
-            const debugModeString: string = tl.getVariable('System.Debug');
-            const debugMode: boolean = debugModeString ? debugModeString.toLowerCase() != 'false' : false;
-            if (debugMode) {
-                tl.warning("You are running in debug mode (variable System.Debug is set to true), the values of your ARM Outputs will be printed to the log. If your deployment outputs any secret values, they will be shown, be careful (especially with public projects)!");
-            }
-
             var params = <ArmOutputParams>{
                 tokenCredentials: credentials,
                 subscriptionId: subscriptionId,
@@ -48,10 +48,15 @@ export class AzureDevOpsArmOutputsTaskHost {
 
             var armOutputs = new ArmOutputs(params);
             var outputs = await armOutputs.run();
-            outputs.forEach(output => {
-                console.info(`Updating Azure Pipelines variable '${output.key}'`);
-                tl.setVariable(output.key, output.value, false);
-            });
+
+            if (outputs && outputs.length == 0) {
+                tl.warning(`No output parameters could be found for the deployment`);
+            } else {
+                outputs.forEach(output => {
+                    console.info(`Updating Azure Pipelines variable '${output.key}'`);
+                    tl.setVariable(output.key, output.value, false);
+                });
+            }
         }
         catch (err) {
             console.error("Unhandled exception during ARM Outputs Task", err);
@@ -98,12 +103,15 @@ export class AzureDevOpsArmOutputsTaskHost {
     }
 
     private getEnvironment = (environmentName: string): msrestAzure.AzureEnvironment => {
+        if (!environmentName) return msrestAzure.AzureEnvironment.Azure;
+
         const azureEnvironmentMaps = {
             azurechinacloud: msrestAzure.AzureEnvironment.AzureChina,
             azurecloud: msrestAzure.AzureEnvironment.Azure,
             azuregermancloud: msrestAzure.AzureEnvironment.AzureGermanCloud,
             azureusgovernment: msrestAzure.AzureEnvironment.AzureUSGovernment,
         };
+
         return azureEnvironmentMaps[environmentName.toLowerCase()];
     }
 }