App Service - reuse kudu affinity cookie M147 (#9643)

vincent1173 · web-flow · commit 8ce17234cc30 · 2019-02-20T14:14:50.000+05:30
* resolved merge conflict

* log affinity-cookie

* log affinity in poll fn

* poll fn add
diff --git a/Tasks/AzureFunctionAppContainerV1/task.json b/Tasks/AzureFunctionAppContainerV1/task.json
@@ -19,7 +19,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 2
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureFunctionAppContainerV1/task.loc.json b/Tasks/AzureFunctionAppContainerV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 2
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureFunctionAppV1/task.json b/Tasks/AzureFunctionAppV1/task.json
@@ -19,7 +19,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 3
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureFunctionAppV1/task.loc.json b/Tasks/AzureFunctionAppV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureRmWebAppDeploymentV3/package-lock.json b/Tasks/AzureRmWebAppDeploymentV3/package-lock.json
diff --git a/Tasks/AzureRmWebAppDeploymentV3/task.json b/Tasks/AzureRmWebAppDeploymentV3/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 3,
         "Minor": 4,
-        "Patch": 21
+        "Patch": 22
     },
     "releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/AzureRmWebAppDeploymentV3/task.loc.json b/Tasks/AzureRmWebAppDeploymentV3/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 3,
     "Minor": 4,
-    "Patch": 21
+    "Patch": 22
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/AzureRmWebAppDeploymentV4/package-lock.json b/Tasks/AzureRmWebAppDeploymentV4/package-lock.json
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 3,
-        "Patch": 20
+        "Patch": 21
     },
     "releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 4,
     "Minor": 3,
