Users/ajya/national cloud xmlsub merged changes m113 (#3680)

* Users/ajya/nationalcloudclientsidechanges (#3551)

* Changes for national cloud

* consume arm url from endpoint

* authUrl and envAuthUrl fix

* Test correction for client side changes

* bump up task version and fixing review comments

* null check for auth url in NLB task

* added URL in endpoint object for NLB task

* added environment to logs

* reverted variable name back to SPN

* Bump up task version corrsponding to master

* corrections

* Increased patch version for AFC

* back compat for xml sub

* resolve merge conflict

* loc.json updated

* Increase patch version as release branch version has been bumbed up

* Increased patch version due to vincent xml sub fix

* patch version bump up due to vincent fix

* default URL check for Deploy Azure RG Task

* Increased patch version of AFC to build package

Author: Ajay Kumar Yadav

Tasks/AzureAppServiceManage/azureappservicemanage.ts

@@ -51,6 +51,7 @@ async function run() {
         endPoint["servicePrincipalKey"] = tl.getEndpointAuthorizationParameter(connectedServiceName, 'serviceprincipalkey', true);
         endPoint["tenantID"] = tl.getEndpointAuthorizationParameter(connectedServiceName, 'tenantid', true);
         endPoint["subscriptionId"] = tl.getEndpointDataParameter(connectedServiceName, 'subscriptionid', true);
+        endPoint["envAuthUrl"] = tl.getEndpointDataParameter(connectedServiceName, 'environmentAuthorityUrl', true);
         endPoint["url"] = tl.getEndpointUrl(connectedServiceName, true);
 
         if(resourceGroupName === null) {

Tasks/AzureAppServiceManage/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 2
+        "Patch": 3
     },
     "minimumAgentVersion": "1.102.0",
     "instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManage/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 2
+    "Patch": 3
   },
   "minimumAgentVersion": "1.102.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureFileCopy/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 84
+        "Patch": 86
     },
     "demands": [
         "azureps"

Tasks/AzureFileCopy/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 84
+    "Patch": 86
   },
   "demands": [
     "azureps"

Tasks/AzureNLBManagement/nlbazureutility.ts

@@ -5,13 +5,14 @@ import * as httpClient from 'vso-node-api/HttpClient';
 import * as restClient from 'vso-node-api/RestClient';
 
 var httpObj = new httpClient.HttpCallbackClient(tl.getVariable("AZURE_HTTP_USER_AGENT"));
-var authUrl = 'https://login.windows.net/';
+var defaultAuthUrl = 'https://login.windows.net/';
 var azureApiVersion = '2016-09-01';
 
 function getAccessToken(SPN, endpointUrl: string): Q.Promise<string> {
 
 	var deferred = Q.defer<string>();
-	var authorityUrl = authUrl + SPN.tenantID + "/oauth2/token/";
+	var envAuthUrl = (SPN.envAuthUrl) ? SPN.envAuthUrl : defaultAuthUrl;
+	var authorityUrl = envAuthUrl + SPN.tenantID + "/oauth2/token/";
 
 	var post_data = querystring.stringify({
 		resource: endpointUrl, 
@@ -43,7 +44,7 @@ function getAccessToken(SPN, endpointUrl: string): Q.Promise<string> {
 export async function getNetworkInterfacesInRG(SPN, endpointUrl: string, resourceGroupName: string) {
 
 	var deferred = Q.defer<any>();
-	var restUrl = "https://management.azure.com/subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces?api-version=" + azureApiVersion;
+	var restUrl = SPN.url + "subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces?api-version=" + azureApiVersion;
 	var accessToken = await getAccessToken(SPN, endpointUrl);
 
 	var requestHeader = {
@@ -69,7 +70,7 @@ export async function getNetworkInterfacesInRG(SPN, endpointUrl: string, resourc
 export async function getLoadBalancer(SPN, endpointUrl: string, name: string, resourceGroupName: string) {
 
 	var deferred = Q.defer<any>();    
-	var restUrl = "https://management.azure.com/subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/loadBalancers/" + name + "?api-version=" + azureApiVersion;
+	var restUrl = SPN.url + "subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/loadBalancers/" + name + "?api-version=" + azureApiVersion;
 	var accessToken = await getAccessToken(SPN, endpointUrl);
 
 	var requestHeader = {
@@ -94,7 +95,7 @@ export async function getLoadBalancer(SPN, endpointUrl: string, name: string, re
 
 export async function getNetworkInterface(SPN, endpointUrl, name: string, resourceGroupName: string) {
 	var deferred = Q.defer<any>();   
-	var restUrl = "https://management.azure.com/subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces/" + name + "?api-version=" + azureApiVersion;
+	var restUrl = SPN.url + "subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces/" + name + "?api-version=" + azureApiVersion;
 	var accessToken = await getAccessToken(SPN, endpointUrl);
 
 	var requestHeader = {
@@ -139,7 +140,7 @@ async function checkProvisioningState(url: string, accessToken: string) {
 export async function setNetworkInterface(SPN, endpointUrl: string, nic, resourceGroupName: string){
 
 	var deferred = Q.defer();   
-	var restUrl = "https://management.azure.com/subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces/" + nic.name + "?api-version=" + azureApiVersion;
+	var restUrl = SPN.url + "subscriptions/" + SPN.subscriptionId + "/resourceGroups/" + resourceGroupName + "/providers/Microsoft.Network/networkInterfaces/" + nic.name + "?api-version=" + azureApiVersion;
 	var accessToken = await getAccessToken(SPN, endpointUrl);
 	var requestHeader = {
 		"Content-Type": "application/json; charset=utf-8",

Tasks/AzureNLBManagement/nlbtask.ts

@@ -22,6 +22,8 @@ async function run() {
 		SPN["servicePrincipalKey"] = endPointAuthCreds.parameters["serviceprincipalkey"];
 		SPN["tenantID"] = endPointAuthCreds.parameters["tenantid"];
 		SPN["subscriptionId"] = tl.getEndpointDataParameter(connectedServiceName, 'subscriptionid', true);
+		SPN["envAuthUrl"] = tl.getEndpointDataParameter(connectedServiceName, 'environmentAuthorityUrl', true);
+		SPN["url"] = tl.getEndpointUrl(connectedServiceName, true);
 
 		var nicVm = await getNetworkInterface(SPN, endpointUrl, resourceGroupName);
 		tl.debug(`Network Interface - ${nicVm.name}'s configuration details fetched for the virtual machine ${process.env.COMPUTERNAME}`);

Tasks/AzureNLBManagement/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 2
+        "Patch": 3
     },
     "minimumAgentVersion": "1.95.0",
     "instanceNameFormat": "Azure Network Load Balancer: $(LoadBalancer) - $(Action)",

Tasks/AzureNLBManagement/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "minimumAgentVersion": "1.95.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzurePowerShell/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 113,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "azureps"