microsoft
/
vscode-azureappservice
зеркало из https://github.com/microsoft/vscode-azureappservice.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bump appservice and azureutils (#2610) 

* Bump appservice and azureutils

* Add activity context
This commit is contained in:
Alex Weininger 2024-01-29 14:33:29 -08:00 коммит произвёл GitHub
Родитель 7c4a9cf888
Коммит 141bd5854a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
3 изменённых файлов: 23 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
package-lock.json сгенерированный
Просмотреть файл

@ -13,9 +13,9 @@
"@azure/arm-resources": "^5.0.0", "@azure/arm-resources": "^5.0.0",
"@azure/core-client": "^1.7.3", "@azure/core-client": "^1.7.3",
"@azure/core-rest-pipeline": "^1.11.0", "@azure/core-rest-pipeline": "^1.11.0",
"@microsoft/vscode-azext-azureappservice": "^2.2.7", "@microsoft/vscode-azext-azureappservice": "^2.3.1",
"@microsoft/vscode-azext-azureappsettings": "^0.2.0", "@microsoft/vscode-azext-azureappsettings": "^0.2.0",
"@microsoft/vscode-azext-azureutils": "^2.0.2", "@microsoft/vscode-azext-azureutils": "^2.0.5",
"@microsoft/vscode-azext-utils": "^2.1.1", "@microsoft/vscode-azext-utils": "^2.1.1",
"@microsoft/vscode-azureresources-api": "^2.1.0", "@microsoft/vscode-azureresources-api": "^2.1.0",
"dotenv": "^6.2.0", "dotenv": "^6.2.0",
@ -687,9 +687,9 @@
} }
}, },
"node_modules/@microsoft/vscode-azext-azureappservice": { "node_modules/@microsoft/vscode-azext-azureappservice": {
"version": "2.2.7", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-2.2.7.tgz", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-2.3.1.tgz",
"integrity": "sha512-aaYBv4UQO2qO5x7ujkLAZpUMrTFmsgTOVKRjvK8rbrGKHwuWB/6q+fxGhVPVdnhj21FA/L7NFoJGKpV8KOtyWQ==", "integrity": "sha512-U10bF//NHVtIUYMlQKbKq39UJgENGs/EfaOu+A0tbQCwYlaVROQ80I4hLBG4gPfX4u4YeyPEvqaOQjz+zwpOHw==",
"dependencies": { "dependencies": {
"@azure/abort-controller": "^1.0.4", "@azure/abort-controller": "^1.0.4",
"@azure/arm-appinsights": "^5.0.0-beta.4", "@azure/arm-appinsights": "^5.0.0-beta.4",
@ -700,7 +700,7 @@
"@azure/core-client": "^1.7.2", "@azure/core-client": "^1.7.2",
"@azure/core-rest-pipeline": "^1.10.3", "@azure/core-rest-pipeline": "^1.10.3",
"@azure/storage-blob": "^12.3.0", "@azure/storage-blob": "^12.3.0",
"@microsoft/vscode-azext-azureutils": "^2.0.2", "@microsoft/vscode-azext-azureutils": "^2.0.5",
"@microsoft/vscode-azext-github": "^1.0.0", "@microsoft/vscode-azext-github": "^1.0.0",
"@microsoft/vscode-azext-utils": "^2.0.0", "@microsoft/vscode-azext-utils": "^2.0.0",
"dayjs": "^1.11.2", "dayjs": "^1.11.2",
@ -757,9 +757,9 @@
} }
}, },
"node_modules/@microsoft/vscode-azext-azureutils": { "node_modules/@microsoft/vscode-azext-azureutils": {
"version": "2.0.2", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.2.tgz", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.5.tgz",
"integrity": "sha512-r+7NqedkvfFazztO7kxT1AU/B/UfiGhTDlRtFHx+W5bhp+yJw0eOtX8VPJXXSXoOaq2dzuGBwxAQ0bDD1lNPcQ==", "integrity": "sha512-WKRWSGMhC+t3M6iV6vr/y4KIm2NX3H0Vxq1pcF6eLGPoMW3cQSV6RFS7rTSy0JoGeTn8EoDHRbeC1QjT4znBhg==",
"dependencies": { "dependencies": {
"@azure/arm-resources": "^5.0.0", "@azure/arm-resources": "^5.0.0",
"@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0",
@ -12676,9 +12676,9 @@
} }
}, },
"@microsoft/vscode-azext-azureappservice": { "@microsoft/vscode-azext-azureappservice": {
"version": "2.2.7", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-2.2.7.tgz", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-2.3.1.tgz",
"integrity": "sha512-aaYBv4UQO2qO5x7ujkLAZpUMrTFmsgTOVKRjvK8rbrGKHwuWB/6q+fxGhVPVdnhj21FA/L7NFoJGKpV8KOtyWQ==", "integrity": "sha512-U10bF//NHVtIUYMlQKbKq39UJgENGs/EfaOu+A0tbQCwYlaVROQ80I4hLBG4gPfX4u4YeyPEvqaOQjz+zwpOHw==",
"requires": { "requires": {
"@azure/abort-controller": "^1.0.4", "@azure/abort-controller": "^1.0.4",
"@azure/arm-appinsights": "^5.0.0-beta.4", "@azure/arm-appinsights": "^5.0.0-beta.4",
@ -12689,7 +12689,7 @@
"@azure/core-client": "^1.7.2", "@azure/core-client": "^1.7.2",
"@azure/core-rest-pipeline": "^1.10.3", "@azure/core-rest-pipeline": "^1.10.3",
"@azure/storage-blob": "^12.3.0", "@azure/storage-blob": "^12.3.0",
"@microsoft/vscode-azext-azureutils": "^2.0.2", "@microsoft/vscode-azext-azureutils": "^2.0.5",
"@microsoft/vscode-azext-github": "^1.0.0", "@microsoft/vscode-azext-github": "^1.0.0",
"@microsoft/vscode-azext-utils": "^2.0.0", "@microsoft/vscode-azext-utils": "^2.0.0",
"dayjs": "^1.11.2", "dayjs": "^1.11.2",
@ -12736,9 +12736,9 @@
} }
}, },
"@microsoft/vscode-azext-azureutils": { "@microsoft/vscode-azext-azureutils": {
"version": "2.0.2", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.2.tgz", "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-2.0.5.tgz",
"integrity": "sha512-r+7NqedkvfFazztO7kxT1AU/B/UfiGhTDlRtFHx+W5bhp+yJw0eOtX8VPJXXSXoOaq2dzuGBwxAQ0bDD1lNPcQ==", "integrity": "sha512-WKRWSGMhC+t3M6iV6vr/y4KIm2NX3H0Vxq1pcF6eLGPoMW3cQSV6RFS7rTSy0JoGeTn8EoDHRbeC1QjT4znBhg==",
"requires": { "requires": {
"@azure/arm-resources": "^5.0.0", "@azure/arm-resources": "^5.0.0",
"@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.0.0",

4
package.json
Просмотреть файл

@ -810,9 +810,9 @@
"@azure/arm-resources": "^5.0.0", "@azure/arm-resources": "^5.0.0",
"@azure/core-client": "^1.7.3", "@azure/core-client": "^1.7.3",
"@azure/core-rest-pipeline": "^1.11.0", "@azure/core-rest-pipeline": "^1.11.0",
"@microsoft/vscode-azext-azureappservice": "^2.2.7", "@microsoft/vscode-azext-azureappservice": "^2.3.1",
"@microsoft/vscode-azext-azureappsettings": "^0.2.0", "@microsoft/vscode-azext-azureappsettings": "^0.2.0",
"@microsoft/vscode-azext-azureutils": "^2.0.2", "@microsoft/vscode-azext-azureutils": "^2.0.5",
"@microsoft/vscode-azext-utils": "^2.1.1", "@microsoft/vscode-azext-utils": "^2.1.1",
"@microsoft/vscode-azureresources-api": "^2.1.0", "@microsoft/vscode-azureresources-api": "^2.1.0",
"dotenv": "^6.2.0", "dotenv": "^6.2.0",

6
src/commands/deploy/deploy.ts
Просмотреть файл

@ -15,6 +15,7 @@ import { ext } from '../../extensionVariables';
import { localize } from '../../localize'; import { localize } from '../../localize';
import { ResolvedWebAppResource } from '../../tree/ResolvedWebAppResource'; import { ResolvedWebAppResource } from '../../tree/ResolvedWebAppResource';
import { type SiteTreeItem } from '../../tree/SiteTreeItem'; import { type SiteTreeItem } from '../../tree/SiteTreeItem';
import { createActivityContext } from '../../utils/activityUtils';
import { javaUtils } from '../../utils/javaUtils'; import { javaUtils } from '../../utils/javaUtils';
import { nonNullValue } from '../../utils/nonNull'; import { nonNullValue } from '../../utils/nonNull';
import { isPathEqual } from '../../utils/pathUtils'; import { isPathEqual } from '../../utils/pathUtils';
@ -111,7 +112,10 @@ export async function deploy(actionContext: IActionContext, arg1?: vscode.Uri |
await node.runWithTemporaryDescription(context, localize('deploying', "Deploying..."), async () => { await node.runWithTemporaryDescription(context, localize('deploying', "Deploying..."), async () => {
try { try {
await appservice.deploy(nonNullValue(node).site, <string>deployPath, context); await appservice.deploy(nonNullValue(node).site, <string>deployPath, {
...context,
...(await createActivityContext())
});
} catch (error) { } catch (error) {
if (!actionContext.errorHandling.suppressDisplay if (!actionContext.errorHandling.suppressDisplay
&& failureMoreInfoSurvey(parseError(error), nonNullValue(siteConfig))) { && failureMoreInfoSurvey(parseError(error), nonNullValue(siteConfig))) {