From bc3ecc60e08a0f4ed3b289c3cab860274884e303 Mon Sep 17 00:00:00 2001 From: Alex Weininger Date: Fri, 14 Jul 2023 19:45:38 -0700 Subject: [PATCH] Update to track 2 (#1257) * Update to track 2 * Fixup --- package-lock.json | 242 +++++++++++++++++++++++------------- package.json | 7 +- test/nightly/deploy.test.ts | 14 +-- 3 files changed, 170 insertions(+), 93 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5123345..46e5ebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,16 +11,17 @@ "license": "SEE LICENSE IN LICENSE.md", "dependencies": { "@azure-tools/azcopy-node": "^2.11.0", - "@azure/arm-storage": "^17.1.0", + "@azure/arm-storage": "^18.1.0", "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/core-rest-pipeline": "^1.11.0", "@azure/data-tables": "^13.0.0", "@azure/storage-blob": "^12.1.1", "@azure/storage-file-datalake": "^12.1.1", "@azure/storage-file-share": "^12.1.1", "@azure/storage-queue": "^12.7.0", "@microsoft/vscode-azext-azureappservice": "^0.7.0", - "@microsoft/vscode-azext-azureutils": "^0.3.4", - "@microsoft/vscode-azext-utils": "^1.1.0", + "@microsoft/vscode-azext-azureutils": "^2.0.1", + "@microsoft/vscode-azext-utils": "^2.0.1", "@microsoft/vscode-azureresources-api": "^2.0.4", "glob": "^7.1.2", "mime": "^2.4.4", @@ -239,20 +240,20 @@ } }, "node_modules/@azure/arm-storage": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.2.1.tgz", - "integrity": "sha512-J2jmTPv8ZraSHDTz9l2Bx8gNL3ktfDDWo2mxWfzarn64O9Fjhb+l85YWyubGy2xUdeGuZPKzvQLltGv8bSu8eQ==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-18.1.0.tgz", + "integrity": "sha512-/31M6UzDD4NjsOT3mVAM2PhLyyT8/SfvL3PgFerk91BBnUy7toJXzzSsBO0Ysx7I1Pvjo6jSkTPs3D4Kz9CGDg==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-client": "^1.5.0", + "@azure/core-client": "^1.6.1", "@azure/core-lro": "^2.2.0", "@azure/core-paging": "^1.2.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@azure/arm-storage-profile-2020-09-01-hybrid": { @@ -302,9 +303,9 @@ } }, "node_modules/@azure/core-client": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz", - "integrity": "sha512-ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.3.tgz", + "integrity": "sha512-kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -380,9 +381,9 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz", - "integrity": "sha512-AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.11.0.tgz", + "integrity": "sha512-nB4KXl6qAyJmBVLWA7SakT4tzpYZTCk4pvRBeI+Ye0WYSOrlTqlMhc4MSS/8atD3ufeYWdkN380LLoXlUUzThw==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -968,6 +969,55 @@ "yazl": "^2.5.1" } }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@azure/arm-storage": { + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.2.1.tgz", + "integrity": "sha512-J2jmTPv8ZraSHDTz9l2Bx8gNL3ktfDDWo2mxWfzarn64O9Fjhb+l85YWyubGy2xUdeGuZPKzvQLltGv8bSu8eQ==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.5.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.8.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-azureutils": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.3.9.tgz", + "integrity": "sha512-lKhxSROhTBpz45f0hqYDHfdrGlNOgzfMGXbNproqwyc5qnEYBhs/qG65hcwhLzVm44lYPpBP1aka7OyDEocPOQ==", + "dependencies": { + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/arm-resources-subscriptions": "^2.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@microsoft/vscode-azext-utils": "^0.4.3", + "semver": "^7.3.7", + "vscode-nls": "^5.0.1" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-azureutils/node_modules/@microsoft/vscode-azext-utils": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.4.6.tgz", + "integrity": "sha512-CPIIvdod95Qdz5vdGg4j7HpryjKEsDVmdir/VduJZHgdVs1iuqa/9UY0+kIg2JnsnpThAdQH36A1GVA8jQeheg==", + "dependencies": { + "@microsoft/vscode-azureresources-api": "^2.0.2", + "@vscode/extension-telemetry": "^0.6.2", + "dayjs": "^1.11.2", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^8.2.0", + "open": "^8.0.4", + "semver": "^7.3.7", + "vscode-nls": "^5.0.1", + "vscode-tas-client": "^0.1.47" + } + }, "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-utils": { "version": "0.3.26", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.26.tgz", @@ -1008,42 +1058,34 @@ "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" }, "node_modules/@microsoft/vscode-azext-azureutils": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.3.9.tgz", - "integrity": "sha512-lKhxSROhTBpz45f0hqYDHfdrGlNOgzfMGXbNproqwyc5qnEYBhs/qG65hcwhLzVm44lYPpBP1aka7OyDEocPOQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.1.tgz", + "integrity": "sha512-E/Ju6boO4Q0yj9sB6l+gjIzpKQGmnaJgG47X6H2x2g7phZDuLPyeatuQDxKq9piHZMLBNdYTBg7/cUXRcu2nCg==", "dependencies": { "@azure/arm-resources": "^5.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", "@azure/arm-resources-subscriptions": "^2.0.0", - "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage": "^18.0.0", "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", - "@azure/ms-rest-js": "^2.2.1", - "@microsoft/vscode-azext-utils": "^0.4.3", + "@azure/core-client": "^1.6.0", + "@azure/core-rest-pipeline": "^1.9.0", + "@azure/logger": "^1.0.4", + "@microsoft/vscode-azext-utils": "^2.0.0", "semver": "^7.3.7", - "vscode-nls": "^5.0.1" + "uuid": "^9.0.0" + }, + "peerDependencies": { + "@azure/ms-rest-azure-env": "^2.0.0" } }, - "node_modules/@microsoft/vscode-azext-azureutils/node_modules/@microsoft/vscode-azext-utils": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.4.6.tgz", - "integrity": "sha512-CPIIvdod95Qdz5vdGg4j7HpryjKEsDVmdir/VduJZHgdVs1iuqa/9UY0+kIg2JnsnpThAdQH36A1GVA8jQeheg==", - "dependencies": { - "@microsoft/vscode-azureresources-api": "^2.0.2", - "@vscode/extension-telemetry": "^0.6.2", - "dayjs": "^1.11.2", - "escape-string-regexp": "^2.0.0", - "html-to-text": "^8.2.0", - "open": "^8.0.4", - "semver": "^7.3.7", - "vscode-nls": "^5.0.1", - "vscode-tas-client": "^0.1.47" + "node_modules/@microsoft/vscode-azext-azureutils/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" } }, - "node_modules/@microsoft/vscode-azext-azureutils/node_modules/vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" - }, "node_modules/@microsoft/vscode-azext-dev": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-dev/-/vscode-azext-dev-1.2.0.tgz", @@ -1201,9 +1243,9 @@ } }, "node_modules/@microsoft/vscode-azext-utils": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-1.2.2.tgz", - "integrity": "sha512-mOTcJF8IMsz+Xn8QTUP1AC3K5tPl/3f17L2xGTTtLeV/HJ2sTh/3712NFuN58tnOwdISdazId4tHwaqUta8HEA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.0.1.tgz", + "integrity": "sha512-T8PMZPHOpQl86lqpY9ngnAAg99O+vTBWQYJkXzxRzpHqIuF2ecaTAnN2+F/Xev3/O0BoGbMjXMva9rzJ+l+GxQ==", "dependencies": { "@microsoft/vscode-azureresources-api": "^2.0.4", "@vscode/extension-telemetry": "^0.6.2", @@ -12612,13 +12654,13 @@ } }, "@azure/arm-storage": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.2.1.tgz", - "integrity": "sha512-J2jmTPv8ZraSHDTz9l2Bx8gNL3ktfDDWo2mxWfzarn64O9Fjhb+l85YWyubGy2xUdeGuZPKzvQLltGv8bSu8eQ==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-18.1.0.tgz", + "integrity": "sha512-/31M6UzDD4NjsOT3mVAM2PhLyyT8/SfvL3PgFerk91BBnUy7toJXzzSsBO0Ysx7I1Pvjo6jSkTPs3D4Kz9CGDg==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-client": "^1.5.0", + "@azure/core-client": "^1.6.1", "@azure/core-lro": "^2.2.0", "@azure/core-paging": "^1.2.0", "@azure/core-rest-pipeline": "^1.8.0", @@ -12663,9 +12705,9 @@ } }, "@azure/core-client": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz", - "integrity": "sha512-ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.3.tgz", + "integrity": "sha512-kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -12728,9 +12770,9 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz", - "integrity": "sha512-AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.11.0.tgz", + "integrity": "sha512-nB4KXl6qAyJmBVLWA7SakT4tzpYZTCk4pvRBeI+Ye0WYSOrlTqlMhc4MSS/8atD3ufeYWdkN380LLoXlUUzThw==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -13237,6 +13279,54 @@ "yazl": "^2.5.1" }, "dependencies": { + "@azure/arm-storage": { + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.2.1.tgz", + "integrity": "sha512-J2jmTPv8ZraSHDTz9l2Bx8gNL3ktfDDWo2mxWfzarn64O9Fjhb+l85YWyubGy2xUdeGuZPKzvQLltGv8bSu8eQ==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.5.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.8.0", + "tslib": "^2.2.0" + } + }, + "@microsoft/vscode-azext-azureutils": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.3.9.tgz", + "integrity": "sha512-lKhxSROhTBpz45f0hqYDHfdrGlNOgzfMGXbNproqwyc5qnEYBhs/qG65hcwhLzVm44lYPpBP1aka7OyDEocPOQ==", + "requires": { + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/arm-resources-subscriptions": "^2.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@microsoft/vscode-azext-utils": "^0.4.3", + "semver": "^7.3.7", + "vscode-nls": "^5.0.1" + }, + "dependencies": { + "@microsoft/vscode-azext-utils": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.4.6.tgz", + "integrity": "sha512-CPIIvdod95Qdz5vdGg4j7HpryjKEsDVmdir/VduJZHgdVs1iuqa/9UY0+kIg2JnsnpThAdQH36A1GVA8jQeheg==", + "requires": { + "@microsoft/vscode-azureresources-api": "^2.0.2", + "@vscode/extension-telemetry": "^0.6.2", + "dayjs": "^1.11.2", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^8.2.0", + "open": "^8.0.4", + "semver": "^7.3.7", + "vscode-nls": "^5.0.1", + "vscode-tas-client": "^0.1.47" + } + } + } + }, "@microsoft/vscode-azext-utils": { "version": "0.3.26", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.26.tgz", @@ -13273,41 +13363,27 @@ } }, "@microsoft/vscode-azext-azureutils": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.3.9.tgz", - "integrity": "sha512-lKhxSROhTBpz45f0hqYDHfdrGlNOgzfMGXbNproqwyc5qnEYBhs/qG65hcwhLzVm44lYPpBP1aka7OyDEocPOQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.1.tgz", + "integrity": "sha512-E/Ju6boO4Q0yj9sB6l+gjIzpKQGmnaJgG47X6H2x2g7phZDuLPyeatuQDxKq9piHZMLBNdYTBg7/cUXRcu2nCg==", "requires": { "@azure/arm-resources": "^5.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", "@azure/arm-resources-subscriptions": "^2.0.0", - "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage": "^18.0.0", "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", - "@azure/ms-rest-js": "^2.2.1", - "@microsoft/vscode-azext-utils": "^0.4.3", + "@azure/core-client": "^1.6.0", + "@azure/core-rest-pipeline": "^1.9.0", + "@azure/logger": "^1.0.4", + "@microsoft/vscode-azext-utils": "^2.0.0", "semver": "^7.3.7", - "vscode-nls": "^5.0.1" + "uuid": "^9.0.0" }, "dependencies": { - "@microsoft/vscode-azext-utils": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.4.6.tgz", - "integrity": "sha512-CPIIvdod95Qdz5vdGg4j7HpryjKEsDVmdir/VduJZHgdVs1iuqa/9UY0+kIg2JnsnpThAdQH36A1GVA8jQeheg==", - "requires": { - "@microsoft/vscode-azureresources-api": "^2.0.2", - "@vscode/extension-telemetry": "^0.6.2", - "dayjs": "^1.11.2", - "escape-string-regexp": "^2.0.0", - "html-to-text": "^8.2.0", - "open": "^8.0.4", - "semver": "^7.3.7", - "vscode-nls": "^5.0.1", - "vscode-tas-client": "^0.1.47" - } - }, - "vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" + "uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" } } }, @@ -13437,9 +13513,9 @@ } }, "@microsoft/vscode-azext-utils": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-1.2.2.tgz", - "integrity": "sha512-mOTcJF8IMsz+Xn8QTUP1AC3K5tPl/3f17L2xGTTtLeV/HJ2sTh/3712NFuN58tnOwdISdazId4tHwaqUta8HEA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.0.1.tgz", + "integrity": "sha512-T8PMZPHOpQl86lqpY9ngnAAg99O+vTBWQYJkXzxRzpHqIuF2ecaTAnN2+F/Xev3/O0BoGbMjXMva9rzJ+l+GxQ==", "requires": { "@microsoft/vscode-azureresources-api": "^2.0.4", "@vscode/extension-telemetry": "^0.6.2", diff --git a/package.json b/package.json index 50fb061..d4acc35 100644 --- a/package.json +++ b/package.json @@ -870,16 +870,17 @@ }, "dependencies": { "@azure-tools/azcopy-node": "^2.11.0", - "@azure/arm-storage": "^17.1.0", + "@azure/arm-storage": "^18.1.0", "@azure/arm-storage-profile-2020-09-01-hybrid": "^2.0.0", + "@azure/core-rest-pipeline": "^1.11.0", "@azure/data-tables": "^13.0.0", "@azure/storage-blob": "^12.1.1", "@azure/storage-file-datalake": "^12.1.1", "@azure/storage-file-share": "^12.1.1", "@azure/storage-queue": "^12.7.0", "@microsoft/vscode-azext-azureappservice": "^0.7.0", - "@microsoft/vscode-azext-azureutils": "^0.3.4", - "@microsoft/vscode-azext-utils": "^1.1.0", + "@microsoft/vscode-azext-azureutils": "^2.0.1", + "@microsoft/vscode-azext-utils": "^2.0.1", "@microsoft/vscode-azureresources-api": "^2.0.4", "glob": "^7.1.2", "mime": "^2.4.4", diff --git a/test/nightly/deploy.test.ts b/test/nightly/deploy.test.ts index d42e610..27add9b 100644 --- a/test/nightly/deploy.test.ts +++ b/test/nightly/deploy.test.ts @@ -5,13 +5,13 @@ // eslint-disable-next-line import/no-internal-modules import { StorageAccount } from '@azure/arm-storage'; -import { HttpOperationResponse, ServiceClient } from '@azure/ms-rest-js'; +import { PipelineResponse, createPipelineRequest } from '@azure/core-rest-pipeline'; import { runWithTestActionContext } from '@microsoft/vscode-azext-dev'; import { AzExtTreeItem } from '@microsoft/vscode-azext-utils'; import * as assert from 'assert'; import * as path from 'path'; import * as vscode from 'vscode'; -import { createGenericClient, delay, deployStaticWebsite, ext, getRandomHexString, ResolvedAppResourceTreeItem, ResolvedStorageAccount } from '../../extension.bundle'; +import { ResolvedAppResourceTreeItem, ResolvedStorageAccount, createGenericClient, delay, deployStaticWebsite, ext, getRandomHexString } from '../../extension.bundle'; import { longRunningTestsEnabled } from '../global.test'; import { resourceGroupsToDelete, webSiteClient } from './global.resource.test'; @@ -33,8 +33,8 @@ suite('Deploy', function (this: Mocha.Suite): void { await deployStaticWebsite(context); }); const createdAccount: StorageAccount = await webSiteClient.storageAccounts.getProperties(resourceName, resourceName); - const webUrl: string | undefined = (>await ext.rgApi.appResourceTree.findTreeItem & AzExtTreeItem>(createdAccount.id, context)).root.primaryEndpoints?.web; - const client: ServiceClient = await createGenericClient(context, undefined); + const webUrl: string = (>await ext.rgApi.appResourceTree.findTreeItem & AzExtTreeItem>(createdAccount.id, context)).root.primaryEndpoints?.web as string; + const client = await createGenericClient(context, undefined); await validateWebSite(webUrl, client, 60 * 1000, 1000); }); }) @@ -58,13 +58,13 @@ function getWorkspacePath(testWorkspaceName: string): string { } // Polling to send the request within the maximum time -async function validateWebSite(webUrl: string | undefined, client: ServiceClient, maximumValidationMs: number, pollingMs: number) { +async function validateWebSite(webUrl: string, client: Awaited>, maximumValidationMs: number, pollingMs: number) { const endTime: number = Date.now() + maximumValidationMs; - let response: HttpOperationResponse; + let response: PipelineResponse; // eslint-disable-next-line no-constant-condition while (true) { try { - response = await client.sendRequest({ method: 'GET', url: webUrl }); + response = await client.sendRequest(createPipelineRequest({ method: 'GET', url: webUrl })); if (Date.now() > endTime || response.status === 200) { break; }