From 1a2d2f3555e9b7adcca9bdd950952bde10aab1bb Mon Sep 17 00:00:00 2001 From: Pranshu Negi Date: Tue, 8 Nov 2022 14:39:37 +0100 Subject: [PATCH 1/3] npm audit fix --- Tasks/AzureKeyVaultV1/Tests/L0.ts | 18 +++--- Tasks/AzureKeyVaultV1/npm-shrinkwrap.json | 73 +++++++++++++---------- Tasks/AzureKeyVaultV1/package.json | 6 +- Tasks/AzureKeyVaultV1/task.json | 2 +- Tasks/AzureKeyVaultV1/task.loc.json | 2 +- 5 files changed, 55 insertions(+), 46 deletions(-) diff --git a/Tasks/AzureKeyVaultV1/Tests/L0.ts b/Tasks/AzureKeyVaultV1/Tests/L0.ts index 11edaf29677b..24cbdc8142f4 100644 --- a/Tasks/AzureKeyVaultV1/Tests/L0.ts +++ b/Tasks/AzureKeyVaultV1/Tests/L0.ts @@ -31,11 +31,11 @@ describe('Azure Key Vault', function () { assert(tr.stdout.indexOf("getSecretValue is called for secret4") < 0, "getSecretValue should not be called for secret4"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret1;issecret=true;]secret1-value") > 0, "##vso[task.setvariable variable=secret1;issecret=true;]secret1-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret2;issecret=true;]secret2-value") > 0, "##vso[task.setvariable variable=secret2;issecret=true;]secret2-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3;issecret=true;]secret3-value") > 0, "##vso[task.setvariable variable=secret3;issecret=true;]secret3-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret1;isOutput=false;issecret=true;]secret1-value") > 0, "##vso[task.setvariable variable=secret1;isOutput=false;issecret=true;]secret1-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret2;isOutput=false;issecret=true;]secret2-value") > 0, "##vso[task.setvariable variable=secret2;isOutput=false;issecret=true;]secret2-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3;isOutput=false;issecret=true;]secret3-value") > 0, "##vso[task.setvariable variable=secret3;isOutput=false;issecret=true;]secret3-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret4;issecret=true;]secret4-value") < 0, "secret4 value should not be set"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret4;isOutput=false;issecret=true;]secret4-value") < 0, "secret4 value should not be set"); done(); } @@ -62,12 +62,12 @@ describe('Azure Key Vault', function () { assert(tr.stdout.indexOf("getSecretValue is called for secret2") > 0, "getSecretValue is called for secret2"); assert(tr.stdout.indexOf("getSecretValue is called for secret3/versionIdentifierGuid") > 0, "getSecretValue is called for secret3/versionIdentifierGuid"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret1;issecret=true;]secret1-value") > 0, "##vso[task.setvariable variable=secret1;issecret=true;]secret1-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret2;issecret=true;]secret2-value") > 0, "##vso[task.setvariable variable=secret2;issecret=true;]secret2-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3;issecret=true;]secret3/versionIdentifierGuid-value") > 0, "##vso[task.setvariable variable=secret3;issecret=true;]secret3/versionIdentifierGuid-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3/versionIdentifierGuid;issecret=true;]secret3/versionIdentifierGuid-value") > 0, "##vso[task.setvariable variable=secret3/versionIdentifierGuid;issecret=true;]secret3/versionIdentifierGuid-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret1;isOutput=false;issecret=true;]secret1-value") > 0, "##vso[task.setvariable variable=secret1;isOutput=false;issecret=true;]secret1-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret2;isOutput=false;issecret=true;]secret2-value") > 0, "##vso[task.setvariable variable=secret2;isOutput=false;issecret=true;]secret2-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3;isOutput=false;issecret=true;]secret3/versionIdentifierGuid-value") > 0, "##vso[task.setvariable variable=secret3;isOutput=false;issecret=true;]secret3/versionIdentifierGuid-value"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret3/versionIdentifierGuid;isOutput=false;issecret=true;]secret3/versionIdentifierGuid-value") > 0, "##vso[task.setvariable variable=secret3/versionIdentifierGuid;isOutput=false;issecret=true;]secret3/versionIdentifierGuid-value"); - assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret4;issecret=true;]secret4-value") < 0, "secret4 value should not be set"); + assert(tr.stdout.indexOf("##vso[task.setvariable variable=secret4;isOutput=false;issecret=true;]secret4-value") < 0, "secret4 value should not be set"); done(); } diff --git a/Tasks/AzureKeyVaultV1/npm-shrinkwrap.json b/Tasks/AzureKeyVaultV1/npm-shrinkwrap.json index 145952b2b223..7cf87a80a101 100644 --- a/Tasks/AzureKeyVaultV1/npm-shrinkwrap.json +++ b/Tasks/AzureKeyVaultV1/npm-shrinkwrap.json @@ -62,17 +62,41 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, + "azure-devops-node-api": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz", + "integrity": "sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==", + "requires": { + "tunnel": "0.0.6", + "typed-rest-client": "^1.8.4" + }, + "dependencies": { + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" + } + } + }, "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": "4.0.1-preview", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-4.0.1-preview.tgz", + "integrity": "sha512-yvxqTzBy6G1U4lDkQgvewGDtd4UxrFTTI49JBByS0vjz55lE/9hmOttFm/BSRCEeLkG0lp3t3ja54bsNBBM4cA==", "requires": { - "minimatch": "3.0.4", + "minimatch": "3.0.5", "mockery": "^1.7.0", - "q": "^1.1.2", + "q": "^1.5.1", "semver": "^5.1.0", - "shelljs": "^0.3.0", + "shelljs": "^0.8.5", + "sync-request": "6.1.0", "uuid": "^3.0.1" + }, + "dependencies": { + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" + } } }, "azure-pipelines-tasks-azure-arm-rest-v2": { @@ -421,9 +445,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "requires": { "brace-expansion": "^1.1.7" } @@ -484,11 +508,6 @@ "asap": "~2.0.6" } }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=" - }, "qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -540,9 +559,14 @@ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "shelljs": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", - "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", + "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } }, "side-channel": { "version": "1.0.4", @@ -610,11 +634,6 @@ } } }, - "tunnel": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", - "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=" - }, "typed-rest-client": { "version": "1.8.4", "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz", @@ -658,16 +677,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, - "vso-node-api": { - "version": "6.0.1-preview", - "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.0.1-preview.tgz", - "integrity": "sha1-RBprv5s8aNpiTbAeo1y6jwpMLKs=", - "requires": { - "q": "^1.0.1", - "tunnel": "0.0.4", - "underscore": "^1.8.3" - } - }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/Tasks/AzureKeyVaultV1/package.json b/Tasks/AzureKeyVaultV1/package.json index ecc24842bc5d..e07fdccb68f3 100644 --- a/Tasks/AzureKeyVaultV1/package.json +++ b/Tasks/AzureKeyVaultV1/package.json @@ -6,10 +6,10 @@ "@types/node": "^10.17.0", "@types/q": "^1.5.0", "@types/uuid": "^8.3.0", - "azure-pipelines-task-lib": "2.8.0", + "azure-devops-node-api": "11.2.0", + "azure-pipelines-task-lib": "^4.0.1-preview", "azure-pipelines-tasks-azure-arm-rest-v2": "^2.210.0", - "moment": "^2.29.4", - "vso-node-api": "6.0.1-preview" + "moment": "^2.29.4" }, "devDependencies": { "typescript": "4.0.2" diff --git a/Tasks/AzureKeyVaultV1/task.json b/Tasks/AzureKeyVaultV1/task.json index b26842ec8f8e..490e4e1a9f14 100644 --- a/Tasks/AzureKeyVaultV1/task.json +++ b/Tasks/AzureKeyVaultV1/task.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 212, + "Minor": 213, "Patch": 0 }, "demands": [], diff --git a/Tasks/AzureKeyVaultV1/task.loc.json b/Tasks/AzureKeyVaultV1/task.loc.json index 790d35eb5f19..0f653efebcd2 100644 --- a/Tasks/AzureKeyVaultV1/task.loc.json +++ b/Tasks/AzureKeyVaultV1/task.loc.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 212, + "Minor": 213, "Patch": 0 }, "demands": [], From 24fbefdfdb16d7eee7d9cedc441527886a47cc60 Mon Sep 17 00:00:00 2001 From: Pranshu Negi Date: Wed, 9 Nov 2022 09:41:19 +0100 Subject: [PATCH 2/3] Updated minor version --- Tasks/AzureKeyVaultV1/task.json | 2 +- Tasks/AzureKeyVaultV1/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/AzureKeyVaultV1/task.json b/Tasks/AzureKeyVaultV1/task.json index 490e4e1a9f14..047f71d40355 100644 --- a/Tasks/AzureKeyVaultV1/task.json +++ b/Tasks/AzureKeyVaultV1/task.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 213, + "Minor": 214, "Patch": 0 }, "demands": [], diff --git a/Tasks/AzureKeyVaultV1/task.loc.json b/Tasks/AzureKeyVaultV1/task.loc.json index 0f653efebcd2..1b4fc09fa67d 100644 --- a/Tasks/AzureKeyVaultV1/task.loc.json +++ b/Tasks/AzureKeyVaultV1/task.loc.json @@ -14,7 +14,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 213, + "Minor": 214, "Patch": 0 }, "demands": [], From 471c924eb682054a9592de5d5287c1d08c68f97a Mon Sep 17 00:00:00 2001 From: Pranshu-Negi Date: Tue, 29 Nov 2022 11:49:21 +0100 Subject: [PATCH 3/3] bumped task version --- Tasks/AzureKeyVaultV1/task.json | 4 ++-- Tasks/AzureKeyVaultV1/task.loc.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/AzureKeyVaultV1/task.json b/Tasks/AzureKeyVaultV1/task.json index 8d5c6b37ab7d..88aa7b989d62 100644 --- a/Tasks/AzureKeyVaultV1/task.json +++ b/Tasks/AzureKeyVaultV1/task.json @@ -14,8 +14,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 214, - "Patch": 2 + "Minor": 215, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.0.0", diff --git a/Tasks/AzureKeyVaultV1/task.loc.json b/Tasks/AzureKeyVaultV1/task.loc.json index fbb014fbb08d..5354d8e6f4b5 100644 --- a/Tasks/AzureKeyVaultV1/task.loc.json +++ b/Tasks/AzureKeyVaultV1/task.loc.json @@ -14,8 +14,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 214, - "Patch": 2 + "Minor": 215, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.0.0",