hotfix for AzureIoTEdgeV2 2.4.7 (#14737)

Co-authored-by: Cindy Deng <[email protected]>

Author: Josh-01

Tasks/AzureIoTEdgeV2/constant.ts

@@ -28,5 +28,5 @@ export default class Constants {
   public static defaultExecOption = {} as IExecSyncOptions;
   public static UTF8 = "utf8";
   public static outputVariableDeploymentPathKey = "DEPLOYMENT_FILE_PATH";
-  public static azureCliIotExtensionDefaultSource = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v0.9.0/azure_iot-0.9.0-py2.py3-none-any.whl";
+  public static azureCliIotExtensionDefaultSource = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v0.10.10/azure_iot-0.10.10-py3-none-any.whl";
 }

Tasks/AzureIoTEdgeV2/deployimage.ts

@@ -43,8 +43,7 @@ class azureclitask {
 
       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
@@ -111,6 +110,32 @@ class azureclitask {
   }
 
   static installAzureCliIotExtension(installCommand: string[]) {
+    let outputStream: EchoStream = new EchoStream();
+    let execOptions: IExecOptions = {
+      errStream: outputStream as stream.Writable
+    } as IExecOptions;
+    
+    // check azcli version
+    let checkAzureIoTVersionExtensionCommand = ["--version"]; 
+    let viewAzVersionResult = tl.execSync('az', checkAzureIoTVersionExtensionCommand, execOptions);
+    if(viewAzVersionResult.code !== 0)
+    {
+      throw new Error(`View Az Version Error: ${outputStream.content}`);
+    }
+
+    // upgrade setuptools in azcli's private python environment to avoid conflict when installing azure-iot extension
+    // temporary solution until the paho-mqtt error in win2016 goes away 
+    if(tl.osType() === Constants.osTypeWindows)
+    {
+      let pythonExeLocation : string = 'C:\\Program Files (x86)\\Microsoft SDKs\\Azure\\CLI2\\python.exe';
+      let setupToolsInstallationCommand = ['-m', 'pip', 'install', '-U', 'setuptools==52.0.0'];
+      let upgradeSetuptoolsResult = tl.execSync(pythonExeLocation, setupToolsInstallationCommand, execOptions);
+      if(upgradeSetuptoolsResult.code !== 0)
+      {
+        throw new Error(`Upgrade setuptools Error: ${outputStream.content}`);
+      }
+    }
+
     let addResult = tl.execSync('az', installCommand, Constants.execSyncSilentOption);
     tl.debug(JSON.stringify(addResult));
     if (addResult.code !== 0) {

Tasks/AzureIoTEdgeV2/package-lock.json

@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 4,
-        "Patch": 6
+        "Patch": 7
     },
     "preview": false,
     "showEnvironmentVariables": true,

Tasks/AzureIoTEdgeV2/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 4,
-    "Patch": 6
+    "Patch": 7
   },
   "preview": false,
   "showEnvironmentVariables": true,

Tasks/AzureIoTEdgeV2/task.loc.json

@@ -88,8 +88,9 @@ export default class Util {
     if (tl.osType() === Constants.osTypeLinux) {
       cmds = [
         { path: `sudo`, arg: `apt-get update`, execOption: Constants.execSyncSilentOption },
+        { path: `sudo`, arg: `-H pip3 install wheel --upgrade`, execOption: Constants.execSyncSilentOption },
+        { path: `sudo`, arg: `pip3 install importlib-metadata==2.1.1`, execOption: Constants.execSyncSilentOption },
         { path: `sudo`, arg: `apt-get install -y python3-setuptools`, execOption: Constants.execSyncSilentOption },
-        { path: `sudo`, arg: `pip install --upgrade cryptography`, execOption: Constants.execSyncSilentOption},
         { path: `sudo`, arg: `pip3 install ${Constants.iotedgedev}~=${version}`, execOption: Constants.execSyncSilentOption },
       ]
     } else if (tl.osType() === Constants.osTypeWindows) {