AzCli task reset to m142 for RC2 (#9059)

* Revert "Setting up Azure Active cloud corresponding to service endpoint (#9003) (#9006)"

This reverts commit 8ebe8db.

* Revert "Add Global Azure CLI config flag (#8996) (#8998)"

This reverts commit be92e08.

* Revert "Azure cli path undefined fix. (#8954)"

This reverts commit 2a04bae.

* Revert "Set local confg dir for az cli so that multiple tasks can run in parallel (#8656)"

This reverts commit f29fe65.

* increase version

Author: vineetmimrot

Tasks/AzureCLIV1/Strings/resources.resjson/en-US/resources.resjson

@@ -15,8 +15,6 @@
   "loc.input.help.inlineScript": "You can write your scripts inline here. For batch files use the prefix \"call\" before every azure command. You can also pass predefined and custom variables to this script using arguments \n\n example for shell: az --version || az account show \n\n example for batch: call  az --version || call az account show",
   "loc.input.label.args": "Arguments",
   "loc.input.help.args": "Arguments passed to the script",
-  "loc.input.label.useGlobalConfig": "Use global Azure CLI configuration",
-  "loc.input.help.useGlobalConfig": "If this is false, this task will use its own separate [Azure CLI configuration directory](https://docs.microsoft.com/en-us/cli/azure/azure-cli-configuration?view=azure-cli-latest#cli-configuration-file). This can be used to run Azure CLI tasks in *parallel* releases",
   "loc.input.label.cwd": "Working Directory",
   "loc.input.help.cwd": "Current working directory where the script is run.  Empty is the root of the repo (build) or artifacts (release), which is $(System.DefaultWorkingDirectory)",
   "loc.input.label.failOnStandardError": "Fail on Standard Error",
@@ -27,7 +25,5 @@
   "loc.messages.AzureSDKNotFound": "Azure CLI 2.x is not installed on this machine.",
   "loc.messages.FailedToLogout": "The following error occurred while logging out: %s",
   "loc.messages.LoginFailed": "Azure login failed",
-  "loc.messages.ErrorInSettingUpSubscription": "Error in setting up subscription",
-  "loc.messages.SettingAzureConfigDir": "Setting AZURE_CONFIG_DIR env variable to: %s",
-  "loc.messages.SettingAzureCloud": "Setting active cloud to: %s"
+  "loc.messages.ErrorInSettingUpSubscription": "Error in setting up subscription"
 }

Tasks/AzureCLIV1/azureclitask.ts

@@ -57,9 +57,6 @@ export class azureclitask {
                 tool = tl.tool(tl.which(scriptPath, true));
             }
             this.throwIfError(tl.execSync("az", "--version"));
-            // set az cli config dir
-            this.setConfigDirectory();
-            this.setAzureCloudBasedOnServiceEndpoint();
             this.loginAzure();
 
             tool.line(args); // additional args should always call line. line() parses quoted arg strings
@@ -79,7 +76,7 @@ export class azureclitask {
                 this.deleteFile(scriptPath);
             }
 