-    "Patch": 20
+    "Patch": 21
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/AzureWebAppContainerV1/task.json b/Tasks/AzureWebAppContainerV1/task.json
@@ -19,7 +19,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 2
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureWebAppContainerV1/task.loc.json b/Tasks/AzureWebAppContainerV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 2
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/AzureWebAppV1/task.json b/Tasks/AzureWebAppV1/task.json
@@ -19,7 +19,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 3
     },
     "minimumAgentVersion": "2.104.1",
     "groups": [
diff --git a/Tasks/AzureWebAppV1/task.loc.json b/Tasks/AzureWebAppV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 3
   },
   "minimumAgentVersion": "2.104.1",
   "groups": [
diff --git a/Tasks/Common/AzureRmDeploy-common/azure-arm-rest/azure-arm-app-service-kudu.ts b/Tasks/Common/AzureRmDeploy-common/azure-arm-rest/azure-arm-app-service-kudu.ts
@@ -8,6 +8,7 @@ import { KUDU_DEPLOYMENT_CONSTANTS } from './constants';
 export class KuduServiceManagementClient {
     private _scmUri;
     private _accesssToken: string;
+    private _cookie: string[];
 
     constructor(scmUri: string, accessToken: string) {
         this._accesssToken = accessToken;
@@ -19,11 +20,21 @@ export class KuduServiceManagementClient {
         request.headers["Authorization"] = "Basic " + this._accesssToken;
         request.headers['Content-Type'] = contentType || 'application/json; charset=utf-8';
         
+        if(!!this._cookie) {
+            tl.debug(`setting affinity cookie ${JSON.stringify(this._cookie)}`);
+            request.headers['Cookie'] = this._cookie;
+        }
+
         let retryCount = reqOptions && util.isNumber(reqOptions.retryCount) ? reqOptions.retryCount : 5;
 
         while(retryCount >= 0) {
             try {
                 let httpResponse = await webClient.sendRequest(request, reqOptions);
+                if(httpResponse.headers['set-cookie'] && !this._cookie) {
+                    this._cookie = httpResponse.headers['set-cookie'];
+                    tl.debug(`loaded affinity cookie ${JSON.stringify(this._cookie)}`);
+                }
+                
                 return httpResponse;
             }
             catch(exception) {
@@ -594,12 +605,13 @@ export class Kudu {
         let httpRequest = new webClient.WebRequest();
         httpRequest.method = 'GET';
         httpRequest.uri = pollURL;
+        httpRequest.headers = {};
 
         while(true) {
             let response = await this._client.beginRequest(httpRequest);
             if(response.statusCode == 200 || response.statusCode == 202) {
                 var result = response.body;
-                tl.debug(`POLL URL RESULT: ${JSON.stringify(result)}`);
+                tl.debug(`POLL URL RESULT: ${JSON.stringify(response)}`);
                 if(result.status == KUDU_DEPLOYMENT_CONSTANTS.SUCCESS || result.status == KUDU_DEPLOYMENT_CONSTANTS.FAILED) {
                     return result;
                 }
diff --git a/Tasks/Common/azure-arm-rest/azure-arm-app-service-kudu.ts b/Tasks/Common/azure-arm-rest/azure-arm-app-service-kudu.ts
@@ -11,6 +11,7 @@ import { KUDU_DEPLOYMENT_CONSTANTS } from './constants';
 export class KuduServiceManagementClient {
     private _scmUri;
     private _accesssToken: string;
+    private _cookie: string[] = undefined;
 
     constructor(scmUri: string, accessToken: string) {
         this._accesssToken = accessToken;
@@ -24,11 +25,21 @@ export class KuduServiceManagementClient {
             request.headers['Content-Type'] = 'application/json; charset=utf-8';
         }
         
+        if(!!this._cookie) {
+            tl.debug(`setting affinity cookie ${JSON.stringify(this._cookie)}`);
+            request.headers['Cookie'] = this._cookie;
+        }
+
         let retryCount = reqOptions && util.isNumber(reqOptions.retryCount) ? reqOptions.retryCount : 5;
 
         while(retryCount >= 0) {
             try {
                 let httpResponse = await webClient.sendRequest(request, reqOptions);
+                if(httpResponse.headers['set-cookie'] && !this._cookie) {
+                    this._cookie = httpResponse.headers['set-cookie'];
+                    tl.debug(`loaded affinity cookie ${JSON.stringify(this._cookie)}`);
+                }
+
                 return httpResponse;
             }
             catch(exception) {
@@ -459,10 +470,9 @@ export class Kudu {
             }
             else if(response.statusCode == 202) {
                 let pollableURL: string = response.headers.location;
-                let affinityCookie: string [] = response.headers['set-cookie'];
                 if(!!pollableURL) {
                     tl.debug(`Polling for ZIP Deploy URL: ${pollableURL}`);
-                    return await this._getDeploymentDetailsFromPollURL(pollableURL, affinityCookie);
+                    return await this._getDeploymentDetailsFromPollURL(pollableURL);
                 }
                 else {
                     tl.debug('zip deploy returned 202 without pollable URL.');
@@ -496,10 +506,9 @@ export class Kudu {
             }
             else if(response.statusCode == 202) {
                 let pollableURL: string = response.headers.location;
-                let affinityCookie: string [] = response.headers['set-cookie'];
                 if(!!pollableURL) {
                     tl.debug(`Polling for War Deploy URL: ${pollableURL}`);
-                    return await this._getDeploymentDetailsFromPollURL(pollableURL, affinityCookie);
+                    return await this._getDeploymentDetailsFromPollURL(pollableURL);
                 }
                 else {
                     tl.debug('war deploy returned 202 without pollable URL.');
@@ -602,21 +611,17 @@ export class Kudu {
         }
     }
 
-    private async _getDeploymentDetailsFromPollURL(pollURL: string, affinityCookie?: string[]): Promise<any> {
+    private async _getDeploymentDetailsFromPollURL(pollURL: string): Promise<any> {
         let httpRequest = new webClient.WebRequest();
         httpRequest.method = 'GET';
         httpRequest.uri = pollURL;
         httpRequest.headers = {};
 
-        if(!!affinityCookie) {
-           httpRequest['set-cookie'] = affinityCookie; 
-        }
-
         while(true) {
             let response = await this._client.beginRequest(httpRequest);
             if(response.statusCode == 200 || response.statusCode == 202) {
                 var result = response.body;
-                tl.debug(`POLL URL RESULT: ${JSON.stringify(result)}`);
+                tl.debug(`POLL URL RESULT: ${JSON.stringify(response)}`);
                 if(result.status == KUDU_DEPLOYMENT_CONSTANTS.SUCCESS || result.status == KUDU_DEPLOYMENT_CONSTANTS.FAILED) {
                     return result;
                 }
