From 25b11865a951bf9d7b3aa1a931235fe367d2c98a Mon Sep 17 00:00:00 2001 From: Nathan Turinski Date: Thu, 19 May 2022 11:40:17 -0700 Subject: [PATCH 1/4] SqlBindingTrigger template changes --- src/commands/createFunction/FunctionListStep.ts | 2 +- src/constants.ts | 2 +- src/templates/IFunctionTemplate.ts | 1 + src/templates/dotnet/parseDotnetTemplates.ts | 3 ++- src/templates/script/parseScriptTemplates.ts | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/commands/createFunction/FunctionListStep.ts b/src/commands/createFunction/FunctionListStep.ts index 78c2a5839..d2fdee52b 100644 --- a/src/commands/createFunction/FunctionListStep.ts +++ b/src/commands/createFunction/FunctionListStep.ts @@ -109,7 +109,7 @@ export class FunctionListStep extends AzureWizardPromptStep Date: Thu, 21 Jul 2022 11:54:46 -0700 Subject: [PATCH 2/4] Update package --- package.json | 2 +- src/tree/SubscriptionTreeItem.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7da473847..3b46dd0f6 100644 --- a/package.json +++ b/package.json @@ -1092,7 +1092,7 @@ "@azure/arm-storage": "^17.0.0", "@azure/ms-rest-js": "^2.2.1", "@azure/storage-blob": "^12.5.0", - "@microsoft/vscode-azext-azureappservice": "^0.6.2", + "@microsoft/vscode-azext-azureappservice": "0.7.2", "@microsoft/vscode-azext-azureutils": "^0.3.4", "@microsoft/vscode-azext-utils": "^0.3.7", "escape-string-regexp": "^4.0.0", diff --git a/src/tree/SubscriptionTreeItem.ts b/src/tree/SubscriptionTreeItem.ts index b31275ac7..f87e67799 100644 --- a/src/tree/SubscriptionTreeItem.ts +++ b/src/tree/SubscriptionTreeItem.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Site, WebSiteManagementClient } from '@azure/arm-appservice'; -import { AppInsightsCreateStep, AppInsightsListStep, AppKind, AppServicePlanCreateStep, CustomLocationListStep, IAppServiceWizardContext, SiteNameStep, WebsiteOS } from '@microsoft/vscode-azext-azureappservice'; +import { AppInsightsCreateStep, AppInsightsListStep, AppKind, AppServicePlanCreateStep, CustomLocationListStep, IAppServiceWizardContext, LogAnalyticsCreateStep, SiteNameStep, WebsiteOS } from '@microsoft/vscode-azext-azureappservice'; import { INewStorageAccountDefaults, LocationListStep, ResourceGroupCreateStep, ResourceGroupListStep, StorageAccountCreateStep, StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication, SubscriptionTreeItemBase, uiUtils, VerifyProvidersStep } from '@microsoft/vscode-azext-azureutils'; import { AzExtTreeItem, AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, ICreateChildImplContext, parseError } from '@microsoft/vscode-azext-utils'; import { WorkspaceFolder } from 'vscode'; @@ -113,6 +113,7 @@ export class SubscriptionTreeItem extends SubscriptionTreeItemBase { executeSteps.push(new ResourceGroupCreateStep()); executeSteps.push(new AppServicePlanCreateStep()); executeSteps.push(new StorageAccountCreateStep(storageAccountCreateOptions)); + executeSteps.push(new LogAnalyticsCreateStep()); executeSteps.push(new AppInsightsCreateStep()); } else { promptSteps.push(new ResourceGroupListStep()); From e55217c6bfa3e5b3e733b3835ffcdb34dc1a84b8 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 21 Jul 2022 13:43:11 -0700 Subject: [PATCH 3/4] Update package.json Co-authored-by: Brandon Waterloo [MSFT] <36966225+bwateratmsft@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b46dd0f6..26a7d442f 100644 --- a/package.json +++ b/package.json @@ -1092,7 +1092,7 @@ "@azure/arm-storage": "^17.0.0", "@azure/ms-rest-js": "^2.2.1", "@azure/storage-blob": "^12.5.0", - "@microsoft/vscode-azext-azureappservice": "0.7.2", + "@microsoft/vscode-azext-azureappservice": "^0.7.2", "@microsoft/vscode-azext-azureutils": "^0.3.4", "@microsoft/vscode-azext-utils": "^0.3.7", "escape-string-regexp": "^4.0.0", From a94a621b14dd2d2bdc29dc6d958bf940d135a238 Mon Sep 17 00:00:00 2001 From: Nathan Turinski Date: Thu, 21 Jul 2022 14:07:31 -0700 Subject: [PATCH 4/4] Run npm install --- package-lock.json | 126 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 99 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd15cfb04..211babe1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@azure/arm-storage": "^17.0.0", "@azure/ms-rest-js": "^2.2.1", "@azure/storage-blob": "^12.5.0", - "@microsoft/vscode-azext-azureappservice": "^0.6.2", + "@microsoft/vscode-azext-azureappservice": "^0.7.2", "@microsoft/vscode-azext-azureutils": "^0.3.4", "@microsoft/vscode-azext-utils": "^0.3.7", "escape-string-regexp": "^4.0.0", @@ -170,6 +170,28 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, + "node_modules/@azure/arm-operationalinsights": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@azure/arm-operationalinsights/-/arm-operationalinsights-8.0.1.tgz", + "integrity": "sha512-5Xo1jTotmMREtgNqrHGI1+fOTuejyHfiquK4dPgLIZ2CiQoOnX/RDqD5O0Pcaj2R10PLeMBk/DohBpw9mI2ugg==", + "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/@azure/arm-operationalinsights/node_modules/tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + }, "node_modules/@azure/arm-resourcegraph": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@azure/arm-resourcegraph/-/arm-resourcegraph-4.2.1.tgz", @@ -831,21 +853,22 @@ } }, "node_modules/@microsoft/vscode-azext-azureappservice": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.6.2.tgz", - "integrity": "sha512-sDnNfYR8j2K0Jum8pAVEDe/nHR96m+gtxRxp/x5uBKbXZmFu5GeQw5jx8L4CGtV6CgWdkZk2AbEROREgtJTqdg==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.7.2.tgz", + "integrity": "sha512-w3eECyWU07kdBIuXv5MAvg7GbrWU8djZluCxVS3ywSjIIRkiMyr8amVj7Pk/51U3juowB600TxN1Q5MSxuZy2Q==", "dependencies": { "@azure/abort-controller": "^1.0.4", - "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appinsights": "^5.0.0-beta.4", "@azure/arm-appservice": "^11.0.0", + "@azure/arm-operationalinsights": "^8.0.1", "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^5.0.0", "@azure/arm-subscriptions": "^5.0.0", "@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.0", - "@microsoft/vscode-azext-utils": "^0.3.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", @@ -853,12 +876,27 @@ "p-retry": "^3.0.1", "pretty-bytes": "^5.3.0", "simple-git": "^3.5.0", - "vscode-azurekudu": "^0.2.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/@azure/arm-appinsights": { + "version": "5.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-5.0.0-beta.4.tgz", + "integrity": "sha512-mACXuC+b0ATHpBG87aeLgb9LYdBlwlrFo+qbYWGY4lHZC0iIAh9z89wl3wpj4wv8nQwpkdXM9lmGv5Ts2nWmug==", + "dependencies": { + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.5.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/@azure/arm-resources": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-5.0.0.tgz", @@ -1298,9 +1336,9 @@ } }, "node_modules/@microsoft/vscode-azext-utils": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.7.tgz", - "integrity": "sha512-TCIo1rVPYso5r9UrDfZK2j9FvvruW4BOTjtgK9g8F6gRB3FvpBd8AlQhXcffe8NmKNPJhbmdRSwhk51EujK2FA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.9.tgz", + "integrity": "sha512-xVUxksOGsf6UfAgisLsf+SIVumvY/28Tgsm3HMNf4b+UX4/YSSFTWhZ8oeJ4Y/q9W0c1gbOMagjR+KPcE/7V9g==", "dependencies": { "@vscode/extension-telemetry": "^0.6.2", "dayjs": "^1.11.2", @@ -12863,9 +12901,9 @@ } }, "node_modules/vscode-azurekudu": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.0.tgz", - "integrity": "sha512-GMdK9q4n/id7N2Bx1hmjHvomGvmcI/K2OldTScrz8j+NWmnwOFZZMQzCoubZrcfvOF1r6R+KDL50QUkMfyC1eg==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.3.tgz", + "integrity": "sha512-Th6BEdnATFwxeAXdo6YPLcinQfbVigUglwyDaiCvCxjvTHlx5NCyCmtykh9F/NldIw0EZ3ipFZGiRodbUWBMOw==", "dependencies": { "@azure/ms-rest-js": "^2.0.4", "tslib": "^1.10.0" @@ -13675,6 +13713,27 @@ } } }, + "@azure/arm-operationalinsights": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@azure/arm-operationalinsights/-/arm-operationalinsights-8.0.1.tgz", + "integrity": "sha512-5Xo1jTotmMREtgNqrHGI1+fOTuejyHfiquK4dPgLIZ2CiQoOnX/RDqD5O0Pcaj2R10PLeMBk/DohBpw9mI2ugg==", + "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" + }, + "dependencies": { + "tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + } + } + }, "@azure/arm-resourcegraph": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@azure/arm-resourcegraph/-/arm-resourcegraph-4.2.1.tgz", @@ -14273,21 +14332,22 @@ } }, "@microsoft/vscode-azext-azureappservice": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.6.2.tgz", - "integrity": "sha512-sDnNfYR8j2K0Jum8pAVEDe/nHR96m+gtxRxp/x5uBKbXZmFu5GeQw5jx8L4CGtV6CgWdkZk2AbEROREgtJTqdg==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.7.2.tgz", + "integrity": "sha512-w3eECyWU07kdBIuXv5MAvg7GbrWU8djZluCxVS3ywSjIIRkiMyr8amVj7Pk/51U3juowB600TxN1Q5MSxuZy2Q==", "requires": { "@azure/abort-controller": "^1.0.4", - "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appinsights": "^5.0.0-beta.4", "@azure/arm-appservice": "^11.0.0", + "@azure/arm-operationalinsights": "^8.0.1", "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^5.0.0", "@azure/arm-subscriptions": "^5.0.0", "@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.0", - "@microsoft/vscode-azext-utils": "^0.3.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", @@ -14295,12 +14355,24 @@ "p-retry": "^3.0.1", "pretty-bytes": "^5.3.0", "simple-git": "^3.5.0", - "vscode-azurekudu": "^0.2.0", + "vscode-azurekudu": "^0.2.3", "vscode-nls": "^5.0.1", "ws": "^8.5.0", "yazl": "^2.5.1" }, "dependencies": { + "@azure/arm-appinsights": { + "version": "5.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-5.0.0-beta.4.tgz", + "integrity": "sha512-mACXuC+b0ATHpBG87aeLgb9LYdBlwlrFo+qbYWGY4lHZC0iIAh9z89wl3wpj4wv8nQwpkdXM9lmGv5Ts2nWmug==", + "requires": { + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.5.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.8.0", + "tslib": "^2.2.0" + } + }, "@azure/arm-resources": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-5.0.0.tgz", @@ -14681,9 +14753,9 @@ } }, "@microsoft/vscode-azext-utils": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.7.tgz", - "integrity": "sha512-TCIo1rVPYso5r9UrDfZK2j9FvvruW4BOTjtgK9g8F6gRB3FvpBd8AlQhXcffe8NmKNPJhbmdRSwhk51EujK2FA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.3.9.tgz", + "integrity": "sha512-xVUxksOGsf6UfAgisLsf+SIVumvY/28Tgsm3HMNf4b+UX4/YSSFTWhZ8oeJ4Y/q9W0c1gbOMagjR+KPcE/7V9g==", "requires": { "@vscode/extension-telemetry": "^0.6.2", "dayjs": "^1.11.2", @@ -23784,9 +23856,9 @@ } }, "vscode-azurekudu": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.0.tgz", - "integrity": "sha512-GMdK9q4n/id7N2Bx1hmjHvomGvmcI/K2OldTScrz8j+NWmnwOFZZMQzCoubZrcfvOF1r6R+KDL50QUkMfyC1eg==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.3.tgz", + "integrity": "sha512-Th6BEdnATFwxeAXdo6YPLcinQfbVigUglwyDaiCvCxjvTHlx5NCyCmtykh9F/NldIw0EZ3ipFZGiRodbUWBMOw==", "requires": { "@azure/ms-rest-js": "^2.0.4", "tslib": "^1.10.0"