Added WIF support to AzureIoTEdgeV2 (#18627)

Added WIF support to AzureIoTEdgeV2

Author: starkmsu

Tasks/AzureIoTEdgeV2/deployimage.ts

@@ -2,6 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as tl from 'azure-pipelines-task-lib/task';
 import * as os from "os";
+import { loginAzureRM } from 'azure-pipelines-tasks-artifacts-common/azCliUtils';
 import util from "./util";
 import Constants from "./constant";
 import { TelemetryEvent } from './telemetry';
@@ -16,7 +17,7 @@ class azureclitask {
     return !!tl.which("az", false);
   }
 
-  static async runMain(deploymentJson, telemetryEvent: TelemetryEvent) {
+  static async runMain(deploymentJson, telemetryEvent: TelemetryEvent): Promise<void> {
     var toolExecutionError = null;
     try {
       let iothub: string = tl.getInput("iothubname", true);
@@ -41,9 +42,9 @@ class azureclitask {
       configId = util.normalizeDeploymentId(configId);
       console.log(tl.loc('NomralizedDeployementId', configId));
 
-      this.loginAzure();
+      await this.loginAzure();
 
-      tl.debug('OS release:' + os.release());      
+      tl.debug('OS release:' + os.release());
       let showIotExtensionCommand = ["extension", "show", "--name", "azure-iot"];
       let result = tl.execSync('az', showIotExtensionCommand, Constants.execSyncSilentOption);
       if (result.code !== 0) { // The extension is not installed
@@ -115,9 +116,9 @@ class azureclitask {
     let execOptions: IExecOptions = {
       errStream: outputStream as stream.Writable
     } as IExecOptions;
-    
+
     // check azcli version
-    let checkAzureIoTVersionExtensionCommand = ["--version"]; 
+    let checkAzureIoTVersionExtensionCommand = ["--version"];
     let viewAzVersionResult = tl.execSync('az', checkAzureIoTVersionExtensionCommand, execOptions);
     if(viewAzVersionResult.code !== 0)
     {
@@ -131,35 +132,21 @@ class azureclitask {
     }
   }
 
-  static loginAzure() {
+  static async loginAzure(): Promise<void> {
     var connectedService = tl.getInput("connectedServiceNameARM", true);
-    this.loginAzureRM(connectedService);
-  }
-
-  static loginAzureRM(connectedService) {
-    var servicePrincipalId = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalid", false);
-    var servicePrincipalKey = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalkey", false);
-    var tenantId = tl.getEndpointAuthorizationParameter(connectedService, "tenantid", false);
-    var subscriptionName = tl.getEndpointDataParameter(connectedService, "SubscriptionName", true);
-    var environment = tl.getEndpointDataParameter(connectedService, "environment", true);
     // Work around for build agent az command will exit with non-zero code since configuration files are missing.
     tl.debug(tl.execSync("az", "--version", Constants.execSyncSilentOption).stdout);
 
+    var environment = tl.getEndpointDataParameter(connectedService, "environment", true);
     // Set environment if it is not AzureCloud (global Azure)
     if (environment && environment !== 'AzureCloud') {
       let result = tl.execSync("az", ["cloud", "set", "--name", environment], Constants.execSyncSilentOption);
       tl.debug(JSON.stringify(result));
     }
 
-    //login using svn
-    let result = tl.execSync("az", ["login", "--service-principal", "-u", servicePrincipalId, "-p", servicePrincipalKey, "--tenant", tenantId], Constants.execSyncSilentOption);
-    tl.debug(JSON.stringify(result));
-    this.throwIfError(result);
+    await loginAzureRM(connectedService);
+
     this.isLoggedIn = true;
-    //set the subscription imported to the current subscription
-    result = tl.execSync("az", ["account", "set", "--subscription", subscriptionName], Constants.execSyncSilentOption);
-    tl.debug(JSON.stringify(result));
-    this.throwIfError(result);
   }
 
   static logoutAzure() {
@@ -171,12 +158,6 @@ class azureclitask {
       tl.warning(tl.loc("FailedToLogout"));
     }
   }
-
-  static throwIfError(resultOfToolExecution) {
-    if (resultOfToolExecution.stderr) {
-      throw resultOfToolExecution;
-    }
-  }
 }
 
 class imagevalidationtask {
@@ -253,7 +234,7 @@ class imagevalidationtask {
   }
 }
 
-export async function run(telemetryEvent: TelemetryEvent) {
+export async function run(telemetryEvent: TelemetryEvent): Promise<void> {
   let inBuildPipeline: boolean = util.checkSelfInBuildPipeline();
   console.log(tl.loc('DeployTaskRunningInBuild', inBuildPipeline));
   let deploymentFilePath: string = tl.getPathInput('deploymentFilePath', true);

Tasks/AzureIoTEdgeV2/make.json

@@ -2,7 +2,9 @@
   "rm": [
       {
           "items": [
-              "node_modules/azure-pipelines-tasks-utility-common/node_modules/azure-pipelines-task-lib"
+              "node_modules/azure-pipelines-tasks-artifacts-common/node_modules/azure-pipelines-task-lib",
+              "node_modules/azure-pipelines-tasks-utility-common/node_modules/azure-pipelines-task-lib",
+              "node_modules/azure-pipelines-tool-lib/node_modules/azure-pipelines-task-lib"
           ],
           "options": "-Rf"
       }

Tasks/AzureIoTEdgeV2/package-lock.json

@@ -7,6 +7,7 @@
     "@types/q": "^1.5.4",
     "applicationinsights": "^1.0.2",
     "azure-pipelines-task-lib": "^3.3.1",
+    "azure-pipelines-tasks-artifacts-common": "^2.225.0",
     "azure-pipelines-tasks-utility-common": "^3.210.0",
     "minimatch": "^3.1.2"
   },

Tasks/AzureIoTEdgeV2/package.json

@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 222,
+        "Minor": 225,
         "Patch": 0
     },
     "preview": false,

Tasks/AzureIoTEdgeV2/task.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 222,
+    "Minor": 225,
     "Patch": 0
   },
   "preview": false,

Tasks/AzureIoTEdgeV2/task.loc.json

@@ -81,7 +81,7 @@ export default class Util {
 
     let cmds: Cmd[] = [];
     let edgeDevVersion = Constants.iotedgedevDefaultVersion;
-    let lockSimVersion = tl.getVariable(Constants.iotedgehubdevLockVersionKey); 
+    let lockSimVersion = tl.getVariable(Constants.iotedgehubdevLockVersionKey);
     // if no version is specified, iotedgedev installs default simulator version
 
     let lockVersion = tl.getVariable(Constants.iotedgedevLockVersionKey);