azure-pipelines-tasks-azurermdeploycommon 3.256.0 → 3.268.1

package/Tests/mock_utils.d.ts

@@ -1,5 +1,5 @@
-import { AzureEndpoint } from '../azure-arm-rest/azureModels';
 export declare var nock: any;
+import { AzureEndpoint } from '../azure-arm-rest/azureModels';
 export declare function getMockEndpoint(scheme?: string, msiClientId?: string): AzureEndpoint;
 export declare function mockAzureARMAppInsightsWebTests(): void;
 export declare function mockAzureApplicationInsightsTests(): void;

package/Tests/mock_utils.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mockAzureARMResourcesTests = exports.mockKuduServiceTests = exports.mockAzureAppServiceTests = exports.mockAzureApplicationInsightsTests = exports.mockAzureARMAppInsightsWebTests = exports.getMockEndpoint = exports.nock = void 0;
 const querystring = require("querystring");
-const azure_arm_common_1 = require("../azure-arm-rest/azure-arm-common");
 exports.nock = require('nock');
+const azure_arm_common_1 = require("../azure-arm-rest/azure-arm-common");
 function getMockEndpoint(scheme, msiClientId) {
     process.env["AZURE_HTTP_USER_AGENT"] = "TEST_AGENT";
     var endpoint = {
@@ -260,8 +260,8 @@ function mockAzureAppServiceTests() {
         }
     }).post("/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/Microsoft.Web/sites/MOCK_APP_SERVICE_NAME/publishxml?api-version=2016-08-01")
         .reply(200, `<publishData>
-    <publishProfile profileName="MOCK_APP_SERVICE_NAME - Web Deploy" publishMethod="MSDeploy" 
-        publishUrl="MOCK_APP_SERVICE_NAME.scm.azurewebsites.net:443" msdeploySite="MOCK_APP_SERVICE_NAME" 
+    <publishProfile profileName="MOCK_APP_SERVICE_NAME - Web Deploy" publishMethod="MSDeploy"
+        publishUrl="MOCK_APP_SERVICE_NAME.scm.azurewebsites.net:443" msdeploySite="MOCK_APP_SERVICE_NAME"
         userName="$MOCK_APP_SERVICE_NAME" userPWD="MOCK_APP_SERVICE_MSDEPLOY_PASSWORD" destinationAppUrl="http://MOCK_APP_SERVICE_NAME.azurewebsites.net">
     </publishProfile>
     </publishData>`).persist();

package/Tests/mock_utils.ts

@@ -1,8 +1,10 @@
-import { AzureEndpoint, WebTest, Scheme } from '../azure-arm-rest/azureModels';
-import * as querystring from "querystring";
-import { ApplicationTokenCredentials } from '../azure-arm-rest/azure-arm-common';
+import * as querystring from 'querystring';
+
 export var nock = require('nock');
 
+import { AzureEndpoint } from '../azure-arm-rest/azureModels';
+import { ApplicationTokenCredentials } from '../azure-arm-rest/azure-arm-common';
+
 export function getMockEndpoint(scheme?: string, msiClientId?: string) {
     process.env["AZURE_HTTP_USER_AGENT"] = "TEST_AGENT";
 
@@ -20,7 +22,7 @@ export function getMockEndpoint(scheme?: string, msiClientId?: string) {
         applicationTokenCredentials: new ApplicationTokenCredentials("MOCK_SPN_ID", "MOCK_TENANT_ID", "MOCK_SPN_KEY", "https://management.azure.com/",
         "https://login.windows.net/", "https://management.azure.com/", false, scheme, msiClientId)
     }
-    
+
     nock("https://login.windows.net", {
         reqheaders: {
             "content-type": "application/x-www-form-urlencoded; charset=utf-8"
@@ -32,9 +34,9 @@ export function getMockEndpoint(scheme?: string, msiClientId?: string) {
         grant_type: "client_credentials",
         client_secret: "MOCK_SPN_KEY"
     }))
-    .reply(200, { 
+    .reply(200, {
         access_token: "DUMMY_ACCESS_TOKEN"
-    }).persist(); 
+    }).persist();
 
     let apiVersion = "2018-02-01";
     let msiClientIdUrl =  msiClientId ? "&client_id=" + msiClientId : "";
@@ -45,7 +47,7 @@ export function getMockEndpoint(scheme?: string, msiClientId?: string) {
           }
     })
     .get("/oauth2/token?resource=https://management.azure.com/")
