From d5222604bf4904d51cc6f6a407215ddd19076c7f Mon Sep 17 00:00:00 2001 From: Alex Weininger Date: Thu, 9 Feb 2023 11:57:58 -0800 Subject: [PATCH] Revert "Bump appservice package and remove kudu dependency (#2365)" This reverts commit 37abfbee4004894153e7f71886c7cec50e7507d1. --- package-lock.json | 226 +++++++++--------- package.json | 6 +- .../checkLinuxWebAppDownDetector.ts | 7 +- 3 files changed, 124 insertions(+), 115 deletions(-) diff --git a/package-lock.json b/package-lock.json index 116ce0d01..3b8b500e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,17 @@ "version": "0.24.6", "license": "SEE LICENSE IN LICENSE.md", "dependencies": { - "@azure/arm-appservice": "^13.0.2", + "@azure/arm-appservice": "^11.0.0", "@azure/arm-resources": "^5.0.0", "@azure/ms-rest-js": "^2.2.1", - "@microsoft/vscode-azext-azureappservice": "^0.8.1", + "@microsoft/vscode-azext-azureappservice": "^0.7.4", "@microsoft/vscode-azext-azureutils": "^0.3.8", "@microsoft/vscode-azext-utils": "^0.4.0", "dotenv": "^6.2.0", "fast-xml-parser": "^3.19.0", "fs-extra": "^8.0.0", "open": "^8.0.4", + "vscode-azurekudu": "^0.2.2", "vscode-nls": "^4.1.1" }, "devDependencies": { @@ -43,7 +44,6 @@ "ts-node": "^7.0.1", "typescript": "^4.3.5", "vsce": "^2.11.0", - "vscode-azurekudu": "^0.2.3", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" }, @@ -78,20 +78,20 @@ } }, "node_modules/@azure/arm-appservice": { - "version": "13.0.3", - "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-13.0.3.tgz", - "integrity": "sha512-Vu011o3/bikQNwtjouwmUJud+Z6Brcjij2D0omPWClRGg8i5gBfOYSpDkFGkHbhGlaky4fgvfkxD0uHGq34uYA==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-11.0.0.tgz", + "integrity": "sha512-y+GllRQNlXqVR8tzzZGdzb/J+EtvIBcFD0dXSngaBkvl5+wgt+/wclJSx2xcSVZQO+yEj9YE/xG4EXkr/qb23g==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.0.0", "@azure/core-lro": "^2.2.0", "@azure/core-paging": "^1.2.0", - "@azure/core-rest-pipeline": "^1.8.0", + "@azure/core-rest-pipeline": "^1.1.0", "tslib": "^2.2.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=12.0.0" } }, "node_modules/@azure/arm-operationalinsights": { @@ -236,9 +236,9 @@ } }, "node_modules/@azure/core-auth": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz", - "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz", + "integrity": "sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==", "dependencies": { "@azure/abort-controller": "^1.0.0", "tslib": "^2.2.0" @@ -248,20 +248,20 @@ } }, "node_modules/@azure/core-client": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz", - "integrity": "sha512-85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.0.tgz", + "integrity": "sha512-YhSf4cb61ApSjItscp9XoaLq8KRnacPDAhmjAZSMnn/gs6FhFbZNfOBOErG2dDj7JRknVtCmJ5mLmfR2sLa11A==", "dependencies": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.4.0", - "@azure/core-rest-pipeline": "^1.9.1", + "@azure/core-auth": "^1.3.0", + "@azure/core-rest-pipeline": "^1.5.0", "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=12.0.0" } }, "node_modules/@azure/core-http": { @@ -352,44 +352,23 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", - "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.8.1.tgz", + "integrity": "sha512-R/XpxZcDgGbnneEifnsAcjLoR2NCmlDxKDmzd8oi5jx5YEnPE6gsxHQWAk2+uY55Ka717x/fdctyoCYKnumrqw==", "dependencies": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.4.0", + "@azure/core-auth": "^1.3.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", "form-data": "^4.0.0", - "http-proxy-agent": "^5.0.0", + "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "tslib": "^2.2.0", "uuid": "^8.3.0" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@azure/core-rest-pipeline/node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "engines": { - "node": ">= 10" - } - }, - "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" + "node": ">=12.0.0" } }, "node_modules/@azure/core-tracing": { @@ -815,13 +794,13 @@ } }, "node_modules/@microsoft/vscode-azext-azureappservice": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.8.1.tgz", - "integrity": "sha512-rqKRL4KSGQAISBT0WX8n+6T53+qA2a/d4trekVtPeJ7ToE7ZqwunFMTrp2UDmblhjNeup+Irx5fHpsF7uQSHpw==", + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.7.7.tgz", + "integrity": "sha512-I4p9B9vMGoH0RyiFEInan4qS1lV7cf2h0mvxU/Z9Zlo6ILBAKUbfgIIALXgCM19R/+vhm6D8aigmIXkr/X9QHw==", "dependencies": { "@azure/abort-controller": "^1.0.4", "@azure/arm-appinsights": "^5.0.0-beta.4", - "@azure/arm-appservice": "^13.0.2", + "@azure/arm-appservice": "^11.0.0", "@azure/arm-operationalinsights": "^8.0.1", "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^5.0.0", @@ -829,8 +808,8 @@ "@azure/ms-rest-azure-env": "^2.0.0", "@azure/ms-rest-js": "^2.3.0", "@azure/storage-blob": "^12.3.0", - "@microsoft/vscode-azext-azureutils": "^0.3.7", - "@microsoft/vscode-azext-utils": "^0.4.0", + "@microsoft/vscode-azext-azureutils": "^0.3.4", + "@microsoft/vscode-azext-utils": "^0.3.9", "dayjs": "^1.11.2", "fs-extra": "^10.0.0", "glob-gitignore": "^1.0.14", @@ -838,11 +817,27 @@ "p-retry": "^3.0.1", "pretty-bytes": "^5.3.0", "simple-git": "^3.5.0", + "vscode-azurekudu": "^0.2.3", "vscode-nls": "^5.0.1", "ws": "^8.5.0", "yazl": "^2.5.1" } }, + "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", + "integrity": "sha512-txsXb2uzRJoOiRqeOB+o7YVFnfK6QGbP/+IfdciycVWWECMmenUKi+E9oTo1GjQABUMNgwsgjo12n+jD294TtQ==", + "dependencies": { + "@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/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -867,6 +862,20 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -876,9 +885,9 @@ } }, "node_modules/@microsoft/vscode-azext-azureappservice/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==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz", + "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==" }, "node_modules/@microsoft/vscode-azext-azureutils": { "version": "0.3.8", @@ -1333,7 +1342,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, "engines": { "node": ">= 6" } @@ -6222,7 +6230,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, "dependencies": { "@tootallnate/once": "1", "agent-base": "6", @@ -11847,7 +11854,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.3.tgz", "integrity": "sha512-Th6BEdnATFwxeAXdo6YPLcinQfbVigUglwyDaiCvCxjvTHlx5NCyCmtykh9F/NldIw0EZ3ipFZGiRodbUWBMOw==", - "dev": true, "dependencies": { "@azure/ms-rest-js": "^2.0.4", "tslib": "^1.10.0" @@ -11856,8 +11862,7 @@ "node_modules/vscode-azurekudu/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/vscode-nls": { "version": "4.1.2", @@ -12535,16 +12540,16 @@ } }, "@azure/arm-appservice": { - "version": "13.0.3", - "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-13.0.3.tgz", - "integrity": "sha512-Vu011o3/bikQNwtjouwmUJud+Z6Brcjij2D0omPWClRGg8i5gBfOYSpDkFGkHbhGlaky4fgvfkxD0uHGq34uYA==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-11.0.0.tgz", + "integrity": "sha512-y+GllRQNlXqVR8tzzZGdzb/J+EtvIBcFD0dXSngaBkvl5+wgt+/wclJSx2xcSVZQO+yEj9YE/xG4EXkr/qb23g==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.0.0", "@azure/core-lro": "^2.2.0", "@azure/core-paging": "^1.2.0", - "@azure/core-rest-pipeline": "^1.8.0", + "@azure/core-rest-pipeline": "^1.1.0", "tslib": "^2.2.0" } }, @@ -12668,22 +12673,22 @@ "integrity": "sha512-3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw==" }, "@azure/core-auth": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz", - "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz", + "integrity": "sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==", "requires": { "@azure/abort-controller": "^1.0.0", "tslib": "^2.2.0" } }, "@azure/core-client": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz", - "integrity": "sha512-85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.0.tgz", + "integrity": "sha512-YhSf4cb61ApSjItscp9XoaLq8KRnacPDAhmjAZSMnn/gs6FhFbZNfOBOErG2dDj7JRknVtCmJ5mLmfR2sLa11A==", "requires": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.4.0", - "@azure/core-rest-pipeline": "^1.9.1", + "@azure/core-auth": "^1.3.0", + "@azure/core-rest-pipeline": "^1.5.0", "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", @@ -12764,37 +12769,20 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", - "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.8.1.tgz", + "integrity": "sha512-R/XpxZcDgGbnneEifnsAcjLoR2NCmlDxKDmzd8oi5jx5YEnPE6gsxHQWAk2+uY55Ka717x/fdctyoCYKnumrqw==", "requires": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.4.0", + "@azure/core-auth": "^1.3.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", "form-data": "^4.0.0", - "http-proxy-agent": "^5.0.0", + "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "tslib": "^2.2.0", "uuid": "^8.3.0" - }, - "dependencies": { - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==" - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - } } }, "@azure/core-tracing": { @@ -13162,13 +13150,13 @@ } }, "@microsoft/vscode-azext-azureappservice": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.8.1.tgz", - "integrity": "sha512-rqKRL4KSGQAISBT0WX8n+6T53+qA2a/d4trekVtPeJ7ToE7ZqwunFMTrp2UDmblhjNeup+Irx5fHpsF7uQSHpw==", + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.7.7.tgz", + "integrity": "sha512-I4p9B9vMGoH0RyiFEInan4qS1lV7cf2h0mvxU/Z9Zlo6ILBAKUbfgIIALXgCM19R/+vhm6D8aigmIXkr/X9QHw==", "requires": { "@azure/abort-controller": "^1.0.4", "@azure/arm-appinsights": "^5.0.0-beta.4", - "@azure/arm-appservice": "^13.0.2", + "@azure/arm-appservice": "^11.0.0", "@azure/arm-operationalinsights": "^8.0.1", "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^5.0.0", @@ -13176,8 +13164,8 @@ "@azure/ms-rest-azure-env": "^2.0.0", "@azure/ms-rest-js": "^2.3.0", "@azure/storage-blob": "^12.3.0", - "@microsoft/vscode-azext-azureutils": "^0.3.7", - "@microsoft/vscode-azext-utils": "^0.4.0", + "@microsoft/vscode-azext-azureutils": "^0.3.4", + "@microsoft/vscode-azext-utils": "^0.3.9", "dayjs": "^1.11.2", "fs-extra": "^10.0.0", "glob-gitignore": "^1.0.14", @@ -13185,11 +13173,27 @@ "p-retry": "^3.0.1", "pretty-bytes": "^5.3.0", "simple-git": "^3.5.0", + "vscode-azurekudu": "^0.2.3", "vscode-nls": "^5.0.1", "ws": "^8.5.0", "yazl": "^2.5.1" }, "dependencies": { + "@microsoft/vscode-azext-utils": { + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.26.tgz", + "integrity": "sha512-txsXb2uzRJoOiRqeOB+o7YVFnfK6QGbP/+IfdciycVWWECMmenUKi+E9oTo1GjQABUMNgwsgjo12n+jD294TtQ==", + "requires": { + "@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" + } + }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -13209,15 +13213,23 @@ "universalify": "^2.0.0" } }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" }, "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==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz", + "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==" } } }, @@ -13611,8 +13623,7 @@ "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" }, "@types/dotenv": { "version": "6.1.1", @@ -17451,7 +17462,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, "requires": { "@tootallnate/once": "1", "agent-base": "6", @@ -21792,7 +21802,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.3.tgz", "integrity": "sha512-Th6BEdnATFwxeAXdo6YPLcinQfbVigUglwyDaiCvCxjvTHlx5NCyCmtykh9F/NldIw0EZ3ipFZGiRodbUWBMOw==", - "dev": true, "requires": { "@azure/ms-rest-js": "^2.0.4", "tslib": "^1.10.0" @@ -21801,8 +21810,7 @@ "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" } } }, diff --git a/package.json b/package.json index 1376c350b..301a41525 100644 --- a/package.json +++ b/package.json @@ -792,21 +792,21 @@ "ts-node": "^7.0.1", "typescript": "^4.3.5", "vsce": "^2.11.0", - "vscode-azurekudu": "^0.2.3", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" }, "dependencies": { - "@azure/arm-appservice": "^13.0.2", + "@azure/arm-appservice": "^11.0.0", "@azure/arm-resources": "^5.0.0", "@azure/ms-rest-js": "^2.2.1", - "@microsoft/vscode-azext-azureappservice": "^0.8.1", + "@microsoft/vscode-azext-azureappservice": "^0.7.4", "@microsoft/vscode-azext-azureutils": "^0.3.8", "@microsoft/vscode-azext-utils": "^0.4.0", "dotenv": "^6.2.0", "fast-xml-parser": "^3.19.0", "fs-extra": "^8.0.0", "open": "^8.0.4", + "vscode-azurekudu": "^0.2.2", "vscode-nls": "^4.1.1" }, "extensionDependencies": [ diff --git a/src/commands/postDeploy/checkLinuxWebAppDownDetector.ts b/src/commands/postDeploy/checkLinuxWebAppDownDetector.ts index 7dcf51011..96022d8b7 100644 --- a/src/commands/postDeploy/checkLinuxWebAppDownDetector.ts +++ b/src/commands/postDeploy/checkLinuxWebAppDownDetector.ts @@ -3,13 +3,14 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { SiteClient } from '@microsoft/vscode-azext-azureappservice'; +import { createKuduClient } from "@microsoft/vscode-azext-azureappservice"; import { openInPortal } from '@microsoft/vscode-azext-azureutils'; import { callWithTelemetryAndErrorHandling, IActionContext, UserCancelledError } from "@microsoft/vscode-azext-utils"; import * as dayjs from "dayjs"; // eslint-disable-next-line import/no-internal-modules import * as utc from 'dayjs/plugin/utc'; import { CancellationTokenSource } from "vscode"; +import { KuduClient, KuduModels } from "vscode-azurekudu"; import { detectorTimestampFormat } from '../../constants'; import { ext } from '../../extensionVariables'; import { localize } from "../../localize"; @@ -27,8 +28,8 @@ export async function checkLinuxWebAppDownDetector(originalContext: IActionConte context.valuesToMask.push(...originalContext.valuesToMask); context.telemetry.properties.correlationId = correlationId; - const kuduClient: SiteClient = await node.site.createClient(context); - const deployment = await kuduClient.getDeployResult(context, 'latest'); + const kuduClient: KuduClient = await createKuduClient(context, node.site); + const deployment: KuduModels.DeployResult = await kuduClient.deployment.getResult('latest'); if (!deployment.endTime) { // if there's no deployment detected, nothing can be done