From 41101449820887c0463deb34541bd2efbd43c157 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Fri, 9 Mar 2018 17:10:52 +0530 Subject: [PATCH 01/25] MSI node changes --- .../resources.resjson/en-US/resources.resjson | 1 + .../Common/azure-arm-rest/azure-arm-common.ts | 56 ++++++++++++++++--- .../azure-arm-rest/azure-arm-endpoint.ts | 2 + Tasks/Common/azure-arm-rest/azureModels.ts | 2 + Tasks/Common/azure-arm-rest/module.json | 1 + Tasks/Common/azure-arm-rest/package-lock.json | 2 +- 6 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson index 4e51ed5cdc62..e72f37846172 100644 --- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson @@ -5,6 +5,7 @@ "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: %s, status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index 172fb8d74fb9..e77e229ad230 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -11,19 +11,24 @@ export class ApplicationTokenCredentials { public authorityUrl: string; public activeDirectoryResourceId: string; public isAzureStackEnvironment: boolean; + public scheme: string; + public msiPort: string; private token_deferred: Q.Promise; - constructor(clientId: string, domain: string, secret: string, baseUrl: string, authorityUrl: string, activeDirectoryResourceId: string, isAzureStackEnvironment: boolean) { - if (!Boolean(clientId) || typeof clientId.valueOf() !== 'string') { - throw new Error(tl.loc("ClientIdCannotBeEmpty")); - } + constructor(clientId: string, domain: string, secret: string, baseUrl: string, authorityUrl: string, activeDirectoryResourceId: string, isAzureStackEnvironment: boolean, scheme?: string, msiPort?: string) { if (!Boolean(domain) || typeof domain.valueOf() !== 'string') { throw new Error(tl.loc("DomainCannotBeEmpty")); } - if (!Boolean(secret) || typeof secret.valueOf() !== 'string') { - throw new Error(tl.loc("SecretCannotBeEmpty")); + if((!scheme ||scheme ==='ServicePrincipal')){ + if (!Boolean(clientId) || typeof clientId.valueOf() !== 'string') { + throw new Error(tl.loc("ClientIdCannotBeEmpty")); + } + + if (!Boolean(secret) || typeof secret.valueOf() !== 'string') { + throw new Error(tl.loc("SecretCannotBeEmpty")); + } } if (!Boolean(baseUrl) || typeof baseUrl.valueOf() !== 'string') { @@ -49,11 +54,20 @@ export class ApplicationTokenCredentials { this.authorityUrl = authorityUrl; this.activeDirectoryResourceId = activeDirectoryResourceId; this.isAzureStackEnvironment = isAzureStackEnvironment; + this.scheme = scheme; + this.msiPort = msiPort; } public getToken(force?: boolean): Q.Promise { if (!this.token_deferred || force) { - this.token_deferred = this.getAuthorizationToken(); + if(this.scheme && this.scheme === "MSI") + { + this.token_deferred = this._getMSIAuthorizationToken(); + } + else + { + this.token_deferred = this._getSPNAuthorizationToken(); + } } return this.token_deferred; @@ -67,9 +81,35 @@ export class ApplicationTokenCredentials { return this.clientId; } - private getAuthorizationToken(): Q.Promise { + private _getMSIAuthorizationToken(): Q.Promise { var deferred = Q.defer(); + let webRequest = new webClient.WebRequest(); + webRequest.method = "GET"; + let port = this.msiPort ? this.msiPort : '50342'; + webRequest.uri = "http://localhost:"+ port + "/oauth2/token?resource="+ this.baseUrl; + webRequest.headers = { + "Metadata": true + }; + webClient.sendRequest(webRequest).then( + (response: webClient.WebResponse) => { + if (response.statusCode == 200) { + deferred.resolve(response.body.access_token); + } + else { + deferred.reject(tl.loc('CouldNotFetchAccessTokenforMSIStatusCode', response.statusCode, response.statusMessage)); + } + }, + (error) => { + deferred.reject(error) + } + ); + + return deferred.promise; + } + + private _getSPNAuthorizationToken(): Q.Promise { + var deferred = Q.defer(); let webRequest = new webClient.WebRequest(); webRequest.method = "POST"; webRequest.uri = this.authorityUrl + this.domain + "/oauth2/token/"; diff --git a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts index 92fa9423f56e..0e365ebae033 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts @@ -34,6 +34,8 @@ export class AzureRMEndpoint { tenantID: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'tenantid', false), url: tl.getEndpointUrl(this._connectedServiceName, true), environment: tl.getEndpointDataParameter(this._connectedServiceName, 'environment', true), + scheme: tl.getEndpointAuthorizationScheme(this._connectedServiceName, true), + msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', true), activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true) } as AzureEndpoint; diff --git a/Tasks/Common/azure-arm-rest/azureModels.ts b/Tasks/Common/azure-arm-rest/azureModels.ts index cec697d7baf8..0fb931cb0e1c 100644 --- a/Tasks/Common/azure-arm-rest/azureModels.ts +++ b/Tasks/Common/azure-arm-rest/azureModels.ts @@ -215,6 +215,8 @@ export interface AzureEndpoint { portalEndpoint?: string; AzureKeyVaultDnsSuffix?: string; AzureKeyVaultServiceEndpointResourceId?: string; + msiPort?: string; + scheme?: string; applicationTokenCredentials: ApplicationTokenCredentials; } diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json index 9122c04efb40..cbd70ba61121 100644 --- a/Tasks/Common/azure-arm-rest/module.json +++ b/Tasks/Common/azure-arm-rest/module.json @@ -6,6 +6,7 @@ "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: %s, status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/package-lock.json b/Tasks/Common/azure-arm-rest/package-lock.json index b28f47aca8cb..06b8ccba1676 100644 --- a/Tasks/Common/azure-arm-rest/package-lock.json +++ b/Tasks/Common/azure-arm-rest/package-lock.json @@ -26,7 +26,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { "brace-expansion": "1.1.8" } From 691133fa3a2569367426a05887161ab13b2312f1 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Fri, 9 Mar 2018 18:04:41 +0530 Subject: [PATCH 02/25] msi changes argument pass --- Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts index 0e365ebae033..01dfe53de817 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts @@ -35,7 +35,7 @@ export class AzureRMEndpoint { url: tl.getEndpointUrl(this._connectedServiceName, true), environment: tl.getEndpointDataParameter(this._connectedServiceName, 'environment', true), scheme: tl.getEndpointAuthorizationScheme(this._connectedServiceName, true), - msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', true), + msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', false), activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true) } as AzureEndpoint; @@ -48,7 +48,7 @@ export class AzureRMEndpoint { } this.endpoint.applicationTokenCredentials = new ApplicationTokenCredentials(this.endpoint.servicePrincipalClientID, this.endpoint.tenantID, this.endpoint.servicePrincipalKey, - this.endpoint.url, this.endpoint.environmentAuthorityUrl, this.endpoint.activeDirectoryResourceID, this.endpoint.environment.toLowerCase() == constants.AzureEnvironments.AzureStack); + this.endpoint.url, this.endpoint.environmentAuthorityUrl, this.endpoint.activeDirectoryResourceID, this.endpoint.environment.toLowerCase() == constants.AzureEnvironments.AzureStack, this.endpoint.scheme, this.endpoint.msiPort); } return this.endpoint; From 074bd5838d6ea4d2f293ee0d5a85ad7811270726 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Mon, 19 Mar 2018 12:12:33 +0530 Subject: [PATCH 03/25] review incoporated --- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 8 ++++---- Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts | 6 +++--- Tasks/Common/azure-arm-rest/azureModels.ts | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index e77e229ad230..2624d32297ad 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -2,6 +2,7 @@ import tl = require('vsts-task-lib/task'); import Q = require('q'); import querystring = require('querystring'); import webClient = require("./webClient"); +import AzureModels = require("./azureModels"); export class ApplicationTokenCredentials { private clientId: string; @@ -55,12 +56,12 @@ export class ApplicationTokenCredentials { this.activeDirectoryResourceId = activeDirectoryResourceId; this.isAzureStackEnvironment = isAzureStackEnvironment; this.scheme = scheme; - this.msiPort = msiPort; + this.msiPort = msiPort ? msiPort : '50342'; } public getToken(force?: boolean): Q.Promise { if (!this.token_deferred || force) { - if(this.scheme && this.scheme === "MSI") + if(this.scheme && this.scheme === AzureModels.scheme.ManagedServiceIdentity.toString()) { this.token_deferred = this._getMSIAuthorizationToken(); } @@ -85,8 +86,7 @@ export class ApplicationTokenCredentials { var deferred = Q.defer(); let webRequest = new webClient.WebRequest(); webRequest.method = "GET"; - let port = this.msiPort ? this.msiPort : '50342'; - webRequest.uri = "http://localhost:"+ port + "/oauth2/token?resource="+ this.baseUrl; + webRequest.uri = "http://localhost:"+ this.msiPort + "/oauth2/token?resource="+ this.baseUrl; webRequest.headers = { "Metadata": true }; diff --git a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts index 01dfe53de817..ca7af2d903dc 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts @@ -28,14 +28,14 @@ export class AzureRMEndpoint { this.endpoint = { subscriptionID: tl.getEndpointDataParameter(this._connectedServiceName, 'subscriptionid', true), subscriptionName: tl.getEndpointDataParameter(this._connectedServiceName, 'subscriptionname', true), - servicePrincipalClientID: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'serviceprincipalid', false), - servicePrincipalKey: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'serviceprincipalkey', false), + servicePrincipalClientID: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'serviceprincipalid', true), + servicePrincipalKey: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'serviceprincipalkey', true), environmentAuthorityUrl: tl.getEndpointDataParameter(this._connectedServiceName, 'environmentAuthorityUrl', true), tenantID: tl.getEndpointAuthorizationParameter(this._connectedServiceName, 'tenantid', false), url: tl.getEndpointUrl(this._connectedServiceName, true), environment: tl.getEndpointDataParameter(this._connectedServiceName, 'environment', true), scheme: tl.getEndpointAuthorizationScheme(this._connectedServiceName, true), - msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', false), + msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', true), activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true) } as AzureEndpoint; diff --git a/Tasks/Common/azure-arm-rest/azureModels.ts b/Tasks/Common/azure-arm-rest/azureModels.ts index 0fb931cb0e1c..39c2e5059489 100644 --- a/Tasks/Common/azure-arm-rest/azureModels.ts +++ b/Tasks/Common/azure-arm-rest/azureModels.ts @@ -166,6 +166,11 @@ export enum ComputeResourceType { VirtualMachineScaleSet } +export enum scheme { + ManagedServiceIdentity, + SPN +} + export interface StorageAccountSku { name: string; tier?: string; From 9d632b24c16f44d037922db610641a63da17a239 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Fri, 13 Apr 2018 16:51:13 +0530 Subject: [PATCH 04/25] aftet review incorprated --- .../package-lock.json | 254 +++++++++--------- 1 file changed, 124 insertions(+), 130 deletions(-) diff --git a/Tasks/JenkinsDownloadArtifacts/package-lock.json b/Tasks/JenkinsDownloadArtifacts/package-lock.json index 2424ad52d2d9..bcbe5cf804cc 100644 --- a/Tasks/JenkinsDownloadArtifacts/package-lock.json +++ b/Tasks/JenkinsDownloadArtifacts/package-lock.json @@ -24,9 +24,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", @@ -34,9 +34,9 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "artifact-engine": { - "version": "0.1.18", - "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.18.tgz", - "integrity": "sha512-91KWT9tA5SdVpuCpoJlCMpIVQGVSu8Rc4MI2gXWVQa/pZC67uks9ZnpkXa8ZPYFgRJ0I6tJ2itCFUtoKrqn2gg==", + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.19.tgz", + "integrity": "sha512-G78LODsUaA84RDjKZdUsLUlvZh/ZjdI9Y3ISeeUlQl6atVhtf3k87TwLJqvWg6I19/MQ8I7bq3rDoOgPiVTKCg==", "requires": { "handlebars": "4.0.10", "minimatch": "3.0.2", @@ -88,12 +88,9 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", - "integrity": "sha1-054L7kEs7Q6O2Uoj4xTzE6lbn9E=", - "requires": { - "lru-cache": "4.1.1" - } + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", @@ -164,18 +161,6 @@ "validator": "3.35.0", "xml2js": "0.2.7", "xmlbuilder": "0.4.3" - }, - "dependencies": { - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, - "validator": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", - "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" - } } }, "balanced-match": { @@ -183,6 +168,15 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, "binary": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", @@ -296,12 +290,9 @@ } }, "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "requires": { - "graceful-readlink": "1.0.1" - } + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" }, "concat-map": { "version": "0.0.1", @@ -322,9 +313,9 @@ } }, "dashdash": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", - "integrity": "sha1-KeSGxUGL8PNWA0qZPVFoajPoQUE=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { "assert-plus": "1.0.0" }, @@ -385,7 +376,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.0" + "jsbn": "0.1.1" } }, "escape-string-regexp": { @@ -399,9 +390,9 @@ "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=" }, "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "forever-agent": { "version": "0.6.1", @@ -415,7 +406,7 @@ "requires": { "async": "2.6.0", "combined-stream": "1.0.6", - "mime-types": "2.1.11" + "mime-types": "2.1.18" }, "dependencies": { "async": { @@ -423,7 +414,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } } } @@ -452,9 +443,9 @@ } }, "getpass": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", - "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { "assert-plus": "1.0.0" }, @@ -471,11 +462,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, "handlebars": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", @@ -493,8 +479,8 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "requires": { "chalk": "1.1.3", - "commander": "2.9.0", - "is-my-json-valid": "2.13.1", + "commander": "2.15.1", + "is-my-json-valid": "2.17.2", "pinkie-promise": "2.0.1" } }, @@ -503,7 +489,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.0.0" + "ansi-regex": "2.1.1" } }, "hash-base": { @@ -537,8 +523,8 @@ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "requires": { "assert-plus": "0.2.0", - "jsprim": "1.2.2", - "sshpk": "1.8.3" + "jsprim": "1.4.1", + "sshpk": "1.14.1" } }, "inherits": { @@ -551,14 +537,20 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, + "is-my-ip-valid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", + "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==" + }, "is-my-json-valid": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", - "integrity": "sha1-1Vd4qC/rawlj/0vhEdXRaE6JBwc=", + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", + "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", - "jsonpointer": "2.0.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", "xtend": "4.0.1" } }, @@ -582,19 +574,10 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "jodid25519": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", - "optional": true, - "requires": { - "jsbn": "0.1.0" - } - }, "jsbn": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", - "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "optional": true }, "json-edm-parser": { @@ -606,9 +589,9 @@ } }, "json-schema": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", - "integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY=" + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-stringify-safe": { "version": "5.0.1", @@ -629,18 +612,26 @@ "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=" }, "jsonpointer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", - "integrity": "sha1-OvHdIP6FRjkQ1GmjheMwF9KgMNk=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=" }, "jsprim": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", - "integrity": "sha1-8gyQaskqvVjjt5rIvHCkiDJRLaE=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { - "extsprintf": "1.0.2", - "json-schema": "0.2.2", - "verror": "1.3.6" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } } }, "kind-of": { @@ -658,24 +649,15 @@ "optional": true }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -686,16 +668,16 @@ } }, "mime-db": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=" + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" }, "mime-types": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "integrity": "sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.23.0" + "mime-db": "1.33.0" } }, "minimatch": { @@ -761,10 +743,10 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "q": { "version": "1.4.1", @@ -800,7 +782,7 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.3.2", + "aws4": "1.7.0", "bl": "1.1.2", "caseless": "0.11.0", "combined-stream": "1.0.6", @@ -813,12 +795,12 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.11", + "mime-types": "2.1.18", "node-uuid": "1.4.8", "oauth-sign": "0.8.2", "qs": "6.2.3", "stringstream": "0.0.5", - "tough-cookie": "2.3.1", + "tough-cookie": "2.3.4", "tunnel-agent": "0.4.3" }, "dependencies": { @@ -880,18 +862,18 @@ } }, "sshpk": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", - "integrity": "sha1-iQzJ1hTcUpLlyxpUOwPJq6pcN04=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", - "dashdash": "1.14.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", "ecc-jsbn": "0.1.1", - "getpass": "0.1.6", - "jodid25519": "1.0.2", - "jsbn": "0.1.0", - "tweetnacl": "0.13.3" + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" }, "dependencies": { "assert-plus": { @@ -916,7 +898,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -943,9 +925,12 @@ } }, "tough-cookie": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", - "integrity": "sha1-mcd9+7fYBCSeiimdTLD9gf7wg/0=" + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "1.4.1" + } }, "traverse": { "version": "0.3.9", @@ -963,9 +948,9 @@ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" }, "tweetnacl": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", - "integrity": "sha1-1ii1bzvMPVrnS6nUwacE3vWrS1Y=", + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "optional": true }, "typed-rest-client": { @@ -1022,12 +1007,26 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, + "validator": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", + "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" + }, "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "extsprintf": "1.0.2" + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } } }, "vsts-task-lib": { @@ -1072,11 +1071,6 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", From c0456bdaf78c2b2d860274539f9661915f2a00bf Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 29 Mar 2018 13:40:19 +0530 Subject: [PATCH 05/25] After camelcase for enum name --- .../Strings/resources.resjson/en-US/resources.resjson | 4 ++-- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 6 +++--- Tasks/Common/azure-arm-rest/azureModels.ts | 2 +- Tasks/Common/azure-arm-rest/module.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson index e72f37846172..1e6471f26766 100644 --- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson @@ -4,8 +4,8 @@ "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.", "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", - "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: '%s', status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index 2624d32297ad..b507b729923a 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -12,7 +12,7 @@ export class ApplicationTokenCredentials { public authorityUrl: string; public activeDirectoryResourceId: string; public isAzureStackEnvironment: boolean; - public scheme: string; + public scheme: number; public msiPort: string; private token_deferred: Q.Promise; @@ -55,13 +55,13 @@ export class ApplicationTokenCredentials { this.authorityUrl = authorityUrl; this.activeDirectoryResourceId = activeDirectoryResourceId; this.isAzureStackEnvironment = isAzureStackEnvironment; - this.scheme = scheme; + this.scheme = AzureModels.Scheme[scheme]; this.msiPort = msiPort ? msiPort : '50342'; } public getToken(force?: boolean): Q.Promise { if (!this.token_deferred || force) { - if(this.scheme && this.scheme === AzureModels.scheme.ManagedServiceIdentity.toString()) + if(this.scheme === AzureModels.Scheme.ManagedServiceIdentity) { this.token_deferred = this._getMSIAuthorizationToken(); } diff --git a/Tasks/Common/azure-arm-rest/azureModels.ts b/Tasks/Common/azure-arm-rest/azureModels.ts index 39c2e5059489..d62d1c5f7d35 100644 --- a/Tasks/Common/azure-arm-rest/azureModels.ts +++ b/Tasks/Common/azure-arm-rest/azureModels.ts @@ -166,7 +166,7 @@ export enum ComputeResourceType { VirtualMachineScaleSet } -export enum scheme { +export enum Scheme { ManagedServiceIdentity, SPN } diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json index cbd70ba61121..1cef2f8098e5 100644 --- a/Tasks/Common/azure-arm-rest/module.json +++ b/Tasks/Common/azure-arm-rest/module.json @@ -5,8 +5,8 @@ "SecretCannotBeEmpty": "secret must be a non empty string.", "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", - "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: '%s', status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "InvalidValue": "%s is not a valid value. The valid values are: %s", From 2e0243ebc96fa34965f326390c0207f47b0b13f4 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Mon, 2 Apr 2018 12:58:56 +0530 Subject: [PATCH 06/25] proper identation --- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index b507b729923a..f7cf1b73dd6d 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -93,10 +93,12 @@ export class ApplicationTokenCredentials { webClient.sendRequest(webRequest).then( (response: webClient.WebResponse) => { - if (response.statusCode == 200) { + if (response.statusCode == 200) + { deferred.resolve(response.body.access_token); } - else { + else + { deferred.reject(tl.loc('CouldNotFetchAccessTokenforMSIStatusCode', response.statusCode, response.statusMessage)); } }, @@ -125,10 +127,12 @@ export class ApplicationTokenCredentials { webClient.sendRequest(webRequest).then( (response: webClient.WebResponse) => { - if (response.statusCode == 200) { + if (response.statusCode == 200) + { deferred.resolve(response.body.access_token); } - else { + else + { deferred.reject(tl.loc('CouldNotFetchAccessTokenforAzureStatusCode', response.statusCode, response.statusMessage)); } }, From 803e015159c925e2760263d8ec7b1602efd03fde Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Mon, 2 Apr 2018 13:59:46 +0530 Subject: [PATCH 07/25] L0 modifieed --- .../Common/azure-arm-rest/Tests/mock_utils.ts | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts index cfdd0f640fe3..67407726f467 100644 --- a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts +++ b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts @@ -1,11 +1,20 @@ -import { AzureEndpoint, WebTest } from '../azureModels'; +import { AzureEndpoint, WebTest, Scheme } from '../azureModels'; import { ApplicationInsightsWebTests } from '../azure-arm-appinsights-webtests'; import * as querystring from "querystring"; import { ApplicationTokenCredentials } from '../azure-arm-common'; export var nock = require('nock'); -export function getMockEndpoint() { +export function getMockEndpoint(scheme?: string, msiPort?: string) { process.env["AZURE_HTTP_USER_AGENT"] = "TEST_AGENT"; + if(this.scheme === Scheme.ManagedServiceIdentity) + { + this.token_deferred = this._getMSIAuthorizationToken(); + } + else + { + this.token_deferred = this._getSPNAuthorizationToken(); + } + var endpoint: AzureEndpoint = { activeDirectoryAuthority: "https://login.windows.net/", environment: "AzureCloud", @@ -18,7 +27,7 @@ export function getMockEndpoint() { environmentAuthorityUrl: "https://login.windows.net/", activeDirectoryResourceID: "https://management.azure.com/", 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) + "https://login.windows.net/", "https://management.azure.com/", false, scheme, msiPort) } nock("https://login.windows.net", { @@ -36,6 +45,18 @@ export function getMockEndpoint() { access_token: "DUMMY_ACCESS_TOKEN" }).persist(); + var msiPortVariable = msiPort ? msiPort : '50342'; + var msiUrl = "http://localhost:"+ msiPortVariable; + nock(msiUrl, { + reqheaders: { + "Metadata": true + } + }) + .get("/oauth2/token?resource=https://management.azure.com/") + .reply(200, { + access_token: "DUMMY_ACCESS_TOKEN" + }).persist(); + return endpoint; } From 1a8d636847c949d48460de42ebd5eaaaa079524d Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Mon, 2 Apr 2018 14:25:12 +0530 Subject: [PATCH 08/25] build failure --- Tasks/Common/azure-arm-rest/Tests/mock_utils.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts index 67407726f467..2959624d5754 100644 --- a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts +++ b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts @@ -6,14 +6,6 @@ export var nock = require('nock'); export function getMockEndpoint(scheme?: string, msiPort?: string) { process.env["AZURE_HTTP_USER_AGENT"] = "TEST_AGENT"; - if(this.scheme === Scheme.ManagedServiceIdentity) - { - this.token_deferred = this._getMSIAuthorizationToken(); - } - else - { - this.token_deferred = this._getSPNAuthorizationToken(); - } var endpoint: AzureEndpoint = { activeDirectoryAuthority: "https://login.windows.net/", From 459489d39634e1972cabe5d89d3e0fbc5a874fc3 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Wed, 4 Apr 2018 15:22:59 +0530 Subject: [PATCH 09/25] error messgae changed --- .../Strings/resources.resjson/en-US/resources.resjson | 4 ++-- Tasks/Common/azure-arm-rest/module.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson index 1e6471f26766..c1d7462de6ff 100644 --- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson @@ -4,8 +4,8 @@ "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.", "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: '%s', status message: %s", - "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json index 1cef2f8098e5..b9bc10013689 100644 --- a/Tasks/Common/azure-arm-rest/module.json +++ b/Tasks/Common/azure-arm-rest/module.json @@ -5,8 +5,8 @@ "SecretCannotBeEmpty": "secret must be a non empty string.", "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: '%s', status message: %s", - "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for MSI. Please configure MSI for vm 'https://docs.microsoft.com/en-us/azure/active-directory/managed-service-identity/qs-configure-portal-windows-vm'. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "InvalidValue": "%s is not a valid value. The valid values are: %s", From 5652ec136ea654b816e2f91be2e4cf1807928836 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 13:22:40 +0530 Subject: [PATCH 10/25] Url changed --- .../resources.resjson/en-US/resources.resjson | 3 +- .../Common/azure-arm-rest/azure-arm-common.ts | 33 +++++++++++++++---- .../azure-arm-rest/azure-arm-endpoint.ts | 4 +-- Tasks/Common/azure-arm-rest/azureModels.ts | 2 +- Tasks/Common/azure-arm-rest/module.json | 3 +- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson index c1d7462de6ff..0c6fb5126eb8 100644 --- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson @@ -5,7 +5,8 @@ "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", - "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: '%s', status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index f7cf1b73dd6d..75a56be5e6ea 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -13,10 +13,10 @@ export class ApplicationTokenCredentials { public activeDirectoryResourceId: string; public isAzureStackEnvironment: boolean; public scheme: number; - public msiPort: string; + public msiClientId: string; private token_deferred: Q.Promise; - constructor(clientId: string, domain: string, secret: string, baseUrl: string, authorityUrl: string, activeDirectoryResourceId: string, isAzureStackEnvironment: boolean, scheme?: string, msiPort?: string) { + constructor(clientId: string, domain: string, secret: string, baseUrl: string, authorityUrl: string, activeDirectoryResourceId: string, isAzureStackEnvironment: boolean, scheme?: string, msiClientId?: string) { if (!Boolean(domain) || typeof domain.valueOf() !== 'string') { throw new Error(tl.loc("DomainCannotBeEmpty")); @@ -56,14 +56,14 @@ export class ApplicationTokenCredentials { this.activeDirectoryResourceId = activeDirectoryResourceId; this.isAzureStackEnvironment = isAzureStackEnvironment; this.scheme = AzureModels.Scheme[scheme]; - this.msiPort = msiPort ? msiPort : '50342'; + this.msiClientId = msiClientId ; } public getToken(force?: boolean): Q.Promise { if (!this.token_deferred || force) { if(this.scheme === AzureModels.Scheme.ManagedServiceIdentity) { - this.token_deferred = this._getMSIAuthorizationToken(); + this.token_deferred = this._getMSIAuthorizationToken(0, 0); } else { @@ -82,11 +82,14 @@ export class ApplicationTokenCredentials { return this.clientId; } - private _getMSIAuthorizationToken(): Q.Promise { + private _getMSIAuthorizationToken(count: number ,timeToWait: number): Q.Promise { var deferred = Q.defer(); let webRequest = new webClient.WebRequest(); webRequest.method = "GET"; - webRequest.uri = "http://localhost:"+ this.msiPort + "/oauth2/token?resource="+ this.baseUrl; + let apiVersion = "2018-02-01"; + const retryLimit = 5; + let msiClientId = this.msiClientId ? "&client_id=" + this.msiClientId : ""; + webRequest.uri = "http://169.254.169.254/metadata/identity/oauth2/token?api-version=" + apiVersion + "&resource="+ this.baseUrl + msiClientId; webRequest.headers = { "Metadata": true }; @@ -97,9 +100,25 @@ export class ApplicationTokenCredentials { { deferred.resolve(response.body.access_token); } + else if (response.statusCode == 209 || response.statusCode == 500) + { + if(count < retryLimit) + { + let waitedTime = 2000 + timeToWait * 2; + count +=1; + setTimeout(() => { + deferred.resolve(this._getMSIAuthorizationToken(count, waitedTime)); + }, waitedTime); + } + else + { + deferred.reject(tl.loc('CouldNotFetchAccessTokenforMSIStatusCode', response.statusCode, response.statusMessage)); + } + + } else { - deferred.reject(tl.loc('CouldNotFetchAccessTokenforMSIStatusCode', response.statusCode, response.statusMessage)); + deferred.reject(tl.loc('CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode', response.statusCode, response.statusMessage)); } }, (error) => { diff --git a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts index ca7af2d903dc..2ca2c6d6d37a 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts @@ -35,7 +35,7 @@ export class AzureRMEndpoint { url: tl.getEndpointUrl(this._connectedServiceName, true), environment: tl.getEndpointDataParameter(this._connectedServiceName, 'environment', true), scheme: tl.getEndpointAuthorizationScheme(this._connectedServiceName, true), - msiPort: tl.getEndpointDataParameter(this._connectedServiceName, 'msiport', true), + msiClientId: tl.getEndpointDataParameter(this._connectedServiceName, 'msiclientId', true), activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true) } as AzureEndpoint; @@ -48,7 +48,7 @@ export class AzureRMEndpoint { } this.endpoint.applicationTokenCredentials = new ApplicationTokenCredentials(this.endpoint.servicePrincipalClientID, this.endpoint.tenantID, this.endpoint.servicePrincipalKey, - this.endpoint.url, this.endpoint.environmentAuthorityUrl, this.endpoint.activeDirectoryResourceID, this.endpoint.environment.toLowerCase() == constants.AzureEnvironments.AzureStack, this.endpoint.scheme, this.endpoint.msiPort); + this.endpoint.url, this.endpoint.environmentAuthorityUrl, this.endpoint.activeDirectoryResourceID, this.endpoint.environment.toLowerCase() == constants.AzureEnvironments.AzureStack, this.endpoint.scheme, this.endpoint.msiClientId); } return this.endpoint; diff --git a/Tasks/Common/azure-arm-rest/azureModels.ts b/Tasks/Common/azure-arm-rest/azureModels.ts index d62d1c5f7d35..29d675b07fcf 100644 --- a/Tasks/Common/azure-arm-rest/azureModels.ts +++ b/Tasks/Common/azure-arm-rest/azureModels.ts @@ -220,7 +220,7 @@ export interface AzureEndpoint { portalEndpoint?: string; AzureKeyVaultDnsSuffix?: string; AzureKeyVaultServiceEndpointResourceId?: string; - msiPort?: string; + msiClientId?: string; scheme?: string; applicationTokenCredentials: ApplicationTokenCredentials; } diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json index b9bc10013689..fc7e76343d2d 100644 --- a/Tasks/Common/azure-arm-rest/module.json +++ b/Tasks/Common/azure-arm-rest/module.json @@ -6,7 +6,8 @@ "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", - "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: '%s', status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "InvalidValue": "%s is not a valid value. The valid values are: %s", From f7deaaa6033b1b62c370bf0cb3a1741f5c29fb73 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 13:29:40 +0530 Subject: [PATCH 11/25] test case changes --- Tasks/Common/azure-arm-rest/Tests/mock_utils.ts | 9 +++++---- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts index 2959624d5754..21d05d772d92 100644 --- a/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts +++ b/Tasks/Common/azure-arm-rest/Tests/mock_utils.ts @@ -4,7 +4,7 @@ import * as querystring from "querystring"; import { ApplicationTokenCredentials } from '../azure-arm-common'; export var nock = require('nock'); -export function getMockEndpoint(scheme?: string, msiPort?: string) { +export function getMockEndpoint(scheme?: string, msiClientId?: string) { process.env["AZURE_HTTP_USER_AGENT"] = "TEST_AGENT"; var endpoint: AzureEndpoint = { @@ -19,7 +19,7 @@ export function getMockEndpoint(scheme?: string, msiPort?: string) { environmentAuthorityUrl: "https://login.windows.net/", activeDirectoryResourceID: "https://management.azure.com/", 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, msiPort) + "https://login.windows.net/", "https://management.azure.com/", false, scheme, msiClientId) } nock("https://login.windows.net", { @@ -37,8 +37,9 @@ export function getMockEndpoint(scheme?: string, msiPort?: string) { access_token: "DUMMY_ACCESS_TOKEN" }).persist(); - var msiPortVariable = msiPort ? msiPort : '50342'; - var msiUrl = "http://localhost:"+ msiPortVariable; + let apiVersion = "2018-02-01"; + let msiClientIdUrl = msiClientId ? "&client_id=" + msiClientId : ""; + var msiUrl = "http://169.254.169.254/metadata/identity/oauth2/token?api-version=" + apiVersion + "&resource=https://management.azure.com/" + msiClientIdUrl; nock(msiUrl, { reqheaders: { "Metadata": true diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index 75a56be5e6ea..7e564ade03f8 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -55,7 +55,7 @@ export class ApplicationTokenCredentials { this.authorityUrl = authorityUrl; this.activeDirectoryResourceId = activeDirectoryResourceId; this.isAzureStackEnvironment = isAzureStackEnvironment; - this.scheme = AzureModels.Scheme[scheme]; + this.scheme = scheme ? AzureModels.Scheme[scheme] : AzureModels.Scheme['SPN'] ; this.msiClientId = msiClientId ; } From 2737d3d9e0faa747dc957d3a01f7ae99dc6118b6 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 15:35:20 +0530 Subject: [PATCH 12/25] after copying in mysql --- .../Strings/resources.resjson/en-US/resources.resjson | 5 ++++- Tasks/AzureMysqlDeployment/task.json | 5 ++++- Tasks/AzureMysqlDeployment/task.loc.json | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Tasks/AzureMysqlDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureMysqlDeployment/Strings/resources.resjson/en-US/resources.resjson index 5dc63adf5f48..4a5cecf6bab6 100644 --- a/Tasks/AzureMysqlDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureMysqlDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -58,5 +58,8 @@ "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.UnableToCreateDatabaseException": "Unable to create database.", "loc.messages.WindowMysqlClientMissingError": "Mysql Client is missing in window agent box. Please install it by running mysql client installer 'https://aka.ms/window-mysqlcli-installer' script file in your agent box.", - "loc.messages.LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'." + "loc.messages.LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureMysqlDeployment/task.json b/Tasks/AzureMysqlDeployment/task.json index 0abc6c4e0bfc..28ac4d2fac02 100644 --- a/Tasks/AzureMysqlDeployment/task.json +++ b/Tasks/AzureMysqlDeployment/task.json @@ -218,6 +218,9 @@ "CallbackCannotBeNull": "callback cannot be null.", "UnableToCreateDatabaseException": "Unable to create database.", "WindowMysqlClientMissingError": "Mysql Client is missing in window agent box. Please install it by running mysql client installer 'https://aka.ms/window-mysqlcli-installer' script file in your agent box.", - "LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'." + "LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } diff --git a/Tasks/AzureMysqlDeployment/task.loc.json b/Tasks/AzureMysqlDeployment/task.loc.json index 377f888ae64a..93cf9a958030 100644 --- a/Tasks/AzureMysqlDeployment/task.loc.json +++ b/Tasks/AzureMysqlDeployment/task.loc.json @@ -220,6 +220,9 @@ "CallbackCannotBeNull": "ms-resource:loc.messages.CallbackCannotBeNull", "UnableToCreateDatabaseException": "ms-resource:loc.messages.UnableToCreateDatabaseException", "WindowMysqlClientMissingError": "ms-resource:loc.messages.WindowMysqlClientMissingError", - "LinuxMysqlClientMissingError": "ms-resource:loc.messages.LinuxMysqlClientMissingError" + "LinuxMysqlClientMissingError": "ms-resource:loc.messages.LinuxMysqlClientMissingError", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From 783ba99c14c6b2b81cc795688197a7f58551b6b7 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 15:46:43 +0530 Subject: [PATCH 13/25] removing quotes --- .../Strings/resources.resjson/en-US/resources.resjson | 6 +++--- Tasks/Common/azure-arm-rest/module.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson index 0c6fb5126eb8..19b241da6238 100644 --- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson @@ -4,9 +4,9 @@ "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.", "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", - "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", - "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: '%s', status message: %s", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s", diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json index fc7e76343d2d..50eec16d2667 100644 --- a/Tasks/Common/azure-arm-rest/module.json +++ b/Tasks/Common/azure-arm-rest/module.json @@ -5,9 +5,9 @@ "SecretCannotBeEmpty": "secret must be a non empty string.", "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: '%s', status message: %s", - "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: '%s', status message: %s", - "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: '%s', status message: %s", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.", "InvalidValue": "%s is not a valid value. The valid values are: %s", From 8ac52e6d0112176d317bf4b543bb189f032bbf7c Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:04:49 +0530 Subject: [PATCH 14/25] azure app service manage task resource copy --- .../resources.resjson/en-US/resources.resjson | 7 ++++--- Tasks/AzureAppServiceManage/package-lock.json | 17 +++++------------ Tasks/AzureAppServiceManage/task.json | 7 ++++--- Tasks/AzureAppServiceManage/task.loc.json | 7 ++++--- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Tasks/AzureAppServiceManage/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureAppServiceManage/Strings/resources.resjson/en-US/resources.resjson index b70def758d3d..b440a22517c4 100644 --- a/Tasks/AzureAppServiceManage/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureAppServiceManage/Strings/resources.resjson/en-US/resources.resjson @@ -53,7 +53,6 @@ "loc.messages.RestartAppServiceAccepted": "Restart request accepted by App Service : %s", "loc.messages.InvalidAction": "Invalid Action selected !", "loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING: Cannot update deployment status. SCM endpoint is not enabled for this website.", - "loc.messages.CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch acccess token for Azure App Service. StatusCode %s (%s)", "loc.messages.WebAppDoesntExist": "Web app '%s' doesn't exist.", "loc.messages.UnabletoretrieveWebAppID": "Unable to retrieve connection details for Azure App Service:'%s'. Status Code: %s", "loc.messages.StartingSwapSlot": "Requesting swap slot for Web App : %s", @@ -78,7 +77,6 @@ "loc.messages.UnableToFetchContinuousWebJobs": "Unable to fetch continuous web jobs", "loc.messages.UnableToStartContinuousWebJob": "Unable to start continuous web job", "loc.messages.UnableToStopContinuousWebJob": "Unable to stop continuous web job", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "loc.messages.AppNameCannotBeNull": "App name cannot be null or undefined and it must be of type string.", "loc.messages.SlotNameCannotBeNull": "Slot name cannot be null or undefined and it must be of type string.", "loc.messages.SourceSlotNameCannotBeNull": "Source slot name cannot be null or undefined and it must be of type string.", @@ -164,5 +162,8 @@ "loc.messages.WebJobAlreadyInStoppedState": "WebJob '%s' is already in stopped state.", "loc.messages.RestartingKuduService": "Restarting Kudu Service.", "loc.messages.RestartedKuduService": "Kudu Service restarted.", - "loc.messages.FailedToRestartKuduService": "Failed to restart kudu Service. %s." + "loc.messages.FailedToRestartKuduService": "Failed to restart kudu Service. %s.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureAppServiceManage/package-lock.json b/Tasks/AzureAppServiceManage/package-lock.json index 72a7c54d2b1d..8aaadf6b8cff 100644 --- a/Tasks/AzureAppServiceManage/package-lock.json +++ b/Tasks/AzureAppServiceManage/package-lock.json @@ -18,9 +18,9 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -36,7 +36,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "1.1.11" } }, "mockery": { @@ -95,17 +95,10 @@ "requires": { "minimatch": "3.0.4", "mockery": "1.7.0", - "q": "1.5.1", + "q": "1.4.1", "semver": "5.5.0", "shelljs": "0.3.0", "uuid": "3.2.1" - }, - "dependencies": { - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" - } } }, "xml2js": { diff --git a/Tasks/AzureAppServiceManage/task.json b/Tasks/AzureAppServiceManage/task.json index 0a5ff3d69be9..a44c332781bc 100644 --- a/Tasks/AzureAppServiceManage/task.json +++ b/Tasks/AzureAppServiceManage/task.json @@ -288,7 +288,6 @@ "RestartAppServiceAccepted": "Restart request accepted by App Service : %s", "InvalidAction": "Invalid Action selected !", "WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING: Cannot update deployment status. SCM endpoint is not enabled for this website.", - "CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch acccess token for Azure App Service. StatusCode %s (%s)", "WebAppDoesntExist": "Web app '%s' doesn't exist.", "UnabletoretrieveWebAppID": "Unable to retrieve connection details for Azure App Service:'%s'. Status Code: %s", "StartingSwapSlot": "Requesting swap slot for Web App : %s", @@ -313,7 +312,6 @@ "UnableToFetchContinuousWebJobs": "Unable to fetch continuous web jobs", "UnableToStartContinuousWebJob": "Unable to start continuous web job", "UnableToStopContinuousWebJob": "Unable to stop continuous web job", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "AppNameCannotBeNull": "App name cannot be null or undefined and it must be of type string.", "SlotNameCannotBeNull": "Slot name cannot be null or undefined and it must be of type string.", "SourceSlotNameCannotBeNull": "Source slot name cannot be null or undefined and it must be of type string.", @@ -399,6 +397,9 @@ "WebJobAlreadyInStoppedState": "WebJob '%s' is already in stopped state.", "RestartingKuduService": "Restarting Kudu Service.", "RestartedKuduService": "Kudu Service restarted.", - "FailedToRestartKuduService": "Failed to restart kudu Service. %s." + "FailedToRestartKuduService": "Failed to restart kudu Service. %s.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/AzureAppServiceManage/task.loc.json b/Tasks/AzureAppServiceManage/task.loc.json index 43fc986d13ba..497d956ac30b 100644 --- a/Tasks/AzureAppServiceManage/task.loc.json +++ b/Tasks/AzureAppServiceManage/task.loc.json @@ -292,7 +292,6 @@ "RestartAppServiceAccepted": "ms-resource:loc.messages.RestartAppServiceAccepted", "InvalidAction": "ms-resource:loc.messages.InvalidAction", "WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "ms-resource:loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite", - "CouldnotfetchaccesstokenforAzureStatusCode": "ms-resource:loc.messages.CouldnotfetchaccesstokenforAzureStatusCode", "WebAppDoesntExist": "ms-resource:loc.messages.WebAppDoesntExist", "UnabletoretrieveWebAppID": "ms-resource:loc.messages.UnabletoretrieveWebAppID", "StartingSwapSlot": "ms-resource:loc.messages.StartingSwapSlot", @@ -317,7 +316,6 @@ "UnableToFetchContinuousWebJobs": "ms-resource:loc.messages.UnableToFetchContinuousWebJobs", "UnableToStartContinuousWebJob": "ms-resource:loc.messages.UnableToStartContinuousWebJob", "UnableToStopContinuousWebJob": "ms-resource:loc.messages.UnableToStopContinuousWebJob", - "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", "AppNameCannotBeNull": "ms-resource:loc.messages.AppNameCannotBeNull", "SlotNameCannotBeNull": "ms-resource:loc.messages.SlotNameCannotBeNull", "SourceSlotNameCannotBeNull": "ms-resource:loc.messages.SourceSlotNameCannotBeNull", @@ -403,6 +401,9 @@ "WebJobAlreadyInStoppedState": "ms-resource:loc.messages.WebJobAlreadyInStoppedState", "RestartingKuduService": "ms-resource:loc.messages.RestartingKuduService", "RestartedKuduService": "ms-resource:loc.messages.RestartedKuduService", - "FailedToRestartKuduService": "ms-resource:loc.messages.FailedToRestartKuduService" + "FailedToRestartKuduService": "ms-resource:loc.messages.FailedToRestartKuduService", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From c32de1a3ea5f46438d2a6801c9b62cbdb096fb12 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:07:22 +0530 Subject: [PATCH 15/25] key vault conflict --- .../resources.resjson/en-US/resources.resjson | 6 ++++-- Tasks/AzureKeyVault/npm-shrinkwrap.json | 20 ++++++++++++++++--- Tasks/AzureKeyVault/task.json | 6 ++++-- Tasks/AzureKeyVault/task.loc.json | 6 ++++-- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Tasks/AzureKeyVault/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureKeyVault/Strings/resources.resjson/en-US/resources.resjson index 15c74a87f908..f78c32db458d 100644 --- a/Tasks/AzureKeyVault/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureKeyVault/Strings/resources.resjson/en-US/resources.resjson @@ -15,7 +15,6 @@ "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.", "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "loc.messages.CallbackCannotBeNull": "callback cannot be null.", "loc.messages.CredentialsCannotBeNull": "'credentials' cannot be null.", "loc.messages.SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.", @@ -40,5 +39,8 @@ "loc.messages.GetSecretFailedBecauseOfInvalidCharacters": "Cannot find the secret with name: %s. Secret name must be a string 1-127 characters in length containing only 0-9, a-z, A-Z, and -", "loc.messages.UploadingAttachment": "Uploading %s as attachment", "loc.messages.CouldNotWriteToFile": "Could not save content to file. Failed with an error %s", - "loc.messages.CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely" + "loc.messages.CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureKeyVault/npm-shrinkwrap.json b/Tasks/AzureKeyVault/npm-shrinkwrap.json index 540d90203bf0..d894072e8702 100644 --- a/Tasks/AzureKeyVault/npm-shrinkwrap.json +++ b/Tasks/AzureKeyVault/npm-shrinkwrap.json @@ -5,11 +5,25 @@ "dependencies": { "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", - "integrity": "sha1-XxtKje67DJxt8Np8AGo740d6oKk=", "requires": { "q": "1.4.1", "typed-rest-client": "0.12.0", - "vsts-task-lib": "2.0.6" + "vsts-task-lib": "2.0.5" + }, + "dependencies": { + "vsts-task-lib": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", + "integrity": "sha1-y9WrIy6rtxDJaXkFMYcmlZHA1RA=", + "requires": { + "minimatch": "3.0.4", + "mockery": "1.7.0", + "q": "1.4.1", + "semver": "5.4.1", + "shelljs": "0.3.0", + "uuid": "3.1.0" + } + } } }, "balanced-match": { @@ -107,4 +121,4 @@ } } } -} +} \ No newline at end of file diff --git a/Tasks/AzureKeyVault/task.json b/Tasks/AzureKeyVault/task.json index d960bbedef69..5336acc540b8 100644 --- a/Tasks/AzureKeyVault/task.json +++ b/Tasks/AzureKeyVault/task.json @@ -70,7 +70,6 @@ "SecretCannotBeEmpty": "secret must be a non empty string.", "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "CallbackCannotBeNull": "callback cannot be null.", "CredentialsCannotBeNull": "'credentials' cannot be null.", "SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.", @@ -95,6 +94,9 @@ "GetSecretFailedBecauseOfInvalidCharacters": "Cannot find the secret with name: %s. Secret name must be a string 1-127 characters in length containing only 0-9, a-z, A-Z, and -", "UploadingAttachment": "Uploading %s as attachment", "CouldNotWriteToFile": "Could not save content to file. Failed with an error %s", - "CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely" + "CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/AzureKeyVault/task.loc.json b/Tasks/AzureKeyVault/task.loc.json index df2a41750d55..484c4fa4e774 100644 --- a/Tasks/AzureKeyVault/task.loc.json +++ b/Tasks/AzureKeyVault/task.loc.json @@ -72,7 +72,6 @@ "SecretCannotBeEmpty": "ms-resource:loc.messages.SecretCannotBeEmpty", "armUrlCannotBeEmpty": "ms-resource:loc.messages.armUrlCannotBeEmpty", "authorityUrlCannotBeEmpty": "ms-resource:loc.messages.authorityUrlCannotBeEmpty", - "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", "CallbackCannotBeNull": "ms-resource:loc.messages.CallbackCannotBeNull", "CredentialsCannotBeNull": "ms-resource:loc.messages.CredentialsCannotBeNull", "SubscriptionIdCannotBeNull": "ms-resource:loc.messages.SubscriptionIdCannotBeNull", @@ -97,6 +96,9 @@ "GetSecretFailedBecauseOfInvalidCharacters": "ms-resource:loc.messages.GetSecretFailedBecauseOfInvalidCharacters", "UploadingAttachment": "ms-resource:loc.messages.UploadingAttachment", "CouldNotWriteToFile": "ms-resource:loc.messages.CouldNotWriteToFile", - "CouldNotMaskSecret": "ms-resource:loc.messages.CouldNotMaskSecret" + "CouldNotMaskSecret": "ms-resource:loc.messages.CouldNotMaskSecret", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From 299f2bad2a566d5f9773e269f13a81e0cad4f12a Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:11:04 +0530 Subject: [PATCH 16/25] azure RG task --- .../Strings/resources.resjson/en-US/resources.resjson | 6 ++++-- Tasks/AzureResourceGroupDeployment/task.json | 6 ++++-- Tasks/AzureResourceGroupDeployment/task.loc.json | 6 ++++-- Tasks/Common/azurestack-common/package-lock.json | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Tasks/AzureResourceGroupDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureResourceGroupDeployment/Strings/resources.resjson/en-US/resources.resjson index 1ffe5af6cdc2..949f7da70c22 100644 --- a/Tasks/AzureResourceGroupDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureResourceGroupDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -110,7 +110,6 @@ "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.", "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.", "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "loc.messages.LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'", "loc.messages.NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.", "loc.messages.NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.", @@ -169,5 +168,8 @@ "loc.messages.UnableToFetchActiveDirectory": "Unable to fetch active directory resource id.", "loc.messages.SpecifiedAzureRmEndpointIsInvalid": "Specified AzureRm endpoint url : '{0}' is invalid.", "loc.messages.FailedToFetchAzureStackDependencyData": "Failed to fetch azure stack dependency data, error message : {0}", - "loc.messages.UnableToReadResponseBody": "Unable to read response body. Error: %s" + "loc.messages.UnableToReadResponseBody": "Unable to read response body. Error: %s", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureResourceGroupDeployment/task.json b/Tasks/AzureResourceGroupDeployment/task.json index 6b582c102fa8..46642f0dafdd 100644 --- a/Tasks/AzureResourceGroupDeployment/task.json +++ b/Tasks/AzureResourceGroupDeployment/task.json @@ -361,7 +361,6 @@ "SecretCannotBeEmpty": "secret must be a non empty string.", "armUrlCannotBeEmpty": "arm Url must be a non empty string.", "authorityUrlCannotBeEmpty": "authority must be a non empty string.", - "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s", "LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'", "NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.", "NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.", @@ -420,6 +419,9 @@ "UnableToFetchActiveDirectory": "Unable to fetch active directory resource id.", "SpecifiedAzureRmEndpointIsInvalid": "Specified AzureRm endpoint url : '{0}' is invalid.", "FailedToFetchAzureStackDependencyData": "Failed to fetch azure stack dependency data, error message : {0}", - "UnableToReadResponseBody": "Unable to read response body. Error: %s" + "UnableToReadResponseBody": "Unable to read response body. Error: %s", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/AzureResourceGroupDeployment/task.loc.json b/Tasks/AzureResourceGroupDeployment/task.loc.json index 79a5c6af6b53..970bd4947022 100644 --- a/Tasks/AzureResourceGroupDeployment/task.loc.json +++ b/Tasks/AzureResourceGroupDeployment/task.loc.json @@ -361,7 +361,6 @@ "SecretCannotBeEmpty": "ms-resource:loc.messages.SecretCannotBeEmpty", "armUrlCannotBeEmpty": "ms-resource:loc.messages.armUrlCannotBeEmpty", "authorityUrlCannotBeEmpty": "ms-resource:loc.messages.authorityUrlCannotBeEmpty", - "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", "LoadBalancerNameCannotBeNull": "ms-resource:loc.messages.LoadBalancerNameCannotBeNull", "NetworkInterfaceNameCannotBeNull": "ms-resource:loc.messages.NetworkInterfaceNameCannotBeNull", "NetworkSecurityGroupNameCannotBeNull": "ms-resource:loc.messages.NetworkSecurityGroupNameCannotBeNull", @@ -420,6 +419,9 @@ "UnableToFetchActiveDirectory": "ms-resource:loc.messages.UnableToFetchActiveDirectory", "SpecifiedAzureRmEndpointIsInvalid": "ms-resource:loc.messages.SpecifiedAzureRmEndpointIsInvalid", "FailedToFetchAzureStackDependencyData": "ms-resource:loc.messages.FailedToFetchAzureStackDependencyData", - "UnableToReadResponseBody": "ms-resource:loc.messages.UnableToReadResponseBody" + "UnableToReadResponseBody": "ms-resource:loc.messages.UnableToReadResponseBody", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file diff --git a/Tasks/Common/azurestack-common/package-lock.json b/Tasks/Common/azurestack-common/package-lock.json index 3302c1a23ada..6443fe63c472 100644 --- a/Tasks/Common/azurestack-common/package-lock.json +++ b/Tasks/Common/azurestack-common/package-lock.json @@ -49,7 +49,7 @@ "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=" }, "shelljs": { "version": "0.3.0", From cd273d6f214ed28344cd68ca81144b39865fd6a4 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:15:51 +0530 Subject: [PATCH 17/25] resolving conflit with azurerm --- .../resources.resjson/en-US/resources.resjson | 6 +- .../AzureRmWebAppDeployment/package-lock.json | 263 ++++++++---------- Tasks/AzureRmWebAppDeployment/task.json | 6 +- Tasks/AzureRmWebAppDeployment/task.loc.json | 6 +- 4 files changed, 131 insertions(+), 150 deletions(-) diff --git a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson index edf1bd0f8709..4c6eead19a5b 100644 --- a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -71,7 +71,6 @@ "loc.messages.ErrorNoSuchDeployingMethodExists": "Error : No such deploying method exists", "loc.messages.UnabletoretrieveconnectiondetailsforazureRMWebApp": "Unable to retrieve connection details for Azure App Service : %s. Status Code: %s (%s)", "loc.messages.UnabletoretrieveResourceID": "Unable to retrieve connection details for Azure Resource:'%s'. Status Code: %s", - "loc.messages.CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch access token for Azure. Status Code: %s (%s)", "loc.messages.Successfullyupdateddeploymenthistory": "Successfully updated deployment History at %s", "loc.messages.Failedtoupdatedeploymenthistory": "Failed to update deployment history. Error: %s", "loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING : Cannot update deployment status : SCM endpoint is not enabled for this website", @@ -191,5 +190,8 @@ "loc.messages.FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "loc.messages.GoExeNameNotPresent": "Go exe name is not present", "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine." + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureRmWebAppDeployment/package-lock.json b/Tasks/AzureRmWebAppDeployment/package-lock.json index bdcac53dc66f..52a495d314fd 100644 --- a/Tasks/AzureRmWebAppDeployment/package-lock.json +++ b/Tasks/AzureRmWebAppDeployment/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "archiver": { "version": "1.2.0", @@ -15,13 +15,13 @@ "integrity": "sha1-+1xq9UQ7P6akJjRHU7rSp7REqt0=", "requires": { "archiver-utils": "1.3.0", - "async": "2.1.4", + "async": "2.6.0", "buffer-crc32": "0.2.13", - "glob": "7.1.1", - "lodash": "4.17.2", - "readable-stream": "2.2.2", - "tar-stream": "1.5.2", - "zip-stream": "1.1.0" + "glob": "7.1.2", + "lodash": "4.17.5", + "readable-stream": "2.3.6", + "tar-stream": "1.5.5", + "zip-stream": "1.2.0" } }, "archiver-utils": { @@ -29,20 +29,20 @@ "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz", "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=", "requires": { - "glob": "7.1.1", + "glob": "7.1.2", "graceful-fs": "4.1.11", "lazystream": "1.0.0", - "lodash": "4.17.2", - "normalize-path": "2.0.1", - "readable-stream": "2.2.2" + "lodash": "4.17.5", + "normalize-path": "2.1.1", + "readable-stream": "2.3.6" } }, "async": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz", - "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.2" + "lodash": "4.17.5" } }, "azure-arm-rest": { @@ -54,9 +54,9 @@ } }, "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "binary": { "version": "0.3.0", @@ -68,34 +68,20 @@ } }, "bl": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", + "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { - "readable-stream": "2.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - } + "readable-stream": "2.3.6", + "safe-buffer": "5.1.1" } }, "brace-expansion": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "0.4.2", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -104,11 +90,6 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" - }, "buffers": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", @@ -123,14 +104,14 @@ } }, "compress-commons": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.1.0.tgz", - "integrity": "sha1-n0RguxKIVkx0c5FuApiqPDINyts=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz", + "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=", "requires": { "buffer-crc32": "0.2.13", - "crc32-stream": "1.0.0", - "normalize-path": "2.0.1", - "readable-stream": "2.2.2" + "crc32-stream": "2.0.0", + "normalize-path": "2.1.1", + "readable-stream": "2.3.6" } }, "concat-map": { @@ -143,13 +124,18 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "crc": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz", + "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=" + }, "crc32-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz", - "integrity": "sha1-6hVeXh1zjtN3hDj/6S/+KhQa6z8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz", + "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", "requires": { - "buffer-crc32": "0.2.13", - "readable-stream": "2.2.2" + "crc": "3.5.0", + "readable-stream": "2.3.6" } }, "decompress-zip": { @@ -161,7 +147,7 @@ "graceful-fs": "4.1.11", "mkpath": "0.1.0", "nopt": "3.0.6", - "q": "1.5.1", + "q": "1.4.1", "readable-stream": "1.1.14", "touch": "0.0.3" }, @@ -171,11 +157,6 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" - }, "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", @@ -195,21 +176,11 @@ } }, "end-of-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz", - "integrity": "sha1-6TUyWLqpEIll78QcsO+K3i88+wc=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "1.3.3" - }, - "dependencies": { - "once": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", - "requires": { - "wrappy": "1.0.2" - } - } + "once": "1.4.0" } }, "fs.realpath": { @@ -218,14 +189,14 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", "inherits": "2.0.3", - "minimatch": "3.0.3", + "minimatch": "3.0.4", "once": "1.4.0", "path-is-absolute": "1.0.1" } @@ -259,13 +230,13 @@ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "requires": { - "readable-stream": "2.2.2" + "readable-stream": "2.3.6" } }, "lodash": { - "version": "4.17.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz", - "integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I=" + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "ltx": { "version": "2.6.2", @@ -276,11 +247,11 @@ } }, "minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.6" + "brace-expansion": "1.1.11" } }, "mkpath": { @@ -293,23 +264,21 @@ "resolved": "https://registry.npmjs.org/mockery/-/mockery-1.7.0.tgz", "integrity": "sha1-9O3g2HUMHJcnwnLqLGBiniyaHE8=" }, - "node-uuid": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8=" - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "requires": { - "abbrev": "1.0.9" + "abbrev": "1.1.1" } }, "normalize-path": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz", - "integrity": "sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "requires": { + "remove-trailing-separator": "1.1.0" + } }, "once": { "version": "1.4.0", @@ -325,9 +294,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "q": { "version": "1.4.1", @@ -335,19 +304,29 @@ "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=" }, "readable-stream": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", - "integrity": "sha1-qeb+w8fdqF+LsbO6cChgRVb8gl4=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "buffer-shims": "1.0.0", "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, "sax": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", @@ -356,7 +335,7 @@ "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=" }, "shelljs": { "version": "0.3.0", @@ -364,18 +343,21 @@ "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" }, "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "5.1.1" + } }, "tar-stream": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz", - "integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", + "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==", "requires": { - "bl": "1.1.2", - "end-of-stream": "1.1.0", - "readable-stream": "2.2.2", + "bl": "1.2.2", + "end-of-stream": "1.4.1", + "readable-stream": "2.3.6", "xtend": "4.0.1" } }, @@ -392,7 +374,7 @@ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", "requires": { - "abbrev": "1.0.9" + "abbrev": "1.1.1" } } } @@ -429,31 +411,19 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=" }, "vsts-task-lib": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", "integrity": "sha1-y9WrIy6rtxDJaXkFMYcmlZHA1RA=", "requires": { - "minimatch": "3.0.3", + "minimatch": "3.0.4", "mockery": "1.7.0", - "q": "1.5.1", + "q": "1.4.1", "semver": "5.5.0", "shelljs": "0.3.0", - "uuid": "3.2.1" - }, - "dependencies": { - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" - }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - } + "uuid": "3.1.0" } }, "webdeployment-common": { @@ -468,14 +438,19 @@ "xml2js": "0.4.13" }, "dependencies": { + "node-uuid": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", + "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" + }, "vsts-task-lib": { "version": "2.0.1-preview", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.1-preview.tgz", "integrity": "sha1-rfx4BRaPtJLVcD7eZIXOt4G2SrQ=", "requires": { - "minimatch": "3.0.3", + "minimatch": "3.0.4", "mockery": "1.7.0", - "node-uuid": "1.4.7", + "node-uuid": "1.4.8", "q": "1.4.1", "semver": "5.5.0", "shelljs": "0.3.0" @@ -513,14 +488,14 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "zip-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.0.tgz", - "integrity": "sha1-KtR5//wWjgWoiOjDSP9oE7PxNzM=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", + "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=", "requires": { "archiver-utils": "1.3.0", - "compress-commons": "1.1.0", - "lodash": "4.17.2", - "readable-stream": "2.2.2" + "compress-commons": "1.2.2", + "lodash": "4.17.5", + "readable-stream": "2.3.6" } } } diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index 02d1ff8136eb..281811cd3115 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -413,7 +413,6 @@ "ErrorNoSuchDeployingMethodExists": "Error : No such deploying method exists", "UnabletoretrieveconnectiondetailsforazureRMWebApp": "Unable to retrieve connection details for Azure App Service : %s. Status Code: %s (%s)", "UnabletoretrieveResourceID": "Unable to retrieve connection details for Azure Resource:'%s'. Status Code: %s", - "CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch access token for Azure. Status Code: %s (%s)", "Successfullyupdateddeploymenthistory": "Successfully updated deployment History at %s", "Failedtoupdatedeploymenthistory": "Failed to update deployment history. Error: %s", "WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING : Cannot update deployment status : SCM endpoint is not enabled for this website", @@ -533,6 +532,9 @@ "FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "GoExeNameNotPresent": "Go exe name is not present", "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "Updatemachinetoenablesecuretlsprotocol" : "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine." + "Updatemachinetoenablesecuretlsprotocol" : "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json index 30f50c2e8711..56d2113f980f 100644 --- a/Tasks/AzureRmWebAppDeployment/task.loc.json +++ b/Tasks/AzureRmWebAppDeployment/task.loc.json @@ -424,7 +424,6 @@ "ErrorNoSuchDeployingMethodExists": "ms-resource:loc.messages.ErrorNoSuchDeployingMethodExists", "UnabletoretrieveconnectiondetailsforazureRMWebApp": "ms-resource:loc.messages.UnabletoretrieveconnectiondetailsforazureRMWebApp", "UnabletoretrieveResourceID": "ms-resource:loc.messages.UnabletoretrieveResourceID", - "CouldnotfetchaccesstokenforAzureStatusCode": "ms-resource:loc.messages.CouldnotfetchaccesstokenforAzureStatusCode", "Successfullyupdateddeploymenthistory": "ms-resource:loc.messages.Successfullyupdateddeploymenthistory", "Failedtoupdatedeploymenthistory": "ms-resource:loc.messages.Failedtoupdatedeploymenthistory", "WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "ms-resource:loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite", @@ -544,6 +543,9 @@ "FailedToGetDeploymentLogs": "ms-resource:loc.messages.FailedToGetDeploymentLogs", "GoExeNameNotPresent": "ms-resource:loc.messages.GoExeNameNotPresent", "WarDeploymentRetry": "ms-resource:loc.messages.WarDeploymentRetry", - "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol" + "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From 338bb66f4848a65dc5e8923433029154f8a66bcb Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:24:50 +0530 Subject: [PATCH 18/25] javatool installer --- .../resources.resjson/en-US/resources.resjson | 5 +- Tasks/AzureVmssDeployment/package-lock.json | 278 +++++++++--------- Tasks/AzureVmssDeployment/task.json | 5 +- Tasks/AzureVmssDeployment/task.loc.json | 5 +- .../resources.resjson/en-US/resources.resjson | 5 +- Tasks/HelmDeploy/task.json | 5 +- Tasks/HelmDeploy/task.loc.json | 5 +- .../resources.resjson/en-US/resources.resjson | 5 +- Tasks/JavaToolInstaller/package-lock.json | 8 +- Tasks/JavaToolInstaller/task.json | 7 +- Tasks/JavaToolInstaller/task.loc.json | 7 +- 11 files changed, 174 insertions(+), 161 deletions(-) diff --git a/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson index 0fbc8b57ce03..45343c0bfba4 100644 --- a/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -72,5 +72,8 @@ "loc.messages.FailedToListItemInsideContainer": "Failed to list items inside container: %s. Error: %s.", "loc.messages.SuccessFullyFetchedItemList": "Successfully fetcted list of items", "loc.messages.UnableToFetchItem": "Unable to fetch item: %s. Error: %s.", - "loc.messages.UploadingItem": "Uploading %s." + "loc.messages.UploadingItem": "Uploading %s.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/AzureVmssDeployment/package-lock.json b/Tasks/AzureVmssDeployment/package-lock.json index c001bf085a76..1c2d7d9f4b4e 100644 --- a/Tasks/AzureVmssDeployment/package-lock.json +++ b/Tasks/AzureVmssDeployment/package-lock.json @@ -19,9 +19,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", @@ -70,27 +70,18 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", - "integrity": "sha1-054L7kEs7Q6O2Uoj4xTzE6lbn9E=", - "requires": { - "lru-cache": "4.1.1" - } + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", - "integrity": "sha512-BhSlMnWjs2YkMLFkFwwRHZ0V42Q9Gt3sQca7kKY9l9/if4oY782E4EgvGeXdsTeXzIvl17zg9DMgMIZ+YTXcCg==", "requires": { "q": "1.4.1", "typed-rest-client": "0.12.0", "vsts-task-lib": "2.0.5" }, "dependencies": { - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, "vsts-task-lib": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", @@ -108,7 +99,6 @@ }, "azure-blobstorage-artifactProvider": { "version": "file:../../_build/Tasks/Common/azure-blobstorage-artifactProvider-1.0.0.tgz", - "integrity": "sha512-dREQMudGTtPF/B0UM9h8eQ4c5rwAMpa/bAGyCqwfN7RnLcvq92bExlFbEOZpKIALPdnW7vMN24NCkMb7s89IaA==", "requires": { "artifact-engine": "0.1.14", "azure-storage": "2.2.1", @@ -132,18 +122,6 @@ "validator": "3.35.0", "xml2js": "0.2.7", "xmlbuilder": "0.4.3" - }, - "dependencies": { - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, - "validator": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", - "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" - } } }, "balanced-match": { @@ -151,6 +129,15 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, "bl": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", @@ -234,20 +221,17 @@ } }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "1.0.0" } }, "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "requires": { - "graceful-readlink": "1.0.1" - } + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" }, "concat-map": { "version": "0.0.1", @@ -268,9 +252,9 @@ } }, "dashdash": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", - "integrity": "sha1-KeSGxUGL8PNWA0qZPVFoajPoQUE=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { "assert-plus": "1.0.0" }, @@ -299,7 +283,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.0" + "jsbn": "0.1.1" } }, "escape-string-regexp": { @@ -313,9 +297,9 @@ "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=" }, "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "forever-agent": { "version": "0.6.1", @@ -328,8 +312,8 @@ "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=", "requires": { "async": "2.6.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.11" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" }, "dependencies": { "async": { @@ -337,7 +321,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } } } @@ -356,9 +340,9 @@ } }, "getpass": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", - "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { "assert-plus": "1.0.0" }, @@ -370,11 +354,6 @@ } } }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, "handlebars": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", @@ -392,8 +371,8 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "requires": { "chalk": "1.1.3", - "commander": "2.9.0", - "is-my-json-valid": "2.13.1", + "commander": "2.15.1", + "is-my-json-valid": "2.17.2", "pinkie-promise": "2.0.1" } }, @@ -402,7 +381,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.0.0" + "ansi-regex": "2.1.1" } }, "hash-base": { @@ -436,8 +415,8 @@ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "requires": { "assert-plus": "0.2.0", - "jsprim": "1.2.2", - "sshpk": "1.8.3" + "jsprim": "1.4.1", + "sshpk": "1.14.1" } }, "inherits": { @@ -450,14 +429,20 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, + "is-my-ip-valid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", + "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==" + }, "is-my-json-valid": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", - "integrity": "sha1-1Vd4qC/rawlj/0vhEdXRaE6JBwc=", + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", + "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", - "jsonpointer": "2.0.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", "xtend": "4.0.1" } }, @@ -481,19 +466,10 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "jodid25519": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", - "optional": true, - "requires": { - "jsbn": "0.1.0" - } - }, "jsbn": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", - "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "optional": true }, "json-edm-parser": { @@ -505,9 +481,9 @@ } }, "json-schema": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", - "integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY=" + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-stringify-safe": { "version": "5.0.1", @@ -520,18 +496,26 @@ "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=" }, "jsonpointer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", - "integrity": "sha1-OvHdIP6FRjkQ1GmjheMwF9KgMNk=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=" }, "jsprim": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", - "integrity": "sha1-8gyQaskqvVjjt5rIvHCkiDJRLaE=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { - "extsprintf": "1.0.2", - "json-schema": "0.2.2", - "verror": "1.3.6" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } } }, "kind-of": { @@ -549,24 +533,15 @@ "optional": true }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -577,16 +552,16 @@ } }, "mime-db": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=" + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" }, "mime-types": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "integrity": "sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.23.0" + "mime-db": "1.33.0" } }, "minimatch": { @@ -639,10 +614,10 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "q": { "version": "1.4.1", @@ -678,10 +653,10 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.3.2", + "aws4": "1.7.0", "bl": "1.1.2", "caseless": "0.11.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "1.0.1", @@ -691,12 +666,12 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.11", + "mime-types": "2.1.18", "node-uuid": "1.4.8", "oauth-sign": "0.8.2", "qs": "6.2.3", "stringstream": "0.0.5", - "tough-cookie": "2.3.1", + "tough-cookie": "2.3.4", "tunnel-agent": "0.4.3" }, "dependencies": { @@ -758,18 +733,18 @@ } }, "sshpk": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", - "integrity": "sha1-iQzJ1hTcUpLlyxpUOwPJq6pcN04=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", - "dashdash": "1.14.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", "ecc-jsbn": "0.1.1", - "getpass": "0.1.6", - "jodid25519": "1.0.2", - "jsbn": "0.1.0", - "tweetnacl": "0.13.3" + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" }, "dependencies": { "assert-plus": { @@ -794,7 +769,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -803,9 +778,12 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "tough-cookie": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", - "integrity": "sha1-mcd9+7fYBCSeiimdTLD9gf7wg/0=" + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "1.4.1" + } }, "tunnel": { "version": "0.0.4", @@ -818,9 +796,9 @@ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" }, "tweetnacl": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", - "integrity": "sha1-1ii1bzvMPVrnS6nUwacE3vWrS1Y=", + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "optional": true }, "typed-rest-client": { @@ -869,18 +847,12 @@ }, "utility-common": { "version": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz", - "integrity": "sha512-YTwgF9Sck6tHYUdINIz3cLhm6prexFoHddwFAstWMGUiyMixpY4+OUz6KEF92WOEnJjCMMC9KOXKd3kBo4F6dQ==", "requires": { "semver": "5.5.0", "vso-node-api": "6.0.1-preview", "vsts-task-lib": "2.0.6" }, "dependencies": { - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, "vsts-task-lib": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.6.tgz", @@ -896,12 +868,31 @@ } } }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, + "validator": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", + "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" + }, "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "extsprintf": "1.0.2" + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } } }, "vso-node-api": { @@ -963,11 +954,6 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", @@ -981,4 +967,4 @@ } } } -} +} \ No newline at end of file diff --git a/Tasks/AzureVmssDeployment/task.json b/Tasks/AzureVmssDeployment/task.json index 64029958e055..ca54abd6820f 100644 --- a/Tasks/AzureVmssDeployment/task.json +++ b/Tasks/AzureVmssDeployment/task.json @@ -212,6 +212,9 @@ "FailedToListItemInsideContainer": "Failed to list items inside container: %s. Error: %s.", "SuccessFullyFetchedItemList": "Successfully fetcted list of items", "UnableToFetchItem": "Unable to fetch item: %s. Error: %s.", - "UploadingItem": "Uploading %s." + "UploadingItem": "Uploading %s.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/AzureVmssDeployment/task.loc.json b/Tasks/AzureVmssDeployment/task.loc.json index f58211b1ea8d..6794982c428a 100644 --- a/Tasks/AzureVmssDeployment/task.loc.json +++ b/Tasks/AzureVmssDeployment/task.loc.json @@ -214,6 +214,9 @@ "FailedToListItemInsideContainer": "ms-resource:loc.messages.FailedToListItemInsideContainer", "SuccessFullyFetchedItemList": "ms-resource:loc.messages.SuccessFullyFetchedItemList", "UnableToFetchItem": "ms-resource:loc.messages.UnableToFetchItem", - "UploadingItem": "ms-resource:loc.messages.UploadingItem" + "UploadingItem": "ms-resource:loc.messages.UploadingItem", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file diff --git a/Tasks/HelmDeploy/Strings/resources.resjson/en-US/resources.resjson b/Tasks/HelmDeploy/Strings/resources.resjson/en-US/resources.resjson index 7a1fd4f5e013..b83ace034073 100644 --- a/Tasks/HelmDeploy/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/HelmDeploy/Strings/resources.resjson/en-US/resources.resjson @@ -68,5 +68,8 @@ "loc.messages.RetryingRequest": "Retrying request after %s seconds.", "loc.messages.PatternNotFoundInFilePath": "Pattern not found in file path %s.", "loc.messages.CantResolvePatternInPath": "Can not resolve pattern in file path %s.", - "loc.messages.PatternFoundInPath": "Pattern found in file path %s." + "loc.messages.PatternFoundInPath": "Pattern found in file path %s.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/HelmDeploy/task.json b/Tasks/HelmDeploy/task.json index 196095f5eba2..835b5ed7e354 100644 --- a/Tasks/HelmDeploy/task.json +++ b/Tasks/HelmDeploy/task.json @@ -347,6 +347,9 @@ "RetryingRequest": "Retrying request after %s seconds.", "PatternNotFoundInFilePath": "Pattern not found in file path %s.", "CantResolvePatternInPath": "Can not resolve pattern in file path %s.", - "PatternFoundInPath": "Pattern found in file path %s." + "PatternFoundInPath": "Pattern found in file path %s.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/HelmDeploy/task.loc.json b/Tasks/HelmDeploy/task.loc.json index 3dd40d9cbcdf..42917aad9a91 100644 --- a/Tasks/HelmDeploy/task.loc.json +++ b/Tasks/HelmDeploy/task.loc.json @@ -361,6 +361,9 @@ "RetryingRequest": "ms-resource:loc.messages.RetryingRequest", "PatternNotFoundInFilePath": "ms-resource:loc.messages.PatternNotFoundInFilePath", "CantResolvePatternInPath": "ms-resource:loc.messages.CantResolvePatternInPath", - "PatternFoundInPath": "ms-resource:loc.messages.PatternFoundInPath" + "PatternFoundInPath": "ms-resource:loc.messages.PatternFoundInPath", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file diff --git a/Tasks/JavaToolInstaller/Strings/resources.resjson/en-US/resources.resjson b/Tasks/JavaToolInstaller/Strings/resources.resjson/en-US/resources.resjson index dce2551189b2..dd4aff396905 100644 --- a/Tasks/JavaToolInstaller/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/JavaToolInstaller/Strings/resources.resjson/en-US/resources.resjson @@ -45,5 +45,8 @@ "loc.messages.SucceedMsg": "Successfully extracted all files.", "loc.messages.SetJavaHome": "JAVA_HOME is being set to: %s", "loc.messages.SetExtendedJavaHome": "%s is being set to: %s", - "loc.messages.UnsupportedFileExtension": "Specified JDK source file does not have a supported file extension." + "loc.messages.UnsupportedFileExtension": "Specified JDK source file does not have a supported file extension.", + "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/JavaToolInstaller/package-lock.json b/Tasks/JavaToolInstaller/package-lock.json index fe70f043916d..8cf7d956a787 100644 --- a/Tasks/JavaToolInstaller/package-lock.json +++ b/Tasks/JavaToolInstaller/package-lock.json @@ -89,9 +89,9 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", @@ -687,7 +687,7 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "bl": "1.1.2", "caseless": "0.11.0", "combined-stream": "1.0.6", diff --git a/Tasks/JavaToolInstaller/task.json b/Tasks/JavaToolInstaller/task.json index 8c6c44d6cd6d..54964b8b5c69 100644 --- a/Tasks/JavaToolInstaller/task.json +++ b/Tasks/JavaToolInstaller/task.json @@ -13,7 +13,7 @@ "version": { "Major": 0, "Minor": 134, - "Patch": 0 + "Patch": 1 }, "preview": true, "satisfies": ["Java"], @@ -164,6 +164,9 @@ "SucceedMsg": "Successfully extracted all files.", "SetJavaHome": "JAVA_HOME is being set to: %s", "SetExtendedJavaHome": "%s is being set to: %s", - "UnsupportedFileExtension": "Specified JDK source file does not have a supported file extension." + "UnsupportedFileExtension": "Specified JDK source file does not have a supported file extension.", + "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } diff --git a/Tasks/JavaToolInstaller/task.loc.json b/Tasks/JavaToolInstaller/task.loc.json index bc131db0e24b..eb63039ec5be 100644 --- a/Tasks/JavaToolInstaller/task.loc.json +++ b/Tasks/JavaToolInstaller/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 0, "Minor": 134, - "Patch": 0 + "Patch": 1 }, "preview": true, "satisfies": [ @@ -166,6 +166,9 @@ "SucceedMsg": "ms-resource:loc.messages.SucceedMsg", "SetJavaHome": "ms-resource:loc.messages.SetJavaHome", "SetExtendedJavaHome": "ms-resource:loc.messages.SetExtendedJavaHome", - "UnsupportedFileExtension": "ms-resource:loc.messages.UnsupportedFileExtension" + "UnsupportedFileExtension": "ms-resource:loc.messages.UnsupportedFileExtension", + "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From 8001ae6469e17a7aac550eb7209f0be11263737d Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Fri, 13 Apr 2018 17:09:41 +0530 Subject: [PATCH 19/25] jenkins download artifact --- .../Strings/resources.resjson/en-US/resources.resjson | 4 +++- Tasks/JenkinsDownloadArtifacts/task.json | 4 +++- Tasks/JenkinsDownloadArtifacts/task.loc.json | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Tasks/JenkinsDownloadArtifacts/Strings/resources.resjson/en-US/resources.resjson b/Tasks/JenkinsDownloadArtifacts/Strings/resources.resjson/en-US/resources.resjson index 0c484a9e4653..3233aa4f76c6 100644 --- a/Tasks/JenkinsDownloadArtifacts/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/JenkinsDownloadArtifacts/Strings/resources.resjson/en-US/resources.resjson @@ -123,5 +123,7 @@ "loc.messages.CannotFindJobType": "Could not detect job type", "loc.messages.InvalidJobName": "Invalid job name %s", "loc.messages.ContinuationTokenExistsFetchingRemainingFiles": "Continuation token exists, trying to fetch the list of remaining files.", - "loc.messages.GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path" + "loc.messages.GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/JenkinsDownloadArtifacts/task.json b/Tasks/JenkinsDownloadArtifacts/task.json index 5af5043fd0d1..f5fcf37625ba 100644 --- a/Tasks/JenkinsDownloadArtifacts/task.json +++ b/Tasks/JenkinsDownloadArtifacts/task.json @@ -361,6 +361,8 @@ "CannotFindJobType": "Could not detect job type", "InvalidJobName": "Invalid job name %s", "ContinuationTokenExistsFetchingRemainingFiles": "Continuation token exists, trying to fetch the list of remaining files.", - "GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path" + "GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/JenkinsDownloadArtifacts/task.loc.json b/Tasks/JenkinsDownloadArtifacts/task.loc.json index bc2f971da072..e97d0cc72f76 100644 --- a/Tasks/JenkinsDownloadArtifacts/task.loc.json +++ b/Tasks/JenkinsDownloadArtifacts/task.loc.json @@ -361,6 +361,8 @@ "CannotFindJobType": "ms-resource:loc.messages.CannotFindJobType", "InvalidJobName": "ms-resource:loc.messages.InvalidJobName", "ContinuationTokenExistsFetchingRemainingFiles": "ms-resource:loc.messages.ContinuationTokenExistsFetchingRemainingFiles", - "GetArtifactItemsNotSupported": "ms-resource:loc.messages.GetArtifactItemsNotSupported" + "GetArtifactItemsNotSupported": "ms-resource:loc.messages.GetArtifactItemsNotSupported", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From 9ea16287180cbf4dea64b436a178644357c1e8c1 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Fri, 13 Apr 2018 17:12:38 +0530 Subject: [PATCH 20/25] packerbuild --- .../resources.resjson/en-US/resources.resjson | 5 ++++- Tasks/PackerBuild/package-lock.json | 18 +----------------- Tasks/PackerBuild/task.json | 7 +++++-- Tasks/PackerBuild/task.loc.json | 7 +++++-- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Tasks/PackerBuild/Strings/resources.resjson/en-US/resources.resjson b/Tasks/PackerBuild/Strings/resources.resjson/en-US/resources.resjson index 09cd90b6ac44..ea54e4c6aa5b 100644 --- a/Tasks/PackerBuild/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/PackerBuild/Strings/resources.resjson/en-US/resources.resjson @@ -79,5 +79,8 @@ "loc.messages.ParsingCustomTemplateParameters": "Parsing custom template parameters json.", "loc.messages.FetchingSPNDetailsRemotely": "Fetching SPN details for app id %s from azure AD graph endpoint...", "loc.messages.FetchedSPNDetailsRemotely": "Fetched SPN details successfully. ObjectId: %s", - "loc.messages.FailedToFetchSPNDetailsRemotely": "Could not fetch SPN details from graph endpoint. Error: %s." + "loc.messages.FailedToFetchSPNDetailsRemotely": "Could not fetch SPN details from graph endpoint. Error: %s.", + "loc.messages.GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path", + "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } \ No newline at end of file diff --git a/Tasks/PackerBuild/package-lock.json b/Tasks/PackerBuild/package-lock.json index c8b74cb68127..c4823bec9cea 100644 --- a/Tasks/PackerBuild/package-lock.json +++ b/Tasks/PackerBuild/package-lock.json @@ -10,26 +10,10 @@ }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", - "integrity": "sha1-XxtKje67DJxt8Np8AGo740d6oKk=", "requires": { "q": "1.4.1", "typed-rest-client": "0.12.0", "vsts-task-lib": "2.0.5" - }, - "dependencies": { - "vsts-task-lib": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", - "integrity": "sha1-y9WrIy6rtxDJaXkFMYcmlZHA1RA=", - "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.4.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" - } - } } }, "balanced-match": { @@ -225,4 +209,4 @@ } } } -} +} \ No newline at end of file diff --git a/Tasks/PackerBuild/task.json b/Tasks/PackerBuild/task.json index e0cdaa7c5b02..ed35643cc616 100644 --- a/Tasks/PackerBuild/task.json +++ b/Tasks/PackerBuild/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 13 + "Patch": 14 }, "demands": [], "minimumAgentVersion": "2.0.0", @@ -299,6 +299,9 @@ "ParsingCustomTemplateParameters": "Parsing custom template parameters json.", "FetchingSPNDetailsRemotely": "Fetching SPN details for app id %s from azure AD graph endpoint...", "FetchedSPNDetailsRemotely": "Fetched SPN details successfully. ObjectId: %s", - "FailedToFetchSPNDetailsRemotely": "Could not fetch SPN details from graph endpoint. Error: %s." + "FailedToFetchSPNDetailsRemotely": "Could not fetch SPN details from graph endpoint. Error: %s.", + "GetArtifactItemsNotSupported": "Get artifact items not supported, invalid code path", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s", + "CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s" } } \ No newline at end of file diff --git a/Tasks/PackerBuild/task.loc.json b/Tasks/PackerBuild/task.loc.json index 73cb4dae891f..a905dd728581 100644 --- a/Tasks/PackerBuild/task.loc.json +++ b/Tasks/PackerBuild/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 13 + "Patch": 14 }, "demands": [], "minimumAgentVersion": "2.0.0", @@ -299,6 +299,9 @@ "ParsingCustomTemplateParameters": "ms-resource:loc.messages.ParsingCustomTemplateParameters", "FetchingSPNDetailsRemotely": "ms-resource:loc.messages.FetchingSPNDetailsRemotely", "FetchedSPNDetailsRemotely": "ms-resource:loc.messages.FetchedSPNDetailsRemotely", - "FailedToFetchSPNDetailsRemotely": "ms-resource:loc.messages.FailedToFetchSPNDetailsRemotely" + "FailedToFetchSPNDetailsRemotely": "ms-resource:loc.messages.FailedToFetchSPNDetailsRemotely", + "GetArtifactItemsNotSupported": "ms-resource:loc.messages.GetArtifactItemsNotSupported", + "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode", + "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode" } } \ No newline at end of file From fa9434b942c3802ca74d71785d5af64b9503b929 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 16:51:07 +0530 Subject: [PATCH 21/25] status code changed --- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index 7e564ade03f8..65dab40a0b27 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -100,7 +100,7 @@ export class ApplicationTokenCredentials { { deferred.resolve(response.body.access_token); } - else if (response.statusCode == 209 || response.statusCode == 500) + else if (response.statusCode == 429 || response.statusCode == 500) { if(count < retryLimit) { From 7bceea4baa3eeebc1008dbb8cfaf5869899974ae Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 17:37:22 +0530 Subject: [PATCH 22/25] till updated task version --- Tasks/AzureAppServiceManage/task.json | 2 +- Tasks/AzureAppServiceManage/task.loc.json | 2 +- Tasks/AzureKeyVault/task.json | 2 +- Tasks/AzureKeyVault/task.loc.json | 2 +- Tasks/AzureMysqlDeployment/task.json | 2 +- Tasks/AzureMysqlDeployment/task.loc.json | 2 +- Tasks/AzureResourceGroupDeployment/task.json | 2 +- Tasks/AzureResourceGroupDeployment/task.loc.json | 2 +- Tasks/AzureRmWebAppDeployment/task.json | 2 +- Tasks/AzureRmWebAppDeployment/task.loc.json | 2 +- Tasks/AzureVmssDeployment/task.json | 2 +- Tasks/AzureVmssDeployment/task.loc.json | 2 +- Tasks/JenkinsDownloadArtifacts/task.json | 2 +- Tasks/JenkinsDownloadArtifacts/task.loc.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Tasks/AzureAppServiceManage/task.json b/Tasks/AzureAppServiceManage/task.json index a44c332781bc..6206d0832f9b 100644 --- a/Tasks/AzureAppServiceManage/task.json +++ b/Tasks/AzureAppServiceManage/task.json @@ -18,7 +18,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 26 + "Patch": 27 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "$(Action): $(WebAppName)", diff --git a/Tasks/AzureAppServiceManage/task.loc.json b/Tasks/AzureAppServiceManage/task.loc.json index 497d956ac30b..937dbc74b4dd 100644 --- a/Tasks/AzureAppServiceManage/task.loc.json +++ b/Tasks/AzureAppServiceManage/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 26 + "Patch": 27 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "ms-resource:loc.instanceNameFormat", diff --git a/Tasks/AzureKeyVault/task.json b/Tasks/AzureKeyVault/task.json index 5336acc540b8..605d7e044adf 100644 --- a/Tasks/AzureKeyVault/task.json +++ b/Tasks/AzureKeyVault/task.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 16 + "Patch": 17 }, "demands": [], "minimumAgentVersion": "2.0.0", diff --git a/Tasks/AzureKeyVault/task.loc.json b/Tasks/AzureKeyVault/task.loc.json index 484c4fa4e774..817bd7bb50b7 100644 --- a/Tasks/AzureKeyVault/task.loc.json +++ b/Tasks/AzureKeyVault/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 16 + "Patch": 17 }, "demands": [], "minimumAgentVersion": "2.0.0", diff --git a/Tasks/AzureMysqlDeployment/task.json b/Tasks/AzureMysqlDeployment/task.json index 28ac4d2fac02..06d8d6bec0a4 100644 --- a/Tasks/AzureMysqlDeployment/task.json +++ b/Tasks/AzureMysqlDeployment/task.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 0 + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureMysqlDeployment/task.loc.json b/Tasks/AzureMysqlDeployment/task.loc.json index 93cf9a958030..44e1d4c39c05 100644 --- a/Tasks/AzureMysqlDeployment/task.loc.json +++ b/Tasks/AzureMysqlDeployment/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 0 + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureResourceGroupDeployment/task.json b/Tasks/AzureResourceGroupDeployment/task.json index 46642f0dafdd..6de8ab02a713 100644 --- a/Tasks/AzureResourceGroupDeployment/task.json +++ b/Tasks/AzureResourceGroupDeployment/task.json @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 131, - "Patch": 2 + "Patch": 3 }, "demands": [], "minimumAgentVersion": "2.119.1", diff --git a/Tasks/AzureResourceGroupDeployment/task.loc.json b/Tasks/AzureResourceGroupDeployment/task.loc.json index 970bd4947022..d89f622c308c 100644 --- a/Tasks/AzureResourceGroupDeployment/task.loc.json +++ b/Tasks/AzureResourceGroupDeployment/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 131, - "Patch": 2 + "Patch": 3 }, "demands": [], "minimumAgentVersion": "2.119.1", diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index 281811cd3115..831e6f9505c9 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 0, - "Patch": 6 + "Patch": 7 }, "releaseNotes": "What's new in version 4.* (preview)
Supports Kudu Zip Deploy
Supports App Service Environments
Improved UI for discovering different App service types supported by the task
Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json index 56d2113f980f..9bee3ecfae20 100644 --- a/Tasks/AzureRmWebAppDeployment/task.loc.json +++ b/Tasks/AzureRmWebAppDeployment/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 0, - "Patch": 6 + "Patch": 7 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureVmssDeployment/task.json b/Tasks/AzureVmssDeployment/task.json index ca54abd6820f..db370cfa0c03 100644 --- a/Tasks/AzureVmssDeployment/task.json +++ b/Tasks/AzureVmssDeployment/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 13 + "Patch": 14 }, "demands": [], "minimumAgentVersion": "2.0.0", diff --git a/Tasks/AzureVmssDeployment/task.loc.json b/Tasks/AzureVmssDeployment/task.loc.json index 6794982c428a..a2ef8adc7e87 100644 --- a/Tasks/AzureVmssDeployment/task.loc.json +++ b/Tasks/AzureVmssDeployment/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 13 + "Patch": 14 }, "demands": [], "minimumAgentVersion": "2.0.0", diff --git a/Tasks/JenkinsDownloadArtifacts/task.json b/Tasks/JenkinsDownloadArtifacts/task.json index f5fcf37625ba..8565845e3a07 100644 --- a/Tasks/JenkinsDownloadArtifacts/task.json +++ b/Tasks/JenkinsDownloadArtifacts/task.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 133, - "Patch": 2 + "Patch": 3 }, "groups": [ { diff --git a/Tasks/JenkinsDownloadArtifacts/task.loc.json b/Tasks/JenkinsDownloadArtifacts/task.loc.json index e97d0cc72f76..01fb87955564 100644 --- a/Tasks/JenkinsDownloadArtifacts/task.loc.json +++ b/Tasks/JenkinsDownloadArtifacts/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 133, - "Patch": 2 + "Patch": 3 }, "groups": [ { From ab1727d16f656e8f3ce7a0e7f3269abbff86e213 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 17:43:52 +0530 Subject: [PATCH 23/25] review incorporated --- Tasks/Common/azure-arm-rest/azure-arm-common.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/Common/azure-arm-rest/azure-arm-common.ts b/Tasks/Common/azure-arm-rest/azure-arm-common.ts index 65dab40a0b27..93a6863496cf 100644 --- a/Tasks/Common/azure-arm-rest/azure-arm-common.ts +++ b/Tasks/Common/azure-arm-rest/azure-arm-common.ts @@ -82,7 +82,7 @@ export class ApplicationTokenCredentials { return this.clientId; } - private _getMSIAuthorizationToken(count: number ,timeToWait: number): Q.Promise { + private _getMSIAuthorizationToken(retyCount: number ,timeToWait: number): Q.Promise { var deferred = Q.defer(); let webRequest = new webClient.WebRequest(); webRequest.method = "GET"; @@ -102,12 +102,12 @@ export class ApplicationTokenCredentials { } else if (response.statusCode == 429 || response.statusCode == 500) { - if(count < retryLimit) + if(retyCount < retryLimit) { let waitedTime = 2000 + timeToWait * 2; - count +=1; + retyCount +=1; setTimeout(() => { - deferred.resolve(this._getMSIAuthorizationToken(count, waitedTime)); + deferred.resolve(this._getMSIAuthorizationToken(retyCount, waitedTime)); }, waitedTime); } else From aad7e3c8b41553fbcafec2df2123e54de40e03a6 Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Thu, 12 Apr 2018 17:49:05 +0530 Subject: [PATCH 24/25] review incorporated --- Tasks/AzureAppServiceManage/package-lock.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Tasks/AzureAppServiceManage/package-lock.json b/Tasks/AzureAppServiceManage/package-lock.json index 8aaadf6b8cff..72a7c54d2b1d 100644 --- a/Tasks/AzureAppServiceManage/package-lock.json +++ b/Tasks/AzureAppServiceManage/package-lock.json @@ -18,9 +18,9 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -36,7 +36,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "1.1.8" } }, "mockery": { @@ -95,10 +95,17 @@ "requires": { "minimatch": "3.0.4", "mockery": "1.7.0", - "q": "1.4.1", + "q": "1.5.1", "semver": "5.5.0", "shelljs": "0.3.0", "uuid": "3.2.1" + }, + "dependencies": { + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + } } }, "xml2js": { From 095342594c216a9daec66500b73dcb4bd55b72ab Mon Sep 17 00:00:00 2001 From: Roshan Kumar Date: Sun, 15 Apr 2018 17:44:38 +0530 Subject: [PATCH 25/25] revwerting package json changes --- Tasks/AzureKeyVault/npm-shrinkwrap.json | 18 +- .../AzureRmWebAppDeployment/package-lock.json | 263 +++++++++-------- Tasks/AzureVmssDeployment/package-lock.json | 276 +++++++++--------- Tasks/JavaToolInstaller/package-lock.json | 8 +- .../package-lock.json | 254 ++++++++-------- 5 files changed, 425 insertions(+), 394 deletions(-) diff --git a/Tasks/AzureKeyVault/npm-shrinkwrap.json b/Tasks/AzureKeyVault/npm-shrinkwrap.json index d894072e8702..3d8701896b7a 100644 --- a/Tasks/AzureKeyVault/npm-shrinkwrap.json +++ b/Tasks/AzureKeyVault/npm-shrinkwrap.json @@ -5,25 +5,11 @@ "dependencies": { "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", + "integrity": "sha1-XxtKje67DJxt8Np8AGo740d6oKk=", "requires": { "q": "1.4.1", "typed-rest-client": "0.12.0", - "vsts-task-lib": "2.0.5" - }, - "dependencies": { - "vsts-task-lib": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", - "integrity": "sha1-y9WrIy6rtxDJaXkFMYcmlZHA1RA=", - "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.4.1", - "semver": "5.4.1", - "shelljs": "0.3.0", - "uuid": "3.1.0" - } - } + "vsts-task-lib": "2.0.6" } }, "balanced-match": { diff --git a/Tasks/AzureRmWebAppDeployment/package-lock.json b/Tasks/AzureRmWebAppDeployment/package-lock.json index 52a495d314fd..bdcac53dc66f 100644 --- a/Tasks/AzureRmWebAppDeployment/package-lock.json +++ b/Tasks/AzureRmWebAppDeployment/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" }, "archiver": { "version": "1.2.0", @@ -15,13 +15,13 @@ "integrity": "sha1-+1xq9UQ7P6akJjRHU7rSp7REqt0=", "requires": { "archiver-utils": "1.3.0", - "async": "2.6.0", + "async": "2.1.4", "buffer-crc32": "0.2.13", - "glob": "7.1.2", - "lodash": "4.17.5", - "readable-stream": "2.3.6", - "tar-stream": "1.5.5", - "zip-stream": "1.2.0" + "glob": "7.1.1", + "lodash": "4.17.2", + "readable-stream": "2.2.2", + "tar-stream": "1.5.2", + "zip-stream": "1.1.0" } }, "archiver-utils": { @@ -29,20 +29,20 @@ "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz", "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=", "requires": { - "glob": "7.1.2", + "glob": "7.1.1", "graceful-fs": "4.1.11", "lazystream": "1.0.0", - "lodash": "4.17.5", - "normalize-path": "2.1.1", - "readable-stream": "2.3.6" + "lodash": "4.17.2", + "normalize-path": "2.0.1", + "readable-stream": "2.2.2" } }, "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz", + "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=", "requires": { - "lodash": "4.17.5" + "lodash": "4.17.2" } }, "azure-arm-rest": { @@ -54,9 +54,9 @@ } }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" }, "binary": { "version": "0.3.0", @@ -68,20 +68,34 @@ } }, "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", + "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=", "requires": { - "readable-stream": "2.3.6", - "safe-buffer": "5.1.1" + "readable-stream": "2.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + } } }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "0.4.2", "concat-map": "0.0.1" } }, @@ -90,6 +104,11 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" }, + "buffer-shims": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", + "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" + }, "buffers": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", @@ -104,14 +123,14 @@ } }, "compress-commons": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz", - "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.1.0.tgz", + "integrity": "sha1-n0RguxKIVkx0c5FuApiqPDINyts=", "requires": { "buffer-crc32": "0.2.13", - "crc32-stream": "2.0.0", - "normalize-path": "2.1.1", - "readable-stream": "2.3.6" + "crc32-stream": "1.0.0", + "normalize-path": "2.0.1", + "readable-stream": "2.2.2" } }, "concat-map": { @@ -124,18 +143,13 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "crc": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz", - "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=" - }, "crc32-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz", - "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz", + "integrity": "sha1-6hVeXh1zjtN3hDj/6S/+KhQa6z8=", "requires": { - "crc": "3.5.0", - "readable-stream": "2.3.6" + "buffer-crc32": "0.2.13", + "readable-stream": "2.2.2" } }, "decompress-zip": { @@ -147,7 +161,7 @@ "graceful-fs": "4.1.11", "mkpath": "0.1.0", "nopt": "3.0.6", - "q": "1.4.1", + "q": "1.5.1", "readable-stream": "1.1.14", "touch": "0.0.3" }, @@ -157,6 +171,11 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + }, "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", @@ -176,11 +195,21 @@ } }, "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz", + "integrity": "sha1-6TUyWLqpEIll78QcsO+K3i88+wc=", "requires": { - "once": "1.4.0" + "once": "1.3.3" + }, + "dependencies": { + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1.0.2" + } + } } }, "fs.realpath": { @@ -189,14 +218,14 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", "inherits": "2.0.3", - "minimatch": "3.0.4", + "minimatch": "3.0.3", "once": "1.4.0", "path-is-absolute": "1.0.1" } @@ -230,13 +259,13 @@ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "requires": { - "readable-stream": "2.3.6" + "readable-stream": "2.2.2" } }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz", + "integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I=" }, "ltx": { "version": "2.6.2", @@ -247,11 +276,11 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "1.1.6" } }, "mkpath": { @@ -264,21 +293,23 @@ "resolved": "https://registry.npmjs.org/mockery/-/mockery-1.7.0.tgz", "integrity": "sha1-9O3g2HUMHJcnwnLqLGBiniyaHE8=" }, + "node-uuid": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", + "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8=" + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "requires": { - "abbrev": "1.1.1" + "abbrev": "1.0.9" } }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "1.1.0" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz", + "integrity": "sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=" }, "once": { "version": "1.4.0", @@ -294,9 +325,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "q": { "version": "1.4.1", @@ -304,29 +335,19 @@ "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=" }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", + "integrity": "sha1-qeb+w8fdqF+LsbO6cChgRVb8gl4=", "requires": { + "buffer-shims": "1.0.0", "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", "util-deprecate": "1.0.2" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" - }, "sax": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", @@ -335,7 +356,7 @@ "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=" + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, "shelljs": { "version": "0.3.0", @@ -343,21 +364,18 @@ "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" }, "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "5.1.1" - } + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "tar-stream": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", - "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz", + "integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=", "requires": { - "bl": "1.2.2", - "end-of-stream": "1.4.1", - "readable-stream": "2.3.6", + "bl": "1.1.2", + "end-of-stream": "1.1.0", + "readable-stream": "2.2.2", "xtend": "4.0.1" } }, @@ -374,7 +392,7 @@ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", "requires": { - "abbrev": "1.1.1" + "abbrev": "1.0.9" } } } @@ -411,19 +429,31 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=" + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" }, "vsts-task-lib": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", "integrity": "sha1-y9WrIy6rtxDJaXkFMYcmlZHA1RA=", "requires": { - "minimatch": "3.0.4", + "minimatch": "3.0.3", "mockery": "1.7.0", - "q": "1.4.1", + "q": "1.5.1", "semver": "5.5.0", "shelljs": "0.3.0", - "uuid": "3.1.0" + "uuid": "3.2.1" + }, + "dependencies": { + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + } } }, "webdeployment-common": { @@ -438,19 +468,14 @@ "xml2js": "0.4.13" }, "dependencies": { - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, "vsts-task-lib": { "version": "2.0.1-preview", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.1-preview.tgz", "integrity": "sha1-rfx4BRaPtJLVcD7eZIXOt4G2SrQ=", "requires": { - "minimatch": "3.0.4", + "minimatch": "3.0.3", "mockery": "1.7.0", - "node-uuid": "1.4.8", + "node-uuid": "1.4.7", "q": "1.4.1", "semver": "5.5.0", "shelljs": "0.3.0" @@ -488,14 +513,14 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "zip-stream": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", - "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.0.tgz", + "integrity": "sha1-KtR5//wWjgWoiOjDSP9oE7PxNzM=", "requires": { "archiver-utils": "1.3.0", - "compress-commons": "1.2.2", - "lodash": "4.17.5", - "readable-stream": "2.3.6" + "compress-commons": "1.1.0", + "lodash": "4.17.2", + "readable-stream": "2.2.2" } } } diff --git a/Tasks/AzureVmssDeployment/package-lock.json b/Tasks/AzureVmssDeployment/package-lock.json index 1c2d7d9f4b4e..bb8fce47650b 100644 --- a/Tasks/AzureVmssDeployment/package-lock.json +++ b/Tasks/AzureVmssDeployment/package-lock.json @@ -19,9 +19,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc=" }, "ansi-styles": { "version": "2.2.1", @@ -70,18 +70,27 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", + "integrity": "sha1-054L7kEs7Q6O2Uoj4xTzE6lbn9E=", + "requires": { + "lru-cache": "4.1.1" + } }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", + "integrity": "sha512-BhSlMnWjs2YkMLFkFwwRHZ0V42Q9Gt3sQca7kKY9l9/if4oY782E4EgvGeXdsTeXzIvl17zg9DMgMIZ+YTXcCg==", "requires": { "q": "1.4.1", "typed-rest-client": "0.12.0", "vsts-task-lib": "2.0.5" }, "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, "vsts-task-lib": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.5.tgz", @@ -99,6 +108,7 @@ }, "azure-blobstorage-artifactProvider": { "version": "file:../../_build/Tasks/Common/azure-blobstorage-artifactProvider-1.0.0.tgz", + "integrity": "sha512-dREQMudGTtPF/B0UM9h8eQ4c5rwAMpa/bAGyCqwfN7RnLcvq92bExlFbEOZpKIALPdnW7vMN24NCkMb7s89IaA==", "requires": { "artifact-engine": "0.1.14", "azure-storage": "2.2.1", @@ -122,6 +132,18 @@ "validator": "3.35.0", "xml2js": "0.2.7", "xmlbuilder": "0.4.3" + }, + "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, + "validator": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", + "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" + } } }, "balanced-match": { @@ -129,15 +151,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, "bl": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", @@ -221,17 +234,20 @@ } }, "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "requires": { "delayed-stream": "1.0.0" } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "requires": { + "graceful-readlink": "1.0.1" + } }, "concat-map": { "version": "0.0.1", @@ -252,9 +268,9 @@ } }, "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", + "integrity": "sha1-KeSGxUGL8PNWA0qZPVFoajPoQUE=", "requires": { "assert-plus": "1.0.0" }, @@ -283,7 +299,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "0.1.0" } }, "escape-string-regexp": { @@ -297,9 +313,9 @@ "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=" }, "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" }, "forever-agent": { "version": "0.6.1", @@ -312,8 +328,8 @@ "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=", "requires": { "async": "2.6.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "combined-stream": "1.0.5", + "mime-types": "2.1.11" }, "dependencies": { "async": { @@ -321,7 +337,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.5" + "lodash": "4.17.4" } } } @@ -340,9 +356,9 @@ } }, "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=", "requires": { "assert-plus": "1.0.0" }, @@ -354,6 +370,11 @@ } } }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" + }, "handlebars": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", @@ -371,8 +392,8 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "requires": { "chalk": "1.1.3", - "commander": "2.15.1", - "is-my-json-valid": "2.17.2", + "commander": "2.9.0", + "is-my-json-valid": "2.13.1", "pinkie-promise": "2.0.1" } }, @@ -381,7 +402,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "2.0.0" } }, "hash-base": { @@ -415,8 +436,8 @@ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "requires": { "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "jsprim": "1.2.2", + "sshpk": "1.8.3" } }, "inherits": { @@ -429,20 +450,14 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-my-ip-valid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", - "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==" - }, "is-my-json-valid": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", - "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "integrity": "sha1-1Vd4qC/rawlj/0vhEdXRaE6JBwc=", "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", - "is-my-ip-valid": "1.0.0", - "jsonpointer": "4.0.1", + "jsonpointer": "2.0.0", "xtend": "4.0.1" } }, @@ -466,10 +481,19 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "jodid25519": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", + "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", + "optional": true, + "requires": { + "jsbn": "0.1.0" + } + }, "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", + "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0=", "optional": true }, "json-edm-parser": { @@ -481,9 +505,9 @@ } }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", + "integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY=" }, "json-stringify-safe": { "version": "5.0.1", @@ -496,26 +520,18 @@ "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=" }, "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", + "integrity": "sha1-OvHdIP6FRjkQ1GmjheMwF9KgMNk=" }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", + "integrity": "sha1-8gyQaskqvVjjt5rIvHCkiDJRLaE=", "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } + "extsprintf": "1.0.2", + "json-schema": "0.2.2", + "verror": "1.3.6" } }, "kind-of": { @@ -533,15 +549,24 @@ "optional": true }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -552,16 +577,16 @@ } }, "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=" }, "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "integrity": "sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=", "requires": { - "mime-db": "1.33.0" + "mime-db": "1.23.0" } }, "minimatch": { @@ -614,10 +639,10 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "q": { "version": "1.4.1", @@ -653,10 +678,10 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.7.0", + "aws4": "1.3.2", "bl": "1.1.2", "caseless": "0.11.0", - "combined-stream": "1.0.6", + "combined-stream": "1.0.5", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "1.0.1", @@ -666,12 +691,12 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", + "mime-types": "2.1.11", "node-uuid": "1.4.8", "oauth-sign": "0.8.2", "qs": "6.2.3", "stringstream": "0.0.5", - "tough-cookie": "2.3.4", + "tough-cookie": "2.3.1", "tunnel-agent": "0.4.3" }, "dependencies": { @@ -733,18 +758,18 @@ } }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", + "integrity": "sha1-iQzJ1hTcUpLlyxpUOwPJq6pcN04=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", + "dashdash": "1.14.0", "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "getpass": "0.1.6", + "jodid25519": "1.0.2", + "jsbn": "0.1.0", + "tweetnacl": "0.13.3" }, "dependencies": { "assert-plus": { @@ -769,7 +794,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "2.0.0" } }, "supports-color": { @@ -778,12 +803,9 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "1.4.1" - } + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", + "integrity": "sha1-mcd9+7fYBCSeiimdTLD9gf7wg/0=" }, "tunnel": { "version": "0.0.4", @@ -796,9 +818,9 @@ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" }, "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", + "integrity": "sha1-1ii1bzvMPVrnS6nUwacE3vWrS1Y=", "optional": true }, "typed-rest-client": { @@ -847,12 +869,18 @@ }, "utility-common": { "version": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz", + "integrity": "sha512-YTwgF9Sck6tHYUdINIz3cLhm6prexFoHddwFAstWMGUiyMixpY4+OUz6KEF92WOEnJjCMMC9KOXKd3kBo4F6dQ==", "requires": { "semver": "5.5.0", "vso-node-api": "6.0.1-preview", "vsts-task-lib": "2.0.6" }, "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, "vsts-task-lib": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.6.tgz", @@ -868,31 +896,12 @@ } } }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, - "validator": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", - "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" - }, "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } + "extsprintf": "1.0.2" } }, "vso-node-api": { @@ -954,6 +963,11 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", diff --git a/Tasks/JavaToolInstaller/package-lock.json b/Tasks/JavaToolInstaller/package-lock.json index 8cf7d956a787..fe70f043916d 100644 --- a/Tasks/JavaToolInstaller/package-lock.json +++ b/Tasks/JavaToolInstaller/package-lock.json @@ -89,9 +89,9 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", @@ -687,7 +687,7 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.7.0", + "aws4": "1.6.0", "bl": "1.1.2", "caseless": "0.11.0", "combined-stream": "1.0.6", diff --git a/Tasks/JenkinsDownloadArtifacts/package-lock.json b/Tasks/JenkinsDownloadArtifacts/package-lock.json index bcbe5cf804cc..2424ad52d2d9 100644 --- a/Tasks/JenkinsDownloadArtifacts/package-lock.json +++ b/Tasks/JenkinsDownloadArtifacts/package-lock.json @@ -24,9 +24,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc=" }, "ansi-styles": { "version": "2.2.1", @@ -34,9 +34,9 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "artifact-engine": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.19.tgz", - "integrity": "sha512-G78LODsUaA84RDjKZdUsLUlvZh/ZjdI9Y3ISeeUlQl6atVhtf3k87TwLJqvWg6I19/MQ8I7bq3rDoOgPiVTKCg==", + "version": "0.1.18", + "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.18.tgz", + "integrity": "sha512-91KWT9tA5SdVpuCpoJlCMpIVQGVSu8Rc4MI2gXWVQa/pZC67uks9ZnpkXa8ZPYFgRJ0I6tJ2itCFUtoKrqn2gg==", "requires": { "handlebars": "4.0.10", "minimatch": "3.0.2", @@ -88,9 +88,12 @@ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", + "integrity": "sha1-054L7kEs7Q6O2Uoj4xTzE6lbn9E=", + "requires": { + "lru-cache": "4.1.1" + } }, "azure-arm-rest": { "version": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", @@ -161,6 +164,18 @@ "validator": "3.35.0", "xml2js": "0.2.7", "xmlbuilder": "0.4.3" + }, + "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, + "validator": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", + "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" + } } }, "balanced-match": { @@ -168,15 +183,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, "binary": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", @@ -290,9 +296,12 @@ } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "requires": { + "graceful-readlink": "1.0.1" + } }, "concat-map": { "version": "0.0.1", @@ -313,9 +322,9 @@ } }, "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", + "integrity": "sha1-KeSGxUGL8PNWA0qZPVFoajPoQUE=", "requires": { "assert-plus": "1.0.0" }, @@ -376,7 +385,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "0.1.0" } }, "escape-string-regexp": { @@ -390,9 +399,9 @@ "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=" }, "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" }, "forever-agent": { "version": "0.6.1", @@ -406,7 +415,7 @@ "requires": { "async": "2.6.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "2.1.11" }, "dependencies": { "async": { @@ -414,7 +423,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.5" + "lodash": "4.17.4" } } } @@ -443,9 +452,9 @@ } }, "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=", "requires": { "assert-plus": "1.0.0" }, @@ -462,6 +471,11 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" + }, "handlebars": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", @@ -479,8 +493,8 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "requires": { "chalk": "1.1.3", - "commander": "2.15.1", - "is-my-json-valid": "2.17.2", + "commander": "2.9.0", + "is-my-json-valid": "2.13.1", "pinkie-promise": "2.0.1" } }, @@ -489,7 +503,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "2.0.0" } }, "hash-base": { @@ -523,8 +537,8 @@ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "requires": { "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "jsprim": "1.2.2", + "sshpk": "1.8.3" } }, "inherits": { @@ -537,20 +551,14 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-my-ip-valid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", - "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==" - }, "is-my-json-valid": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", - "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "integrity": "sha1-1Vd4qC/rawlj/0vhEdXRaE6JBwc=", "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", - "is-my-ip-valid": "1.0.0", - "jsonpointer": "4.0.1", + "jsonpointer": "2.0.0", "xtend": "4.0.1" } }, @@ -574,10 +582,19 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "jodid25519": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", + "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", + "optional": true, + "requires": { + "jsbn": "0.1.0" + } + }, "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", + "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0=", "optional": true }, "json-edm-parser": { @@ -589,9 +606,9 @@ } }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", + "integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY=" }, "json-stringify-safe": { "version": "5.0.1", @@ -612,26 +629,18 @@ "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=" }, "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", + "integrity": "sha1-OvHdIP6FRjkQ1GmjheMwF9KgMNk=" }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz", + "integrity": "sha1-8gyQaskqvVjjt5rIvHCkiDJRLaE=", "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } + "extsprintf": "1.0.2", + "json-schema": "0.2.2", + "verror": "1.3.6" } }, "kind-of": { @@ -649,15 +658,24 @@ "optional": true }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -668,16 +686,16 @@ } }, "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=" }, "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "integrity": "sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=", "requires": { - "mime-db": "1.33.0" + "mime-db": "1.23.0" } }, "minimatch": { @@ -743,10 +761,10 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "q": { "version": "1.4.1", @@ -782,7 +800,7 @@ "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", "requires": { "aws-sign2": "0.6.0", - "aws4": "1.7.0", + "aws4": "1.3.2", "bl": "1.1.2", "caseless": "0.11.0", "combined-stream": "1.0.6", @@ -795,12 +813,12 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", + "mime-types": "2.1.11", "node-uuid": "1.4.8", "oauth-sign": "0.8.2", "qs": "6.2.3", "stringstream": "0.0.5", - "tough-cookie": "2.3.4", + "tough-cookie": "2.3.1", "tunnel-agent": "0.4.3" }, "dependencies": { @@ -862,18 +880,18 @@ } }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", + "integrity": "sha1-iQzJ1hTcUpLlyxpUOwPJq6pcN04=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", + "dashdash": "1.14.0", "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "getpass": "0.1.6", + "jodid25519": "1.0.2", + "jsbn": "0.1.0", + "tweetnacl": "0.13.3" }, "dependencies": { "assert-plus": { @@ -898,7 +916,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "2.0.0" } }, "supports-color": { @@ -925,12 +943,9 @@ } }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "1.4.1" - } + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", + "integrity": "sha1-mcd9+7fYBCSeiimdTLD9gf7wg/0=" }, "traverse": { "version": "0.3.9", @@ -948,9 +963,9 @@ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" }, "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", + "integrity": "sha1-1ii1bzvMPVrnS6nUwacE3vWrS1Y=", "optional": true }, "typed-rest-client": { @@ -1007,26 +1022,12 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, - "validator": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz", - "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=" - }, "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } + "extsprintf": "1.0.2" } }, "vsts-task-lib": { @@ -1071,6 +1072,11 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",