From 63b10334d6d9501a274efdd686663e2179a0db32 Mon Sep 17 00:00:00 2001 From: Anurag Chauhan Date: Tue, 10 Nov 2020 11:04:18 +0530 Subject: [PATCH 1/2] Updating AzureResourceManagerTemplateDeploymentV3 task to consume arm-rest-v2 --- .../package-lock.json | 154 +++++++++++++++++- .../package.json | 2 +- .../task.json | 2 +- .../task.loc.json | 2 +- 4 files changed, 150 insertions(+), 10 deletions(-) diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json index fcf804533b2a..6c52cf439754 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json @@ -18,6 +18,11 @@ "resolved": "https://registry.npmjs.org/@types/q/-/q-1.0.7.tgz", "integrity": "sha512-0WS7XU7sXzQ7J1nbnMKKYdjrrFoO3YtZYgUzeV8JFXffPnHfvSJQleR70I8BOAsOm14i4dyaAZ3YzqIl1YhkXQ==" }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, "azure-pipelines-task-lib": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.8.0.tgz", @@ -32,17 +37,33 @@ } }, "azure-pipelines-tasks-azure-arm-rest-v2": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-1.0.5.tgz", - "integrity": "sha512-NE0nc5qFwgvIjlc6Oy5MeMFqevHqfUa42QXbz96RpIW76Gk6nIuN9OPd/RltvEg5fLrza/Io2GMesVwBK243kg==", + "version": "1.178.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-1.178.1.tgz", + "integrity": "sha512-cHwBRPFEPoWt4/7kx1A2DrysCyKFNVw25Vd25sBUI8gHSPcCAYSYcMwefYJuI5J1QcHKLIvwVdB8uk21+fUUaw==", "requires": { "@types/mocha": "2.2.48", "@types/node": "6.0.68", "@types/q": "1.0.7", - "azure-pipelines-task-lib": "2.8.0", + "azure-pipelines-task-lib": "^2.11.2", "jsonwebtoken": "7.3.0", "q": "1.4.1", "typed-rest-client": "1.7.3" + }, + "dependencies": { + "azure-pipelines-task-lib": { + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.11.3.tgz", + "integrity": "sha512-gXops6Npkloh7AKPIvptx0KY1kdf1yd+BFdp/ksnbyW7CS3uXzBQXU1Dermr7A895TrOd02PI6hmsL8cBlePNA==", + "requires": { + "minimatch": "3.0.4", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "sync-request": "3.0.1", + "uuid": "^3.0.1" + } + } } }, "balanced-match": { @@ -64,11 +85,37 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + }, + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, "ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -82,6 +129,31 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, + "http-basic": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz", + "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=", + "requires": { + "caseless": "~0.11.0", + "concat-stream": "^1.4.6", + "http-response-object": "^1.0.0" + } + }, + "http-response-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz", + "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, "isemail": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", @@ -157,6 +229,19 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + }, "q": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", @@ -167,10 +252,24 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "semver": { "version": "5.7.1", @@ -182,6 +281,37 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "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.0" + } + }, + "sync-request": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-3.0.1.tgz", + "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=", + "requires": { + "concat-stream": "^1.4.7", + "http-response-object": "^1.0.1", + "then-request": "^2.0.1" + } + }, + "then-request": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz", + "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=", + "requires": { + "caseless": "~0.11.0", + "concat-stream": "^1.4.7", + "http-basic": "^2.5.1", + "http-response-object": "^1.1.0", + "promise": "^7.1.1", + "qs": "^6.1.0" + } + }, "topo": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz", @@ -205,11 +335,21 @@ "underscore": "1.8.3" } }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, "underscore": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json index b177778413c9..ac2767afeb99 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json @@ -2,7 +2,7 @@ "name": "AzureResourceManagerTemplateDeployment", "main": "main.js", "dependencies": { - "azure-pipelines-tasks-azure-arm-rest-v2": "1.0.5", + "azure-pipelines-tasks-azure-arm-rest-v2": "1.178.1", "azure-pipelines-task-lib": "2.8.0", "moment": "2.21.0", "typed-rest-client": "1.7.3" diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json index ccb5f39965d6..83e02e3d1235 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 3, - "Minor": 176, + "Minor": 179, "Patch": 0 }, "demands": [], diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json index 6414d4b9e7c0..cea047cd62e4 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 3, - "Minor": 176, + "Minor": 179, "Patch": 0 }, "demands": [], From ed0ad701946d752dc6328db293bd66d3ad1c45dd Mon Sep 17 00:00:00 2001 From: Anurag Chauhan Date: Tue, 10 Nov 2020 14:51:26 +0530 Subject: [PATCH 2/2] fixing resource path warnings --- Tasks/AzureResourceManagerTemplateDeploymentV3/main.ts | 2 +- .../package-lock.json | 7 ++++--- .../AzureResourceManagerTemplateDeploymentV3/package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/main.ts b/Tasks/AzureResourceManagerTemplateDeploymentV3/main.ts index 2ee85c10f9cc..78f6fe85026f 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/main.ts +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/main.ts @@ -61,7 +61,7 @@ function run(): Promise { var taskManifestPath = path.join(__dirname, "task.json"); tl.debug("Setting resource path to " + taskManifestPath); tl.setResourcePath(taskManifestPath); -tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/module.json')); +tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/module.json'), true); run().then((result) => tl.setResult(tl.TaskResult.Succeeded, "") diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json index 6c52cf439754..33caad198a12 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/package-lock.json @@ -24,15 +24,16 @@ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "azure-pipelines-task-lib": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.8.0.tgz", - "integrity": "sha512-PR8oap9z2j+o455W3PwAfB4SX1p4GdJc9OHQaQV0V+iQS1IBY6dVgcNSQMkHAXb0V1bbuLOFBLanXPe5eSgGTQ==", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.11.2.tgz", + "integrity": "sha512-v4rVaoeCggmoClyeVWwZs48yjUyfT9GHKJHNplA7nXUPsH6oODsUTuA1pnesxsM6RzMq4kD6UlIu9/KMd6MFKw==", "requires": { "minimatch": "3.0.4", "mockery": "^1.7.0", "q": "^1.1.2", "semver": "^5.1.0", "shelljs": "^0.3.0", + "sync-request": "3.0.1", "uuid": "^3.0.1" } }, diff --git a/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json b/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json index ac2767afeb99..f2d1a78e27a8 100644 --- a/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json +++ b/Tasks/AzureResourceManagerTemplateDeploymentV3/package.json @@ -3,7 +3,7 @@ "main": "main.js", "dependencies": { "azure-pipelines-tasks-azure-arm-rest-v2": "1.178.1", - "azure-pipelines-task-lib": "2.8.0", + "azure-pipelines-task-lib": "2.11.2", "moment": "2.21.0", "typed-rest-client": "1.7.3" }