-            if (this.cliPasswordPath) {
+            if(this.cliPasswordPath) {
                 tl.debug('Removing spn certificate file');
                 tl.rmRF(this.cliPasswordPath);
             }
@@ -89,10 +86,6 @@ export class azureclitask {
                 this.logoutAzure();
             }
 
-            if (this.azCliConfigPath) {
-                tl.rmRF(this.azCliConfigPath);
-            }
-
             //set the task result to either succeeded or failed based on error was thrown or not
             if (toolExecutionError) {
                 tl.setResult(tl.TaskResult.Failed, tl.loc("ScriptFailed", toolExecutionError));
@@ -105,7 +98,6 @@ export class azureclitask {
 
     private static isLoggedIn: boolean = false;
     private static cliPasswordPath: string = null;
-    private static azCliConfigPath: string;
 
     private static loginAzure() {
         var connectedService: string = tl.getInput("connectedServiceNameARM", true);
@@ -116,7 +108,7 @@ export class azureclitask {
         var servicePrincipalId: string = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalid", false);
         let authType: string = tl.getEndpointAuthorizationParameter(connectedService, 'authenticationType', true);
         let cliPassword: string = null;
-        if (authType == "spnCertificate") {
+        if(authType == "spnCertificate") {
             tl.debug('certificate based endpoint');
             let certificateContent: string = tl.getEndpointAuthorizationParameter(connectedService, "servicePrincipalCertificate", false);
             cliPassword = path.join(tl.getVariable('Agent.TempDirectory') || tl.getVariable('system.DefaultWorkingDirectory'), 'spnCert.pem');
@@ -131,44 +123,13 @@ export class azureclitask {
 
         var tenantId: string = tl.getEndpointAuthorizationParameter(connectedService, "tenantid", false);
         var subscriptionID: string = tl.getEndpointDataParameter(connectedService, "SubscriptionID", true);
-
         //login using svn
         this.throwIfError(tl.execSync("az", "login --service-principal -u \"" + servicePrincipalId + "\" -p \"" + cliPassword + "\" --tenant \"" + tenantId + "\""), tl.loc("LoginFailed"));
         this.isLoggedIn = true;
         //set the subscription imported to the current subscription
         this.throwIfError(tl.execSync("az", "account set --subscription \"" + subscriptionID + "\""), tl.loc("ErrorInSettingUpSubscription"));
     }
 
-    private static setConfigDirectory(): void {
-        if (tl.getBoolInput("useGlobalConfig")) {
-            return;
-        }
-
-        var configDirName: string = "c" + new Date().getTime(); // 'c' denotes config
-        var basePath: string;
-        if (tl.osType().match(/^Win/)) {
-            basePath = process.env.USERPROFILE;
-        }
-        else {
-            basePath = process.env.HOME;
-        }
-
-        if (!!basePath) {
-            this.azCliConfigPath = path.join(basePath, ".azclitask", configDirName);
-            console.log(tl.loc('SettingAzureConfigDir', this.azCliConfigPath));
-            process.env['AZURE_CONFIG_DIR'] = this.azCliConfigPath;
-        }
-    }
-
-    private static setAzureCloudBasedOnServiceEndpoint(): void {
-        var connectedService: string = tl.getInput("connectedServiceNameARM", true);
-        var environment = tl.getEndpointDataParameter(connectedService, 'environment', true);
-        if(!!environment) {
-            console.log(tl.loc('SettingAzureCloud', environment));
-            this.throwIfError(tl.execSync("az", "cloud set -n " + environment));
-        }
-    }
-
     private static logoutAzure() {
         try {
             tl.execSync("az", " account clear");

Tasks/AzureCLIV1/task.json

@@ -19,7 +19,7 @@
     "version": {
         "Major": 1,
         "Minor": 143,
-        "Patch": 5
+        "Patch": 6
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -90,15 +90,6 @@
                 "editorExtension": "ms.vss-services-azure.parameters-grid"
             }
         },
-        {
-            "name": "useGlobalConfig",
-            "type": "boolean",
-            "label": "Use global Azure CLI configuration",
-            "defaultValue": "false",
-            "required": false,
-            "helpMarkDown": "If this is false, this task will use its own separate [Azure CLI configuration directory](https://docs.microsoft.com/en-us/cli/azure/azure-cli-configuration?view=azure-cli-latest#cli-configuration-file). This can be used to run Azure CLI tasks in *parallel* releases",
-            "groupName": "advanced"
-        },
         {
             "name": "cwd",
             "aliases": [
@@ -134,8 +125,6 @@
         "AzureSDKNotFound": "Azure CLI 2.x is not installed on this machine.",
         "FailedToLogout": "The following error occurred while logging out: %s",
         "LoginFailed": "Azure login failed",
-        "ErrorInSettingUpSubscription": "Error in setting up subscription",
-        "SettingAzureConfigDir": "Setting AZURE_CONFIG_DIR env variable to: %s",
-        "SettingAzureCloud": "Setting active cloud to: %s"
+        "ErrorInSettingUpSubscription": "Error in setting up subscription"
     }
 }

Tasks/AzureCLIV1/task.loc.json

@@ -19,7 +19,7 @@
   "version": {
     "Major": 1,
     "Minor": 143,
-    "Patch": 5
+    "Patch": 6
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -90,15 +90,6 @@
         "editorExtension": "ms.vss-services-azure.parameters-grid"
       }
     },
-    {
-      "name": "useGlobalConfig",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.useGlobalConfig",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.useGlobalConfig",
-      "groupName": "advanced"
-    },
     {
       "name": "cwd",
       "aliases": [
@@ -134,8 +125,6 @@
     "AzureSDKNotFound": "ms-resource:loc.messages.AzureSDKNotFound",
     "FailedToLogout": "ms-resource:loc.messages.FailedToLogout",
     "LoginFailed": "ms-resource:loc.messages.LoginFailed",
-    "ErrorInSettingUpSubscription": "ms-resource:loc.messages.ErrorInSettingUpSubscription",
-    "SettingAzureConfigDir": "ms-resource:loc.messages.SettingAzureConfigDir",
-    "SettingAzureCloud": "ms-resource:loc.messages.SettingAzureCloud"
+    "ErrorInSettingUpSubscription": "ms-resource:loc.messages.ErrorInSettingUpSubscription"
   }
 }