-    .reply(200, { 
+    .reply(200, {
         access_token: "DUMMY_ACCESS_TOKEN"
     }).persist();
 
@@ -60,7 +62,7 @@ export function mockAzureARMAppInsightsWebTests() {
         name: 'MOCK_TEST_1',
         id: "hidden-link:/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_1".toLowerCase()
     };
-    
+
     var MockWebTest2 = {
         type: '',
         location: '',
@@ -104,8 +106,8 @@ export function mockAzureApplicationInsightsTests() {
             "content-type": "application/json; charset=utf-8"
         }
     }).get("/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME?api-version=2015-05-01")
-    .reply(200, { 
-        id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME", 
+    .reply(200, {
+        id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME",
         name: "MOCK_APP_INSIGHTS_NAME",
         type: "microsoft.insights/components",
         tags: {},
@@ -127,8 +129,8 @@ export function mockAzureApplicationInsightsTests() {
             "content-type": "application/json; charset=utf-8"
         }
     }).put("/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME?api-version=2015-05-01")
-    .reply(200, { 
-        id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME", 
+    .reply(200, {
+        id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.insights/components/MOCK_APP_INSIGHTS_NAME",
         name: "MOCK_APP_INSIGHTS_NAME",
         type: "microsoft.insights/components",
         tags: {},
@@ -231,7 +233,7 @@ export function mockAzureAppServiceTests() {
             state: "Running"
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -257,7 +259,7 @@ export function mockAzureAppServiceTests() {
             state: "Stopped"
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -283,12 +285,12 @@ export function mockAzureAppServiceTests() {
         }
     }).post("/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/Microsoft.Web/sites/MOCK_APP_SERVICE_NAME/publishxml?api-version=2016-08-01")
     .reply(200,`<publishData>
-    <publishProfile profileName="MOCK_APP_SERVICE_NAME - Web Deploy" publishMethod="MSDeploy" 
-        publishUrl="MOCK_APP_SERVICE_NAME.scm.azurewebsites.net:443" msdeploySite="MOCK_APP_SERVICE_NAME" 
+    <publishProfile profileName="MOCK_APP_SERVICE_NAME - Web Deploy" publishMethod="MSDeploy"
+        publishUrl="MOCK_APP_SERVICE_NAME.scm.azurewebsites.net:443" msdeploySite="MOCK_APP_SERVICE_NAME"
         userName="$MOCK_APP_SERVICE_NAME" userPWD="MOCK_APP_SERVICE_MSDEPLOY_PASSWORD" destinationAppUrl="http://MOCK_APP_SERVICE_NAME.azurewebsites.net">
     </publishProfile>
     </publishData>`).persist();
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -315,7 +317,7 @@ export function mockAzureAppServiceTests() {
             scmUri: "https://$v:MOCK_APP_SERVICE_MSDEPLOY_PASSWORD@MOCK_APP_SERVICE_NAME.scm.azurewebsites.net"
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -341,7 +343,7 @@ export function mockAzureAppServiceTests() {
             "MSDEPLOY_RENAME_LOCKED_FILES": "1"
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -379,7 +381,7 @@ export function mockAzureAppServiceTests() {
             "MSDEPLOY_RENAME_LOCKED_FILES": "0"
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -404,7 +406,7 @@ export function mockAzureAppServiceTests() {
             "alwaysOn": false
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -440,7 +442,7 @@ export function mockAzureAppServiceTests() {
             "alwaysOn": true
         }
     }).persist();;
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -490,7 +492,7 @@ export function mockAzureAppServiceTests() {
             "VSTSRM_ReleaseDefinitionId": 1
         }
     }).persist();
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -498,7 +500,7 @@ export function mockAzureAppServiceTests() {
         }
     }).post("/subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/Microsoft.Web/sites/MOCK_APP_SERVICE_NAME/slots/MOCK_SLOT_NAME/config/metadata/list?api-version=2016-08-01")
     .reply(501, 'internal error occurred').persist();
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -515,7 +517,7 @@ export function mockAzureAppServiceTests() {
             "VSTSRM_ReleaseDefinitionId": 1
         }
     }).persist();
-    
+
     nock('https://management.azure.com', {
         reqheaders: {
             "authorization": "Bearer DUMMY_ACCESS_TOKEN",
@@ -547,16 +549,16 @@ export function mockKuduServiceTests() {
     nock('http://MOCK_SCM_WEBSITE').
     post('/api/continuouswebjobs/MOCK_JOB_NAME/start')
     .reply(200, {name: "CONT_2", status: "Running", runCommand: "hello.cmd", type: "continuous"});
-    
-    
+
+
     nock('http://FAIL_MOCK_SCM_WEBSITE').
     post('/api/continuouswebjobs/MOCK_JOB_NAME/start').reply(501, 'Internal error occured');
 
     nock('http://MOCK_SCM_WEBSITE').
     post('/api/continuouswebjobs/MOCK_JOB_NAME/stop')
     .reply(200, {name: "CONT_1", status: "Stopped", runCommand: "hello.cmd", type: "continuous"});
-    
-    
+
+
     nock('http://FAIL_MOCK_SCM_WEBSITE').
     post('/api/continuouswebjobs/MOCK_JOB_NAME/stop').reply(501, 'Internal error occured');
 
@@ -665,8 +667,8 @@ export function mockAzureARMResourcesTests() {
         }
     }).get("/subscriptions/MOCK_SUBSCRIPTION_ID/resources?$filter=resourceType%20EQ%20%27Microsoft.Web%2Fsites%27%20AND%20name%20EQ%20%27g%C3%B6m-mig-fr%C3%A5n-omv%C3%A4rlden%27&api-version=2016-07-01")
     .reply(200, {
-        value: [{ 
-            id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.web/sites/göm-mig-från-omvär", 
+        value: [{
+            id: "subscriptions/MOCK_SUBSCRIPTION_ID/resourceGroups/MOCK_RESOURCE_GROUP_NAME/providers/microsoft.web/sites/göm-mig-från-omvär",
             name: "MOCK_APP_INSIGHTS_NAME",
             type: "microsoft.insights/components",
             tags: {},

package/azure-arm-rest/AzureServiceClient.ts

@@ -1,4 +1,5 @@
 import tl = require('azure-pipelines-task-lib/task');
+
 import msRestAzure = require("./azure-arm-common");
 import webClient = require("./webClient");
 
@@ -144,7 +145,7 @@ export class ServiceClient {
                 || exceptionString.indexOf("unable to verify the first certificate") != -1
                 || exceptionString.indexOf("unable to get local issuer certificate") != -1) {
                     tl.warning(tl.loc('ASE_SSLIssueRecommendation'));
-            } 
+            }
 
             throw exception;
         }
@@ -261,7 +262,7 @@ export class ServiceClient {
     public getFormattedError(error: any): string {
         if(error && error.message) {
             if(error.statusCode) {
-                var errorMessage = typeof error.message.valueOf() == 'string' ? error.message 
+                var errorMessage = typeof error.message.valueOf() == 'string' ? error.message
                     : (error.message.Code || error.message.code) + " - " + (error.message.Message || error.message.message)
                 error.message = `${errorMessage} (CODE: ${error.statusCode})`
             }

package/azure-arm-rest/azure-arm-endpoint.d.ts

@@ -1,4 +1,4 @@
-import { AzureEndpoint } from "./azureModels";
+import { AzureEndpoint } from './azureModels';
 export declare class AzureRMEndpoint {
     endpoint: AzureEndpoint;
     private _connectedServiceName;

package/azure-arm-rest/azure-arm-endpoint.js

@@ -10,13 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dispose = exports.AzureRMEndpoint = void 0;
+const fs = require("fs");
+const path = require("path");
 const tl = require("azure-pipelines-task-lib/task");
 const Q = require("q");
-const webClient = require("./webClient");
 const azure_arm_common_1 = require("./azure-arm-common");
 const constants = require("./constants");
-const fs = require("fs");
-const path = require("path");
+const webClient = require("./webClient");
 const certFilePath = path.join(tl.getVariable('Agent.TempDirectory'), 'spnCert.pem');
 class AzureRMEndpoint {
     constructor(connectedServiceName) {

package/azure-arm-rest/azure-arm-endpoint.ts

@@ -1,11 +1,14 @@
+import fs = require('fs');
+import path = require('path');
+
 import tl = require('azure-pipelines-task-lib/task');
 import Q = require('q');
-import webClient = require("./webClient");
-import { AzureEndpoint } from "./azureModels";
+
+import { AzureEndpoint } from './azureModels';
 import { ApplicationTokenCredentials } from './azure-arm-common';
 import constants = require('./constants');
-import fs = require('fs');
-import path = require('path');
+import webClient = require('./webClient');
+
 const certFilePath: string = path.join(tl.getVariable('Agent.TempDirectory'), 'spnCert.pem');
 
 export class AzureRMEndpoint {
@@ -36,7 +39,7 @@ export class AzureRMEndpoint {
                 if (resourceIdSplit.length < 9) {
                     throw new Error(tl.loc('SpecifiedAzureRmEndpointIsInvalid', ''));
                 }
-    
+
                 this.endpoint = {
                     subscriptionName: tl.getEndpointDataParameter(this._connectedServiceName, 'subscriptionname', true),
                     tenantID: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'tenantid', false),

package/azure-arm-rest/azure-arm-resource.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deployments = exports.ResourceGroups = exports.Resources = exports.ResourceManagementClient = void 0;
+const tl = require("azure-pipelines-task-lib/task");
 const AzureServiceClient_1 = require("./AzureServiceClient");
 const azureServiceClient = require("./AzureServiceClient");
 const webClient = require("./webClient");
-const tl = require("azure-pipelines-task-lib/task");
 class ResourceManagementClient extends azureServiceClient.ServiceClient {
     constructor(credentials, subscriptionId, options) {
         super(credentials, subscriptionId);

package/azure-arm-rest/azure-arm-resource.ts

@@ -1,10 +1,10 @@
+import tl = require('azure-pipelines-task-lib/task');
+
 import { ToError, ServiceClient } from './AzureServiceClient';
 import { AzureEndpoint } from './azureModels';
 import msRestAzure = require('./azure-arm-common');
 import azureServiceClient = require('./AzureServiceClient');
 import webClient = require('./webClient');
-import tl = require('azure-pipelines-task-lib/task');
-import Q = require('q');
 
 export class ResourceManagementClient extends azureServiceClient.ServiceClient {
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-azurermdeploycommon",
-    "version": "3.256.0",
+    "version": "3.268.1",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",
@@ -22,7 +22,7 @@
         "@types/q": "1.0.7",
         "archiver": "2.1.1",
         "azure-pipelines-task-lib": "^4.17.0",
-        "jsonwebtoken": "^9.0.2",
+        "jsonwebtoken": "^9.0.3",
         "ltx": "2.6.2",
         "node-stream-zip": "1.7.0",
         "q": "1.5.1",

package/webdeployment-common/webconfigutil.js

@@ -4,7 +4,6 @@ exports.addWebConfigFile = exports.generateWebConfigFile = void 0;
 const tl = require("azure-pipelines-task-lib/task");
 const fs = require("fs");
 const path = require("path");
-const util = require("util");
 function generateWebConfigFile(webConfigTargetPath, appType, substitutionParameters) {
     // Get the template path for the given appType
     var webConfigTemplatePath = path.join(__dirname, '../WebConfigTemplates', appType.toLowerCase());
@@ -93,16 +92,16 @@ function addWebConfigFile(folderPath, webConfigParameters, rootDirectoryPath) {
                 }
             }
             else if (appType == 'Go') {
-                if (util.isNullOrUndefined(webConfigParameters['GoExeFileName'])
-                    || util.isNullOrUndefined(webConfigParameters['GoExeFileName'].value)
+                if (webConfigParameters['GoExeFileName'] === null || webConfigParameters['GoExeFileName'] === undefined
+                    || webConfigParameters['GoExeFileName'].value === null || webConfigParameters['GoExeFileName'].value === undefined
                     || webConfigParameters['GoExeFileName'].value.length <= 0) {
                     throw Error(tl.loc('GoExeNameNotPresent'));
                 }
                 selectedAppTypeParams['GoExeFilePath'] = rootDirectoryPath + "\\" + webConfigParameters['GoExeFileName'].value;
             }
             else if (appType == 'java_springboot') {
-                if (util.isNullOrUndefined(webConfigParameters['JAR_PATH'])
-                    || util.isNullOrUndefined(webConfigParameters['JAR_PATH'].value)
+                if (webConfigParameters['JAR_PATH'] === null || webConfigParameters['JAR_PATH'] === undefined
+                    || webConfigParameters['JAR_PATH'].value === null || webConfigParameters['JAR_PATH'].value === undefined
                     || webConfigParameters['JAR_PATH'].value.length <= 0) {
                     throw Error(tl.loc('JarPathNotPresent'));
                 }

package/webdeployment-common/webconfigutil.ts

@@ -94,15 +94,15 @@ export function addWebConfigFile(folderPath: any, webConfigParameters, rootDirec
                     selectedAppTypeParams['DJANGO_SETTINGS_MODULE'] = getDjangoSettingsFile(folderPath);
                 }
             } else if(appType == 'Go') {
-                if (util.isNullOrUndefined(webConfigParameters['GoExeFileName'])
-                        || util.isNullOrUndefined(webConfigParameters['GoExeFileName'].value) 
+                if (webConfigParameters['GoExeFileName'] === null || webConfigParameters['GoExeFileName'] === undefined
+                        || webConfigParameters['GoExeFileName'].value === null || webConfigParameters['GoExeFileName'].value === undefined 
                         || webConfigParameters['GoExeFileName'].value.length <=0) {
                     throw Error(tl.loc('GoExeNameNotPresent'));
                 }
                 selectedAppTypeParams['GoExeFilePath'] = rootDirectoryPath + "\\" + webConfigParameters['GoExeFileName'].value;
             } else if(appType == 'java_springboot') {
-                if (util.isNullOrUndefined(webConfigParameters['JAR_PATH'])
-                || util.isNullOrUndefined(webConfigParameters['JAR_PATH'].value) 
+                if (webConfigParameters['JAR_PATH'] === null || webConfigParameters['JAR_PATH'] === undefined
+                || webConfigParameters['JAR_PATH'].value === null || webConfigParameters['JAR_PATH'].value === undefined 
                 || webConfigParameters['JAR_PATH'].value.length <= 0) {
                     throw Error(tl.loc('JarPathNotPresent'));
                 }