From 411ece5f9453af075c1ff48c70aec349f5942a47 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 15 Feb 2022 10:08:16 -0800 Subject: [PATCH] package migration for @microsoft packages and T2 (#3046) * package migration for @microsoft packages and T2 * Remove stale comment * Add registerAzureUtilsExtensionVariables(ext) call before AppService * Alphabetize * Comments to fix loadMore if paging gets fixed --- extension.bundle.ts | 4 +- package-lock.json | 1846 ++++++++--------- package.json | 19 +- src/FuncVersion.ts | 2 +- src/commands/addBinding/BindingCreateStep.ts | 2 +- .../addBinding/BindingDirectionStep.ts | 2 +- src/commands/addBinding/BindingListStep.ts | 2 +- src/commands/addBinding/addBinding.ts | 2 +- .../addBinding/createBindingWizard.ts | 2 +- .../AzureConnectionCreateStepBase.ts | 2 +- .../settingSteps/BindingSettingStepBase.ts | 2 +- .../settingSteps/BooleanPromptStep.ts | 2 +- .../addBinding/settingSteps/EnumPromptStep.ts | 2 +- .../settingSteps/LocalAppSettingCreateStep.ts | 2 +- .../settingSteps/LocalAppSettingListStep.ts | 3 +- .../settingSteps/LocalAppSettingValueStep.ts | 2 +- .../StorageConnectionCreateStep.ts | 2 +- .../settingSteps/addBindingSettingSteps.ts | 2 +- .../cosmosDB/CosmosDBConnectionCreateStep.ts | 6 +- .../settingSteps/cosmosDB/CosmosDBListStep.ts | 6 +- .../cosmosDB/ICosmosDBWizardContext.ts | 6 +- .../eventHub/EventHubAuthRuleListStep.ts | 13 +- .../eventHub/EventHubConnectionCreateStep.ts | 6 +- .../settingSteps/eventHub/EventHubListStep.ts | 8 +- .../eventHub/EventHubNamespaceListStep.ts | 8 +- .../eventHub/IEventHubWizardContext.ts | 2 +- .../serviceBus/IServiceBusWizardContext.ts | 6 +- .../ServiceBusConnectionCreateStep.ts | 11 +- .../serviceBus/ServiceBusListStep.ts | 6 +- src/commands/api/createFunctionFromApi.ts | 2 +- .../api/downloadAppSettingsFromApi.ts | 2 +- src/commands/api/revealTreeItem.ts | 2 +- src/commands/api/uploadAppSettingsFromApi.ts | 2 +- .../AzureWebJobsStorageExecuteStep.ts | 3 +- .../AzureWebJobsStoragePromptStep.ts | 3 +- .../IAzureWebJobsStorageWizardContext.ts | 2 +- .../appSettings/decryptLocalSettings.ts | 2 +- .../appSettings/downloadAppSettings.ts | 8 +- .../appSettings/encryptLocalSettings.ts | 2 +- .../appSettings/getLocalSettingsFile.ts | 2 +- .../appSettings/setAzureWebJobsStorage.ts | 2 +- src/commands/appSettings/toggleSlotSetting.ts | 4 +- src/commands/appSettings/uploadAppSettings.ts | 8 +- src/commands/browseWebsite.ts | 2 +- src/commands/configureDeploymentSource.ts | 4 +- src/commands/copyFunctionUrl.ts | 2 +- src/commands/createChildNode.ts | 2 +- .../createFunction/FunctionCreateStepBase.ts | 2 +- .../createFunction/FunctionListStep.ts | 2 +- .../createFunction/FunctionNameStepBase.ts | 2 +- .../createFunction/IFunctionWizardContext.ts | 2 +- src/commands/createFunction/createFunction.ts | 2 +- .../dotnetSteps/DotnetFunctionCreateStep.ts | 2 +- .../dotnetSteps/DotnetNamespaceStep.ts | 2 +- .../openAPISteps/OpenAPICreateStep.ts | 2 +- .../OpenAPIGetSpecificationFileStep.ts | 2 +- .../FunctionAppCreateStep.ts | 50 +- .../FunctionAppHostingPlanStep.ts | 4 +- .../IFunctionAppWizardContext.ts | 4 +- .../createFunctionApp/createFunctionApp.ts | 2 +- .../createFunctionApp/showSiteCreated.ts | 4 +- .../stacks/FunctionAppStackStep.ts | 4 +- .../createFunctionApp/stacks/getStackPicks.ts | 3 +- .../createNewProject/FolderListStep.ts | 2 +- .../createNewProject/IProjectWizardContext.ts | 2 +- .../NewProjectLanguageStep.ts | 2 +- .../createNewProject/OpenBehaviorStep.ts | 2 +- .../createNewProject/OpenFolderStep.ts | 2 +- .../CustomProjectCreateStep.ts | 2 +- .../DotnetProjectCreateStep.ts | 2 +- .../GradleProjectCreateSteps.ts | 2 +- .../MavenProjectCreateSteps.ts | 2 +- .../PowerShellProjectCreateStep.ts | 2 +- .../ProjectCreateStepBase.ts | 2 +- .../ScriptProjectCreateStep.ts | 2 +- .../createNewProject/createNewProject.ts | 2 +- .../dotnetSteps/DotnetRuntimeStep.ts | 2 +- .../javaSteps/JavaAppNameStep.ts | 2 +- .../javaSteps/JavaArtifactIdStep.ts | 2 +- .../javaSteps/JavaBuildToolStep.ts | 2 +- .../javaSteps/JavaGroupIdStep.ts | 2 +- .../javaSteps/JavaPackageNameStep.ts | 2 +- .../javaSteps/JavaProjectVersionStep.ts | 2 +- .../javaSteps/JavaVersionStep.ts | 2 +- .../javaSteps/addJavaCreateProjectSteps.ts | 2 +- .../pythonSteps/EnterPythonAliasStep.ts | 2 +- .../pythonSteps/IPythonVenvWizardContext.ts | 2 +- .../pythonSteps/PythonAliasListStep.ts | 2 +- .../pythonSteps/PythonVenvCreateStep.ts | 2 +- .../pythonSteps/pythonVersion.ts | 2 +- .../createNewProject/verifyIsProject.ts | 2 +- src/commands/createSlot.ts | 2 +- src/commands/deleteFunction.ts | 2 +- src/commands/deleteFunctionApp.ts | 2 +- src/commands/deleteNode.ts | 2 +- src/commands/deploy/deploy.ts | 12 +- src/commands/deploy/notifyDeployComplete.ts | 2 +- src/commands/deploy/runPreDeployTask.ts | 4 +- src/commands/deploy/validateRemoteBuild.ts | 2 +- src/commands/deploy/verifyAppSettings.ts | 8 +- src/commands/deployments/connectToGitHub.ts | 4 +- src/commands/deployments/disconnectRepo.ts | 4 +- .../deployments/redeployDeployment.ts | 4 +- .../deployments/viewCommitInGitHub.ts | 4 +- .../deployments/viewDeploymentLogs.ts | 4 +- src/commands/editAppSetting.ts | 4 +- src/commands/executeFunction.ts | 4 +- .../InitVSCodeLanguageStep.ts | 2 +- .../InitVSCodeStep/DotnetInitVSCodeStep.ts | 2 +- .../InitVSCodeStep/InitVSCodeStepBase.ts | 2 +- .../detectProjectLanguage.ts | 2 +- .../initProjectForVSCode.ts | 2 +- .../javaSteps/addJavaInitVSCodeSteps.ts | 2 +- .../pythonSteps/PythonVenvListStep.ts | 2 +- .../pythonSteps/addPythonInitVSCodeSteps.ts | 2 +- src/commands/logstream/enableFileLogging.ts | 8 +- src/commands/logstream/startStreamingLogs.ts | 20 +- src/commands/logstream/stopStreamingLogs.ts | 6 +- src/commands/openFile.ts | 4 +- src/commands/openInPortal.ts | 3 +- src/commands/pickFuncProcess.ts | 3 +- src/commands/registerCommands.ts | 4 +- .../remoteDebug/getRemoteDebugLanguage.ts | 6 +- src/commands/remoteDebug/startRemoteDebug.ts | 8 +- src/commands/remoteDebugJava/DebugProxy.ts | 10 +- .../remoteDebugJavaFunctionApp.ts | 18 +- src/commands/renameAppSetting.ts | 4 +- src/commands/restartFunctionApp.ts | 2 +- src/commands/startFunctionApp.ts | 4 +- src/commands/stopFunctionApp.ts | 4 +- src/commands/swapSlot.ts | 4 +- src/commands/updateDisabledState.ts | 2 +- src/commands/viewProperties.ts | 2 +- src/debug/FuncDebugProviderBase.ts | 2 +- src/debug/FuncTaskProvider.ts | 2 +- src/debug/validatePreDebug.ts | 2 +- src/downloadAzureProject/handleUri.ts | 2 +- .../setupProjectFolder.ts | 6 +- src/extension.ts | 16 +- src/extensionVariables.ts | 2 +- src/funcConfig/local.settings.ts | 2 +- src/funcCoreTools/funcHostTask.ts | 2 +- src/funcCoreTools/getFuncCliPath.ts | 2 +- .../getLocalFuncCoreToolsVersion.ts | 2 +- src/funcCoreTools/getNpmDistTag.ts | 2 +- src/funcCoreTools/hasMinFuncCliVersion.ts | 2 +- src/funcCoreTools/installFuncCoreTools.ts | 2 +- .../installOrUpdateFuncCoreTools.ts | 2 +- src/funcCoreTools/tryGetLocalFuncVersion.ts | 2 +- src/funcCoreTools/uninstallFuncCoreTools.ts | 2 +- src/funcCoreTools/updateFuncCoreTools.ts | 2 +- .../validateFuncCoreToolsInstalled.ts | 2 +- .../validateFuncCoreToolsIsLatest.ts | 2 +- src/templates/CentralTemplateProvider.ts | 2 +- src/templates/TemplateProviderBase.ts | 2 +- .../dotnet/DotnetTemplateProvider.ts | 2 +- .../dotnet/executeDotnetTemplateCommand.ts | 2 +- src/templates/dotnet/parseDotnetTemplates.ts | 2 +- src/templates/java/JavaTemplateProvider.ts | 2 +- .../script/ScriptBundleTemplateProvider.ts | 2 +- .../script/ScriptTemplateProvider.ts | 2 +- src/tree/AzureAccountTreeItemWithProjects.ts | 3 +- src/tree/FunctionTreeItemBase.ts | 8 +- src/tree/FunctionsTreeItemBase.ts | 2 +- src/tree/IProjectTreeItem.ts | 2 +- src/tree/ProductionSlotTreeItem.ts | 4 +- src/tree/SlotTreeItem.ts | 2 +- src/tree/SlotTreeItemBase.ts | 18 +- src/tree/SlotsTreeItem.ts | 20 +- src/tree/SubscriptionTreeItem.ts | 20 +- .../localProject/InitLocalProjectTreeItem.ts | 2 +- .../InvalidLocalProjectTreeItem.ts | 2 +- .../localProject/LocalFunctionTreeItem.ts | 8 +- .../localProject/LocalFunctionsTreeItem.ts | 8 +- src/tree/localProject/LocalProjectTreeItem.ts | 2 +- .../localProject/LocalProjectTreeItemBase.ts | 2 +- .../localProject/createRefreshFileWatcher.ts | 2 +- .../remoteProject/RemoteFunctionTreeItem.ts | 12 +- .../remoteProject/RemoteFunctionsTreeItem.ts | 19 +- src/utils/azure.ts | 9 +- src/utils/azureClients.ts | 2 +- src/utils/bundleFeedUtils.ts | 2 +- src/utils/cliFeedUtils.ts | 2 +- src/utils/cpUtils.ts | 2 +- src/utils/dotnetUtils.ts | 2 +- src/utils/feedUtils.ts | 2 +- src/utils/fs.ts | 2 +- src/utils/gradleUtils.ts | 2 +- src/utils/javaUtils.ts | 2 +- src/utils/mavenUtils.ts | 2 +- src/utils/requestUtils.ts | 3 +- src/utils/telemetryUtils.ts | 2 +- src/utils/treeUtils.ts | 2 +- src/utils/verifyExtensionBundle.ts | 2 +- src/utils/workspace.ts | 2 +- .../promptToReinitializeProject.ts | 2 +- src/vsCodeConfig/settings.ts | 2 +- src/vsCodeConfig/verifyInitForVSCode.ts | 2 +- src/vsCodeConfig/verifyPythonVenv.ts | 2 +- src/vsCodeConfig/verifyTargetFramework.ts | 2 +- .../verifyVSCodeConfigOnActivate.ts | 2 +- test/addBinding.test.ts | 2 +- test/api.test.ts | 2 +- test/nightly/functionAppOperations.test.ts | 14 +- 204 files changed, 1278 insertions(+), 1371 deletions(-) diff --git a/extension.bundle.ts b/extension.bundle.ts index f3685d5d9..9a62c50fb 100644 --- a/extension.bundle.ts +++ b/extension.bundle.ts @@ -14,8 +14,8 @@ // // The tests should import '../extension.bundle'. At design-time they live in tests/ and so will pick up this file (extension.bundle.ts). // At runtime the tests live in dist/tests and will therefore pick up the main webpack bundle at dist/extension.bundle.js. -export * from 'vscode-azureappservice'; -export * from 'vscode-azureextensionui'; +export { createAzureClient, createGenericClient } from '@microsoft/vscode-azext-azureutils'; +export { AzExtTreeDataProvider, DialogResponses, IActionContext, nonNullValue, parseError, registerOnActionStartHandler } from '@microsoft/vscode-azext-utils'; export * from './src/commands/addBinding/addBinding'; export * from './src/commands/copyFunctionUrl'; export * from './src/commands/createFunction/createFunction'; diff --git a/package-lock.json b/package-lock.json index a27e65a2d..be004c02e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,17 @@ "version": "1.6.1-alpha", "license": "SEE LICENSE IN LICENSE.md", "dependencies": { - "@azure/arm-appinsights": "^2.1.0", - "@azure/arm-appservice": "^6.0.0", - "@azure/arm-cosmosdb": "^9.0.0", - "@azure/arm-eventhub": "^3.2.0", - "@azure/arm-servicebus": "^3.2.0", - "@azure/arm-storage": "^15.0.0", + "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appservice": "^11.0.0", + "@azure/arm-cosmosdb": "^15.0.0", + "@azure/arm-eventhub": "^5.0.0", + "@azure/arm-servicebus": "^5.0.0", + "@azure/arm-storage": "^17.0.0", "@azure/ms-rest-js": "^2.2.1", "@azure/storage-blob": "^12.5.0", + "@microsoft/vscode-azext-azureappservice": "^0.1.0", + "@microsoft/vscode-azext-azureutils": "^0.1.0", + "@microsoft/vscode-azext-utils": "^0.1.0", "escape-string-regexp": "^4.0.0", "extract-zip": "^2.0.1", "fs-extra": "^4.0.2", @@ -27,8 +30,6 @@ "portfinder": "^1.0.23", "ps-tree": "^1.1.1", "semver": "^5.7.1", - "vscode-azureappservice": "^0.86.3", - "vscode-azureextensionui": "^0.48.5", "vscode-azurekudu": "^0.2.0", "vscode-nls": "^4.1.1", "websocket": "^1.0.29", @@ -68,7 +69,7 @@ "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "vsce": "^1.87.0", - "vscode-azureextensiondev": "^0.10.2", + "vscode-azureextensiondev": "^0.10.4", "vscode-test": "^1.5.2", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" @@ -94,137 +95,81 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/arm-appinsights": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-2.1.0.tgz", - "integrity": "sha512-wfJgzoz/ZdLpT9TsKtpjWWsKmqQ7BkseEmKrm6gPcrQeINjzpgqex29suhS+Jmq1f4i2ZEofQKA1YHhBknrcsA==", - "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", - "tslib": "^1.9.3" - } - }, - "node_modules/@azure/arm-appinsights/node_modules/@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-4.0.0.tgz", + "integrity": "sha512-P36NpLn49raSh4xtsHUSBCUJ9SRiH2FJXENBQYZhD+MILObRKQYYU8izPxkqMR0oMROQFU2dL/G/sAp+SeSpYQ==", "dependencies": { "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" + "@azure/ms-rest-azure-js": "^2.1.0", + "@azure/ms-rest-js": "^2.2.0", + "tslib": "^1.10.0" } }, - "node_modules/@azure/arm-appinsights/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "node_modules/@azure/arm-appservice": { + "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": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "engines": { - "node": ">=0.8" - } - }, - "node_modules/@azure/arm-appinsights/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/@azure/arm-appservice": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-6.1.0.tgz", - "integrity": "sha512-CST99Ht+ziZ42zlCpIqKZ2vIrDHBStk9ODIEue08LU+AFIbRuXqR7DFyLv9Q8NldCvzKAXFfCA6LJiJgCYoEWw==", - "dependencies": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "node": ">=12.0.0" } }, - "node_modules/@azure/arm-appservice/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "node_modules/@azure/arm-appservice/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/arm-cosmosdb": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-cosmosdb/-/arm-cosmosdb-9.1.0.tgz", - "integrity": "sha512-ZHQTnBSjJ+TUAlXqfc1M23A0622gSSvYVd5gCqWHwG64e/R4zAySDDXcIi0bGYAUv/0nZzKHYulrgYpU+GnDjw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-cosmosdb/-/arm-cosmosdb-15.0.0.tgz", + "integrity": "sha512-F0lrY+11XRBwMZgXUkGMh8EaSmeHCWjRgblRp+PKlce3UUmC4lgbrZYrJdhE2rxDkOS4sz+zL1lnN2qMuejSNg==", "dependencies": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" } }, - "node_modules/@azure/arm-cosmosdb/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "node_modules/@azure/arm-cosmosdb/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/arm-eventhub": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@azure/arm-eventhub/-/arm-eventhub-3.3.1.tgz", - "integrity": "sha512-yeUNS+xlxMRnfPQZo+zOhdpIbGHAxUOoQks/orwWEQ3g+En+rTyoAVgbX8bC4a0zt4Tzg5VeMNp1su8NNEoDxg==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^1.4.0", - "@azure/ms-rest-js": "^1.11.0", - "tslib": "^1.9.3" - } - }, - "node_modules/@azure/arm-eventhub/node_modules/@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "node_modules/@azure/arm-eventhub/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-eventhub/-/arm-eventhub-5.0.0.tgz", + "integrity": "sha512-ENVwQBIT2MGER0GcG+rI0Bg6RBGKpqyMkwwAEmsRqscrTVwjFpeoS2pysoyKJMvQCEMpgp/bzstLUvwoQD5/2Q==", "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "engines": { - "node": ">=0.8" + "node": ">=12.0.0" } }, - "node_modules/@azure/arm-eventhub/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } + "node_modules/@azure/arm-eventhub/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/arm-resourcegraph": { "version": "4.2.1", @@ -237,20 +182,11 @@ "tslib": "^1.10.0" } }, - "node_modules/@azure/arm-resourcegraph/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, "node_modules/@azure/arm-resources": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-3.0.0.tgz", "integrity": "sha512-lcddsgwrMJTug8XoKONieGSyPWFZ9ueaUAHdrPfAlS3qyF58txFGVMjb/q5FVd8CKML4EUNDeldL7oLUZmD5Fw==", + "dev": true, "dependencies": { "@azure/ms-rest-azure-js": "^2.0.1", "@azure/ms-rest-js": "^2.0.4", @@ -268,80 +204,54 @@ "tslib": "^1.10.0" } }, - "node_modules/@azure/arm-resources-profile-2020-09-01-hybrid/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/@azure/arm-resources/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", + "node_modules/@azure/arm-resources-subscriptions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@azure/arm-resources-subscriptions/-/arm-resources-subscriptions-1.0.1.tgz", + "integrity": "sha512-aEn2DGAhzGoteEvawnZlP4ATPo2FEyhQHUucDUz7vIaAarPb6CY4T8w+1SJt/SkIN/ZxwvLcFAhv28Tm0mhxXw==", "dependencies": { "@azure/core-auth": "^1.1.4", + "@azure/ms-rest-azure-js": "^2.1.0", "@azure/ms-rest-js": "^2.2.0", "tslib": "^1.10.0" } }, "node_modules/@azure/arm-servicebus": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@azure/arm-servicebus/-/arm-servicebus-3.2.0.tgz", - "integrity": "sha512-e0nNyP0O802YMb4jq0nsVduIBHRWtmX/AtiWMCDI1f0KtcEmNRPfbP8DxU6iNgwnV09qy3EfaRfSY0vMsYs5cg==", - "dependencies": { - "@azure/ms-rest-azure-js": "^1.3.2", - "@azure/ms-rest-js": "^1.8.1", - "tslib": "^1.9.3" - } - }, - "node_modules/@azure/arm-servicebus/node_modules/@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "node_modules/@azure/arm-servicebus/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-servicebus/-/arm-servicebus-5.0.0.tgz", + "integrity": "sha512-t7Y4F/RJHwbunyegi4qH+XlnGuFKoV7UChjtfa8D6occwyd7OpC4TmKpZBn71qp5OekomyKdVklE00EueeQo3Q==", "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "engines": { - "node": ">=0.8" + "node": ">=12.0.0" } }, - "node_modules/@azure/arm-servicebus/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } + "node_modules/@azure/arm-servicebus/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/arm-storage": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-15.3.0.tgz", - "integrity": "sha512-djN2tmEzvC4lNEYrk3PAXkf5ZcebGDqPZSh/cYKOleumD4eop5EpMX8d5LcSO/9EcSfPpCzutRg0AleMaPQ9Mg==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.0.0.tgz", + "integrity": "sha512-WS9eT3/vDQ7a1z/8K5BkPhoAi0ilo94yCSws4KyWq6UIA3RaXBDpYYAlN0TOxad9rPeOnWXWcB9gLw3DmjZ4wg==", "dependencies": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" } }, "node_modules/@azure/arm-storage-profile-2020-09-01-hybrid": { @@ -355,46 +265,10 @@ "tslib": "^1.10.0" } }, - "node_modules/@azure/arm-storage-profile-2020-09-01-hybrid/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/@azure/arm-storage/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/@azure/arm-subscriptions": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-3.1.2.tgz", - "integrity": "sha512-fO1Sxjn27At53Zkgs0tKW9l6iYavfbVgkK4rCFYa2d3M5yofGctHafYDTHQLnp7dYwUzGzTHrBMlyrKo92QpAQ==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/@azure/arm-subscriptions/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "node_modules/@azure/arm-storage/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@azure/core-asynciterator-polyfill": { "version": "1.0.0", @@ -418,6 +292,28 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, + "node_modules/@azure/core-client": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.4.0.tgz", + "integrity": "sha512-6v1pn4ubNSeI56PUgj2NLR/nfoMfkjYmrtNX0YdXrjxSajKcf/TZc/QJtTFj4wHIvYqU/Yn/g/Zb+MNhFZ5c+Q==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-asynciterator-polyfill": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-rest-pipeline": "^1.4.0", + "@azure/core-tracing": "1.0.0-preview.13", + "@azure/logger": "^1.0.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@azure/core-client/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, "node_modules/@azure/core-http": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.2.tgz", @@ -510,6 +406,43 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, + "node_modules/@azure/core-rest-pipeline": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.4.0.tgz", + "integrity": "sha512-M2uL9PbvhJIEMRoUad3EnXCHWLN/i0W7D7MQJ9rnIDW7iLVCteUiegdqNa2Cr1/7he/ysEXYiwaXiHmfack/6g==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-tracing": "1.0.0-preview.13", + "@azure/logger": "^1.0.0", + "form-data": "^4.0.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "tslib": "^2.2.0", + "uuid": "^8.3.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, "node_modules/@azure/core-tracing": { "version": "1.0.0-preview.13", "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz", @@ -549,49 +482,13 @@ "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==" }, "node_modules/@azure/ms-rest-azure-js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-1.4.0.tgz", - "integrity": "sha512-ul1wfkzwU9wYg6kFKD/AuQfVRJU4utEjDcfa0hvXqDS99yRuJqUrt/Ojv3duZMwskBIrD3CV5d9TjLBOV7/pQw==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^1.10.0", - "tslib": "^1.9.3" - } - }, - "node_modules/@azure/ms-rest-azure-js/node_modules/@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", + "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", "dependencies": { "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "node_modules/@azure/ms-rest-azure-js/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/@azure/ms-rest-azure-js/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" + "@azure/ms-rest-js": "^2.2.0", + "tslib": "^1.10.0" } }, "node_modules/@azure/ms-rest-js": { @@ -611,10 +508,9 @@ } }, "node_modules/@azure/ms-rest-nodeauth": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.0.tgz", - "integrity": "sha512-F4NKrbkZg0qD3+rUM8fvJHOFRkXFoEiptYTZtLBruN3VwBFIqbTFW0fmgRyBW9seZl+mX2OexQA5GzWenSA3Kw==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz", + "integrity": "sha512-UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==", "dependencies": { "@azure/ms-rest-azure-env": "^2.0.0", "@azure/ms-rest-js": "^2.0.4", @@ -752,89 +648,332 @@ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz", "integrity": "sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ==", "dependencies": { - "core-js-pure": "^3.19.0", - "regenerator-runtime": "^0.13.4" + "core-js-pure": "^3.19.0", + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", + "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/@gar/promisify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", + "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", + "dev": true + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, + "node_modules/@microsoft/eslint-config-azuretools": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/eslint-config-azuretools/-/eslint-config-azuretools-0.1.0.tgz", + "integrity": "sha512-1H95Y6RzUxl96BHneJeLdf2zsJFTZA1Ho6O6lAhky/mfYRulXFOGzeWyffwNScWdWFkHxGSmec5XnkQhoHKy5A==", + "dev": true, + "dependencies": { + "@typescript-eslint/parser": "^4.28.5" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": ">=4", + "eslint": ">=7", + "eslint-plugin-import": ">=2" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.1.0.tgz", + "integrity": "sha512-0WFmjk6J+K+yyFxBT7XMjWB4+4YWZ7lc7SWvgmr4nB2mrSXisfat5TNYlb/aeb1Av50RxDLOb1IrJ7+KpWX93g==", + "dependencies": { + "@azure/abort-controller": "^1.0.4", + "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appservice": "^11.0.0", + "@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.0.2", + "@microsoft/vscode-azext-utils": "^0.0.2", + "dayjs": "^1.9.1", + "fs-extra": "^10.0.0", + "glob-gitignore": "^1.0.14", + "globby": "^11.0.2", + "p-retry": "^3.0.1", + "portfinder": "^1.0.25", + "pretty-bytes": "^5.3.0", + "simple-git": "^1.132.0", + "vscode-azurekudu": "^0.2.0", + "vscode-nls": "^5.0.0", + "websocket": "^1.0.31", + "yazl": "^2.5.1" + } + }, + "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", + "integrity": "sha512-eKICohMfZcW0d7tsxS29Z/bznvfUMCu+khJhDJfDlKLqfmqBun6CxBTDeWcNbuckDRxalJ0gZJp5hidC9+Msiw==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@azure/arm-resources/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@azure/arm-subscriptions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-5.0.0.tgz", + "integrity": "sha512-kka1Gsy5fvQvYbe3gRsMl2hYCFMdQRHuOSSRUAsQUwAEqIJCu/hLZ/CNKcYusIMrA0SWzrjlFYVklo/uUKYolg==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@azure/arm-subscriptions/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-azureutils": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.0.2.tgz", + "integrity": "sha512-zg+P6U8iv6WzwgGE/yavITjL8naE5wRsX5mjwIGD03qFuIlVNPwysbLmk0Mfq+MtMqhzXzHtcQNdm2FrCUtneA==", + "dependencies": { + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/arm-resources-subscriptions": "^1.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@microsoft/vscode-azext-utils": "^0.0.2", + "semver": "^5.7.1", + "uuid": "^8.3.2", + "vscode-nls": "^4.1.1" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-azureutils/node_modules/vscode-nls": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", + "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==" + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-utils": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.0.2.tgz", + "integrity": "sha512-dc7SacpW2dufDMao2wmArN678rKo5xdFLjH9QoX4ZSgm1hogqmtnN3O5iokKktUH/+oI0Q71ZCN+egdx3h2d4w==", + "dependencies": { + "@vscode/extension-telemetry": "^0.4.7", + "dayjs": "^1.9.3", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^5.1.1", + "open": "^8.0.4", + "semver": "^5.7.1", + "vscode-nls": "^4.1.1", + "vscode-tas-client": "^0.1.22" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/@microsoft/vscode-azext-utils/node_modules/vscode-nls": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", + "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==" + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/fs-extra": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=12" } }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", - "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", - "dev": true, - "engines": { - "node": ">=10.0.0" + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/p-retry": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", + "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" + "retry": "^0.12.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=6" } }, - "node_modules/@eslint/eslintrc/node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "engines": { "node": ">= 4" } }, - "node_modules/@gar/promisify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", - "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", - "dev": true + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "engines": { + "node": ">= 10.0.0" + } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, + "node_modules/@microsoft/vscode-azext-azureappservice/node_modules/vscode-nls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", + "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==" + }, + "node_modules/@microsoft/vscode-azext-azureutils": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.1.0.tgz", + "integrity": "sha512-02frLYTfIEW+kgFzHcWaxG4/bLdIXZ6dKEiKu/abiPUFPTG6oFEmd8YhWl0cyp57ej2JE5yKh8T332L3d2tK1w==", "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/arm-resources-subscriptions": "^1.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@azure/ms-rest-nodeauth": "^3.1.1", + "@microsoft/vscode-azext-utils": "^0.1.0", + "semver": "^5.7.1", + "uuid": "^8.3.2", + "vscode-nls": "^4.1.1" + } + }, + "node_modules/@microsoft/vscode-azext-azureutils/node_modules/@azure/arm-resources": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-5.0.0.tgz", + "integrity": "sha512-eKICohMfZcW0d7tsxS29Z/bznvfUMCu+khJhDJfDlKLqfmqBun6CxBTDeWcNbuckDRxalJ0gZJp5hidC9+Msiw==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "engines": { - "node": ">=10.10.0" + "node": ">=12.0.0" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true + "node_modules/@microsoft/vscode-azext-azureutils/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, - "node_modules/@microsoft/eslint-config-azuretools": { + "node_modules/@microsoft/vscode-azext-utils": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@microsoft/eslint-config-azuretools/-/eslint-config-azuretools-0.1.0.tgz", - "integrity": "sha512-1H95Y6RzUxl96BHneJeLdf2zsJFTZA1Ho6O6lAhky/mfYRulXFOGzeWyffwNScWdWFkHxGSmec5XnkQhoHKy5A==", - "dev": true, + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.1.0.tgz", + "integrity": "sha512-HJGh8eXP5pJ+d9Fp+3BLsZ29NK20/86sWQ/OAeKwV2W+J8JiiDJmZvNapC/G3MrMpb8tcD4KthAl0mJDo0o6gw==", "dependencies": { - "@typescript-eslint/parser": "^4.28.5" - }, - "peerDependencies": { - "@typescript-eslint/eslint-plugin": ">=4", - "eslint": ">=7", - "eslint-plugin-import": ">=2" + "@vscode/extension-telemetry": "^0.4.7", + "dayjs": "^1.9.3", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^5.1.1", + "open": "^8.0.4", + "semver": "^5.7.1", + "vscode-nls": "^4.1.1", + "vscode-tas-client": "^0.1.22" + } + }, + "node_modules/@microsoft/vscode-azext-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "engines": { + "node": ">=8" } }, "node_modules/@nodelib/fs.scandir": { @@ -919,7 +1058,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" } @@ -1428,6 +1566,14 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "node_modules/@vscode/extension-telemetry": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.4.7.tgz", + "integrity": "sha512-tXjChgxFN6EAfa6LIy/PE3fIbIvj0BnELUmGAG+8tUpsLY3g2iACcVM/UJJXtsU6db29tMqCLITUX2Dd3N06GA==", + "engines": { + "vscode": "^1.60.0" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -1614,7 +1760,6 @@ "version": "0.7.5", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==", - "dev": true, "engines": { "node": ">=10.0.0" } @@ -1667,7 +1812,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz", "integrity": "sha512-gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ==", - "dev": true, "dependencies": { "@xmldom/xmldom": "^0.7.0", "async": "^2.6.3", @@ -1687,7 +1831,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, "bin": { "uuid": "bin/uuid" } @@ -1696,7 +1839,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, "dependencies": { "debug": "4" }, @@ -2483,8 +2625,7 @@ "node_modules/buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", - "dev": true + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "node_modules/buffer-fill": { "version": "1.0.0", @@ -3255,7 +3396,6 @@ "version": "1.2.21", "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz", "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=", - "dev": true, "engines": { "node": ">0.4.0" } @@ -3815,7 +3955,6 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dev": true, "dependencies": { "safe-buffer": "^5.0.1" } @@ -6440,7 +6579,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", @@ -6469,7 +6607,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, "dependencies": { "agent-base": "6", "debug": "4" @@ -7368,7 +7505,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dev": true, "dependencies": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.11", @@ -7379,7 +7515,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, "dependencies": { "jwa": "^1.4.1", "safe-buffer": "^5.0.1" @@ -11845,8 +11980,7 @@ "node_modules/underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", - "dev": true + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" }, "node_modules/undertaker": { "version": "1.3.0", @@ -12353,103 +12487,10 @@ "node": ">=4" } }, - "node_modules/vscode-azureappservice": { - "version": "0.86.4", - "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.86.4.tgz", - "integrity": "sha512-GB111KkFOAWL0au8XKQDZrSXIIAOrbXvq8AOkN20ulqkNkDo18SK5BQewSHC9sQ143eMsyFoYi4utL9YkpnEfg==", - "dependencies": { - "@azure/abort-controller": "^1.0.4", - "@azure/arm-appinsights": "^3.0.0", - "@azure/arm-appservice": "^6.1.0", - "@azure/arm-resourcegraph": "^4.0.0", - "@azure/arm-resources": "^4.0.0", - "@azure/arm-subscriptions": "^3.0.0", - "@azure/ms-rest-azure-env": "^2.0.0", - "@azure/ms-rest-js": "^2.3.0", - "@azure/storage-blob": "^12.3.0", - "dayjs": "^1.9.1", - "fs-extra": "^8.0.0", - "glob-gitignore": "^1.0.14", - "globby": "^11.0.2", - "p-retry": "^3.0.1", - "portfinder": "^1.0.25", - "pretty-bytes": "^5.3.0", - "simple-git": "1.132.0", - "vscode-azureextensionui": "^0.48.0", - "vscode-azurekudu": "^0.2.0", - "vscode-nls": "^4.1.1", - "websocket": "^1.0.31", - "yazl": "^2.5.1" - } - }, - "node_modules/vscode-azureappservice/node_modules/@azure/arm-appinsights": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-3.1.1.tgz", - "integrity": "sha512-1gQmybB/v5EDHNMuuX4xOzd3aDOdQ5bSCAd5yhjWUhZleqpFJR8rmd5vtH96NeVbt7LtW1op53ERxdlt5UmJKg==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/vscode-azureappservice/node_modules/@azure/arm-resources": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-4.2.2.tgz", - "integrity": "sha512-Oic1OcEwgex3X1KkhP9UM/E/taIaS9oID7PL/CZ8knD7qtVNSRvTxP3uvD3ZpH9NYBYXngJsX5xyRu66iFN+rA==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/vscode-azureappservice/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/vscode-azureappservice/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/vscode-azureappservice/node_modules/p-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", - "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", - "dependencies": { - "retry": "^0.12.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/vscode-azureappservice/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "engines": { - "node": ">= 4" - } - }, "node_modules/vscode-azureextensiondev": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/vscode-azureextensiondev/-/vscode-azureextensiondev-0.10.2.tgz", - "integrity": "sha512-P+ozMOQnP2l06ZcR/TYBr/ORHpBvtcHFBC0ksxzhU40NvDcZ69v0DaD2UrLG59Tqu3bRL0uMe8Z3optJJB8Tcw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/vscode-azureextensiondev/-/vscode-azureextensiondev-0.10.4.tgz", + "integrity": "sha512-4UuEwnSZxT7hESERT6hTMNhBpyKYTVjVZ1IxWDiTxxy1zvtgUjE424FGX+p+t2xaUrvZlDjSo42RB0rBpNWQiw==", "dev": true, "dependencies": { "@azure/arm-subscriptions": "^2.0.0", @@ -12478,17 +12519,6 @@ "tslib": "^1.10.0" } }, - "node_modules/vscode-azureextensiondev/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dev": true, - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, "node_modules/vscode-azureextensiondev/node_modules/@types/estree": { "version": "0.0.46", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", @@ -12747,62 +12777,11 @@ "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", "dev": true, "dependencies": { - "source-list-map": "^2.0.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vscode-azureextensionui": { - "version": "0.48.6", - "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.48.6.tgz", - "integrity": "sha512-mTmm3VoClXpv8IPbVPveI2wi9TPr1MurBj3vyJmxcqWLBkoAGydilbm4irhh2z/8GRCJNV/VHyaIM2ton2Q/zw==", - "dependencies": { - "@azure/arm-resources": "^3.0.0", - "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", - "@azure/arm-storage": "^15.0.0", - "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", - "@azure/arm-subscriptions": "^2.0.0", - "@azure/ms-rest-azure-env": "^2.0.0", - "@azure/ms-rest-js": "^2.2.1", - "dayjs": "^1.9.3", - "escape-string-regexp": "^2.0.0", - "html-to-text": "^5.1.1", - "open": "^8.0.4", - "semver": "^5.7.1", - "uuid": "^8.3.2", - "vscode-extension-telemetry": "^0.3.1", - "vscode-nls": "^4.1.1", - "vscode-tas-client": "^0.1.22" - } - }, - "node_modules/vscode-azureextensionui/node_modules/@azure/arm-subscriptions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-2.0.0.tgz", - "integrity": "sha512-+ys2glK5YgwZ9KhwWblfAQIPABtiB5OdKEpPOpcvr7B5ygYTwZuSUNObX9MRu/MyiRo1zDlUvlxHltBphq/bLQ==", - "dependencies": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" - } - }, - "node_modules/vscode-azureextensionui/node_modules/@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dependencies": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "node_modules/vscode-azureextensionui/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "source-list-map": "^2.0.1", + "source-map": "^0.6.1" + }, "engines": { - "node": ">=8" + "node": ">=10.13.0" } }, "node_modules/vscode-azurekudu": { @@ -12814,14 +12793,6 @@ "tslib": "^1.10.0" } }, - "node_modules/vscode-extension-telemetry": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.3.2.tgz", - "integrity": "sha512-zVvd5MNtMP4x7seq/yFeD+yrXIX5pXz6YaohI1pgDXCTEDs6yn377KisHXY2we8gw+u0gYug75+5QfewrCQ2cw==", - "engines": { - "vscode": "^1.5.0" - } - }, "node_modules/vscode-nls": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", @@ -13309,7 +13280,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz", "integrity": "sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -13533,129 +13503,76 @@ } }, "@azure/arm-appinsights": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-2.1.0.tgz", - "integrity": "sha512-wfJgzoz/ZdLpT9TsKtpjWWsKmqQ7BkseEmKrm6gPcrQeINjzpgqex29suhS+Jmq1f4i2ZEofQKA1YHhBknrcsA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-4.0.0.tgz", + "integrity": "sha512-P36NpLn49raSh4xtsHUSBCUJ9SRiH2FJXENBQYZhD+MILObRKQYYU8izPxkqMR0oMROQFU2dL/G/sAp+SeSpYQ==", "requires": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "requires": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - } + "@azure/core-auth": "^1.1.4", + "@azure/ms-rest-azure-js": "^2.1.0", + "@azure/ms-rest-js": "^2.2.0", + "tslib": "^1.10.0" } }, "@azure/arm-appservice": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-appservice/-/arm-appservice-6.1.0.tgz", - "integrity": "sha512-CST99Ht+ziZ42zlCpIqKZ2vIrDHBStk9ODIEue08LU+AFIbRuXqR7DFyLv9Q8NldCvzKAXFfCA6LJiJgCYoEWw==", + "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/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, "@azure/arm-cosmosdb": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@azure/arm-cosmosdb/-/arm-cosmosdb-9.1.0.tgz", - "integrity": "sha512-ZHQTnBSjJ+TUAlXqfc1M23A0622gSSvYVd5gCqWHwG64e/R4zAySDDXcIi0bGYAUv/0nZzKHYulrgYpU+GnDjw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-cosmosdb/-/arm-cosmosdb-15.0.0.tgz", + "integrity": "sha512-F0lrY+11XRBwMZgXUkGMh8EaSmeHCWjRgblRp+PKlce3UUmC4lgbrZYrJdhE2rxDkOS4sz+zL1lnN2qMuejSNg==", "requires": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, "@azure/arm-eventhub": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@azure/arm-eventhub/-/arm-eventhub-3.3.1.tgz", - "integrity": "sha512-yeUNS+xlxMRnfPQZo+zOhdpIbGHAxUOoQks/orwWEQ3g+En+rTyoAVgbX8bC4a0zt4Tzg5VeMNp1su8NNEoDxg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-eventhub/-/arm-eventhub-5.0.0.tgz", + "integrity": "sha512-ENVwQBIT2MGER0GcG+rI0Bg6RBGKpqyMkwwAEmsRqscrTVwjFpeoS2pysoyKJMvQCEMpgp/bzstLUvwoQD5/2Q==", "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^1.4.0", - "@azure/ms-rest-js": "^1.11.0", - "tslib": "^1.9.3" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "dependencies": { - "@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "requires": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, @@ -13668,40 +13585,17 @@ "@azure/ms-rest-azure-js": "^2.1.0", "@azure/ms-rest-js": "^2.2.0", "tslib": "^1.10.0" - }, - "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - } } }, "@azure/arm-resources": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-3.0.0.tgz", "integrity": "sha512-lcddsgwrMJTug8XoKONieGSyPWFZ9ueaUAHdrPfAlS3qyF58txFGVMjb/q5FVd8CKML4EUNDeldL7oLUZmD5Fw==", + "dev": true, "requires": { "@azure/ms-rest-azure-js": "^2.0.1", "@azure/ms-rest-js": "^2.0.4", "tslib": "^1.10.0" - }, - "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - } } }, "@azure/arm-resources-profile-2020-09-01-hybrid": { @@ -13713,80 +13607,58 @@ "@azure/ms-rest-azure-js": "^2.1.0", "@azure/ms-rest-js": "^2.2.0", "tslib": "^1.10.0" - }, - "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - } + } + }, + "@azure/arm-resources-subscriptions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@azure/arm-resources-subscriptions/-/arm-resources-subscriptions-1.0.1.tgz", + "integrity": "sha512-aEn2DGAhzGoteEvawnZlP4ATPo2FEyhQHUucDUz7vIaAarPb6CY4T8w+1SJt/SkIN/ZxwvLcFAhv28Tm0mhxXw==", + "requires": { + "@azure/core-auth": "^1.1.4", + "@azure/ms-rest-azure-js": "^2.1.0", + "@azure/ms-rest-js": "^2.2.0", + "tslib": "^1.10.0" } }, "@azure/arm-servicebus": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@azure/arm-servicebus/-/arm-servicebus-3.2.0.tgz", - "integrity": "sha512-e0nNyP0O802YMb4jq0nsVduIBHRWtmX/AtiWMCDI1f0KtcEmNRPfbP8DxU6iNgwnV09qy3EfaRfSY0vMsYs5cg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-servicebus/-/arm-servicebus-5.0.0.tgz", + "integrity": "sha512-t7Y4F/RJHwbunyegi4qH+XlnGuFKoV7UChjtfa8D6occwyd7OpC4TmKpZBn71qp5OekomyKdVklE00EueeQo3Q==", "requires": { - "@azure/ms-rest-azure-js": "^1.3.2", - "@azure/ms-rest-js": "^1.8.1", - "tslib": "^1.9.3" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "dependencies": { - "@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "requires": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, "@azure/arm-storage": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-15.3.0.tgz", - "integrity": "sha512-djN2tmEzvC4lNEYrk3PAXkf5ZcebGDqPZSh/cYKOleumD4eop5EpMX8d5LcSO/9EcSfPpCzutRg0AleMaPQ9Mg==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-storage/-/arm-storage-17.0.0.tgz", + "integrity": "sha512-WS9eT3/vDQ7a1z/8K5BkPhoAi0ilo94yCSws4KyWq6UIA3RaXBDpYYAlN0TOxad9rPeOnWXWcB9gLw3DmjZ4wg==", "requires": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" }, "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, @@ -13799,41 +13671,6 @@ "@azure/ms-rest-azure-js": "^2.1.0", "@azure/ms-rest-js": "^2.2.0", "tslib": "^1.10.0" - }, - "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - } - } - }, - "@azure/arm-subscriptions": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-3.1.2.tgz", - "integrity": "sha512-fO1Sxjn27At53Zkgs0tKW9l6iYavfbVgkK4rCFYa2d3M5yofGctHafYDTHQLnp7dYwUzGzTHrBMlyrKo92QpAQ==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - }, - "dependencies": { - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - } } }, "@azure/core-asynciterator-polyfill": { @@ -13857,6 +13694,27 @@ } } }, + "@azure/core-client": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.4.0.tgz", + "integrity": "sha512-6v1pn4ubNSeI56PUgj2NLR/nfoMfkjYmrtNX0YdXrjxSajKcf/TZc/QJtTFj4wHIvYqU/Yn/g/Zb+MNhFZ5c+Q==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-asynciterator-polyfill": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-rest-pipeline": "^1.4.0", + "@azure/core-tracing": "1.0.0-preview.13", + "@azure/logger": "^1.0.0", + "tslib": "^2.2.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "@azure/core-http": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.2.tgz", @@ -13940,6 +13798,39 @@ } } }, + "@azure/core-rest-pipeline": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.4.0.tgz", + "integrity": "sha512-M2uL9PbvhJIEMRoUad3EnXCHWLN/i0W7D7MQJ9rnIDW7iLVCteUiegdqNa2Cr1/7he/ysEXYiwaXiHmfack/6g==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-tracing": "1.0.0-preview.13", + "@azure/logger": "^1.0.0", + "form-data": "^4.0.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "tslib": "^2.2.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "@azure/core-tracing": { "version": "1.0.0-preview.13", "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz", @@ -13975,46 +13866,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz", "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==" - }, - "@azure/ms-rest-azure-js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-1.4.0.tgz", - "integrity": "sha512-ul1wfkzwU9wYg6kFKD/AuQfVRJU4utEjDcfa0hvXqDS99yRuJqUrt/Ojv3duZMwskBIrD3CV5d9TjLBOV7/pQw==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^1.10.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "@azure/ms-rest-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz", - "integrity": "sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ==", - "requires": { - "@azure/core-auth": "^1.1.4", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - } + }, + "@azure/ms-rest-azure-js": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", + "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", + "requires": { + "@azure/core-auth": "^1.1.4", + "@azure/ms-rest-js": "^2.2.0", + "tslib": "^1.10.0" } }, "@azure/ms-rest-js": { @@ -14034,10 +13894,9 @@ } }, "@azure/ms-rest-nodeauth": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.0.tgz", - "integrity": "sha512-F4NKrbkZg0qD3+rUM8fvJHOFRkXFoEiptYTZtLBruN3VwBFIqbTFW0fmgRyBW9seZl+mX2OexQA5GzWenSA3Kw==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz", + "integrity": "sha512-UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==", "requires": { "@azure/ms-rest-azure-env": "^2.0.0", "@azure/ms-rest-js": "^2.0.4", @@ -14222,6 +14081,234 @@ "@typescript-eslint/parser": "^4.28.5" } }, + "@microsoft/vscode-azext-azureappservice": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-0.1.0.tgz", + "integrity": "sha512-0WFmjk6J+K+yyFxBT7XMjWB4+4YWZ7lc7SWvgmr4nB2mrSXisfat5TNYlb/aeb1Av50RxDLOb1IrJ7+KpWX93g==", + "requires": { + "@azure/abort-controller": "^1.0.4", + "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appservice": "^11.0.0", + "@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.0.2", + "@microsoft/vscode-azext-utils": "^0.0.2", + "dayjs": "^1.9.1", + "fs-extra": "^10.0.0", + "glob-gitignore": "^1.0.14", + "globby": "^11.0.2", + "p-retry": "^3.0.1", + "portfinder": "^1.0.25", + "pretty-bytes": "^5.3.0", + "simple-git": "^1.132.0", + "vscode-azurekudu": "^0.2.0", + "vscode-nls": "^5.0.0", + "websocket": "^1.0.31", + "yazl": "^2.5.1" + }, + "dependencies": { + "@azure/arm-resources": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-5.0.0.tgz", + "integrity": "sha512-eKICohMfZcW0d7tsxS29Z/bznvfUMCu+khJhDJfDlKLqfmqBun6CxBTDeWcNbuckDRxalJ0gZJp5hidC9+Msiw==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, + "@azure/arm-subscriptions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-5.0.0.tgz", + "integrity": "sha512-kka1Gsy5fvQvYbe3gRsMl2hYCFMdQRHuOSSRUAsQUwAEqIJCu/hLZ/CNKcYusIMrA0SWzrjlFYVklo/uUKYolg==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, + "@microsoft/vscode-azext-azureutils": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.0.2.tgz", + "integrity": "sha512-zg+P6U8iv6WzwgGE/yavITjL8naE5wRsX5mjwIGD03qFuIlVNPwysbLmk0Mfq+MtMqhzXzHtcQNdm2FrCUtneA==", + "requires": { + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/arm-resources-subscriptions": "^1.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@microsoft/vscode-azext-utils": "^0.0.2", + "semver": "^5.7.1", + "uuid": "^8.3.2", + "vscode-nls": "^4.1.1" + }, + "dependencies": { + "vscode-nls": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", + "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==" + } + } + }, + "@microsoft/vscode-azext-utils": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.0.2.tgz", + "integrity": "sha512-dc7SacpW2dufDMao2wmArN678rKo5xdFLjH9QoX4ZSgm1hogqmtnN3O5iokKktUH/+oI0Q71ZCN+egdx3h2d4w==", + "requires": { + "@vscode/extension-telemetry": "^0.4.7", + "dayjs": "^1.9.3", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^5.1.1", + "open": "^8.0.4", + "semver": "^5.7.1", + "vscode-nls": "^4.1.1", + "vscode-tas-client": "^0.1.22" + }, + "dependencies": { + "vscode-nls": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", + "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==" + } + } + }, + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" + }, + "fs-extra": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "p-retry": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", + "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", + "requires": { + "retry": "^0.12.0" + } + }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + }, + "vscode-nls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", + "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==" + } + } + }, + "@microsoft/vscode-azext-azureutils": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureutils/-/vscode-azext-azureutils-0.1.0.tgz", + "integrity": "sha512-02frLYTfIEW+kgFzHcWaxG4/bLdIXZ6dKEiKu/abiPUFPTG6oFEmd8YhWl0cyp57ej2JE5yKh8T332L3d2tK1w==", + "requires": { + "@azure/arm-resources": "^5.0.0", + "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/arm-resources-subscriptions": "^1.0.0", + "@azure/arm-storage": "^17.0.0", + "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/ms-rest-js": "^2.2.1", + "@azure/ms-rest-nodeauth": "^3.1.1", + "@microsoft/vscode-azext-utils": "^0.1.0", + "semver": "^5.7.1", + "uuid": "^8.3.2", + "vscode-nls": "^4.1.1" + }, + "dependencies": { + "@azure/arm-resources": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-5.0.0.tgz", + "integrity": "sha512-eKICohMfZcW0d7tsxS29Z/bznvfUMCu+khJhDJfDlKLqfmqBun6CxBTDeWcNbuckDRxalJ0gZJp5hidC9+Msiw==", + "requires": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.3.0", + "@azure/core-client": "^1.0.0", + "@azure/core-lro": "^2.2.0", + "@azure/core-paging": "^1.2.0", + "@azure/core-rest-pipeline": "^1.1.0", + "tslib": "^2.2.0" + } + }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, + "@microsoft/vscode-azext-utils": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-0.1.0.tgz", + "integrity": "sha512-HJGh8eXP5pJ+d9Fp+3BLsZ29NK20/86sWQ/OAeKwV2W+J8JiiDJmZvNapC/G3MrMpb8tcD4KthAl0mJDo0o6gw==", + "requires": { + "@vscode/extension-telemetry": "^0.4.7", + "dayjs": "^1.9.3", + "escape-string-regexp": "^2.0.0", + "html-to-text": "^5.1.1", + "open": "^8.0.4", + "semver": "^5.7.1", + "vscode-nls": "^4.1.1", + "vscode-tas-client": "^0.1.22" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -14284,8 +14371,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/eslint": { "version": "7.28.2", @@ -14706,6 +14792,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "@vscode/extension-telemetry": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.4.7.tgz", + "integrity": "sha512-tXjChgxFN6EAfa6LIy/PE3fIbIvj0BnELUmGAG+8tUpsLY3g2iACcVM/UJJXtsU6db29tMqCLITUX2Dd3N06GA==" + }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -14878,8 +14969,7 @@ "@xmldom/xmldom": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", - "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==", - "dev": true + "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==" }, "@xtuc/ieee754": { "version": "1.2.0", @@ -14918,7 +15008,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz", "integrity": "sha512-gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ==", - "dev": true, "requires": { "@xmldom/xmldom": "^0.7.0", "async": "^2.6.3", @@ -14933,8 +15022,7 @@ "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" } } }, @@ -14942,7 +15030,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, "requires": { "debug": "4" } @@ -15538,8 +15625,7 @@ "buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", - "dev": true + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "buffer-fill": { "version": "1.0.0", @@ -16149,8 +16235,7 @@ "date-utils": { "version": "1.2.21", "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz", - "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=", - "dev": true + "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=" }, "dayjs": { "version": "1.10.7", @@ -16588,7 +16673,6 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -18675,7 +18759,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", @@ -18697,7 +18780,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, "requires": { "agent-base": "6", "debug": "4" @@ -19351,7 +19433,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dev": true, "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.11", @@ -19362,7 +19443,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, "requires": { "jwa": "^1.4.1", "safe-buffer": "^5.0.1" @@ -22887,8 +22967,7 @@ "underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", - "dev": true + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" }, "undertaker": { "version": "1.3.0", @@ -23319,96 +23398,10 @@ } } }, - "vscode-azureappservice": { - "version": "0.86.4", - "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.86.4.tgz", - "integrity": "sha512-GB111KkFOAWL0au8XKQDZrSXIIAOrbXvq8AOkN20ulqkNkDo18SK5BQewSHC9sQ143eMsyFoYi4utL9YkpnEfg==", - "requires": { - "@azure/abort-controller": "^1.0.4", - "@azure/arm-appinsights": "^3.0.0", - "@azure/arm-appservice": "^6.1.0", - "@azure/arm-resourcegraph": "^4.0.0", - "@azure/arm-resources": "^4.0.0", - "@azure/arm-subscriptions": "^3.0.0", - "@azure/ms-rest-azure-env": "^2.0.0", - "@azure/ms-rest-js": "^2.3.0", - "@azure/storage-blob": "^12.3.0", - "dayjs": "^1.9.1", - "fs-extra": "^8.0.0", - "glob-gitignore": "^1.0.14", - "globby": "^11.0.2", - "p-retry": "^3.0.1", - "portfinder": "^1.0.25", - "pretty-bytes": "^5.3.0", - "simple-git": "1.132.0", - "vscode-azureextensionui": "^0.48.0", - "vscode-azurekudu": "^0.2.0", - "vscode-nls": "^4.1.1", - "websocket": "^1.0.31", - "yazl": "^2.5.1" - }, - "dependencies": { - "@azure/arm-appinsights": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@azure/arm-appinsights/-/arm-appinsights-3.1.1.tgz", - "integrity": "sha512-1gQmybB/v5EDHNMuuX4xOzd3aDOdQ5bSCAd5yhjWUhZleqpFJR8rmd5vtH96NeVbt7LtW1op53ERxdlt5UmJKg==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "@azure/arm-resources": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-4.2.2.tgz", - "integrity": "sha512-Oic1OcEwgex3X1KkhP9UM/E/taIaS9oID7PL/CZ8knD7qtVNSRvTxP3uvD3ZpH9NYBYXngJsX5xyRu66iFN+rA==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-azure-js": "^2.1.0", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "p-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", - "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", - "requires": { - "retry": "^0.12.0" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" - } - } - }, "vscode-azureextensiondev": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/vscode-azureextensiondev/-/vscode-azureextensiondev-0.10.2.tgz", - "integrity": "sha512-P+ozMOQnP2l06ZcR/TYBr/ORHpBvtcHFBC0ksxzhU40NvDcZ69v0DaD2UrLG59Tqu3bRL0uMe8Z3optJJB8Tcw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/vscode-azureextensiondev/-/vscode-azureextensiondev-0.10.4.tgz", + "integrity": "sha512-4UuEwnSZxT7hESERT6hTMNhBpyKYTVjVZ1IxWDiTxxy1zvtgUjE424FGX+p+t2xaUrvZlDjSo42RB0rBpNWQiw==", "dev": true, "requires": { "@azure/arm-subscriptions": "^2.0.0", @@ -23434,17 +23427,6 @@ "tslib": "^1.10.0" } }, - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "dev": true, - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, "@types/estree": { "version": "0.0.46", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", @@ -23679,56 +23661,6 @@ } } }, - "vscode-azureextensionui": { - "version": "0.48.6", - "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.48.6.tgz", - "integrity": "sha512-mTmm3VoClXpv8IPbVPveI2wi9TPr1MurBj3vyJmxcqWLBkoAGydilbm4irhh2z/8GRCJNV/VHyaIM2ton2Q/zw==", - "requires": { - "@azure/arm-resources": "^3.0.0", - "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", - "@azure/arm-storage": "^15.0.0", - "@azure/arm-storage-profile-2020-09-01-hybrid": "^1.0.0", - "@azure/arm-subscriptions": "^2.0.0", - "@azure/ms-rest-azure-env": "^2.0.0", - "@azure/ms-rest-js": "^2.2.1", - "dayjs": "^1.9.3", - "escape-string-regexp": "^2.0.0", - "html-to-text": "^5.1.1", - "open": "^8.0.4", - "semver": "^5.7.1", - "uuid": "^8.3.2", - "vscode-extension-telemetry": "^0.3.1", - "vscode-nls": "^4.1.1", - "vscode-tas-client": "^0.1.22" - }, - "dependencies": { - "@azure/arm-subscriptions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@azure/arm-subscriptions/-/arm-subscriptions-2.0.0.tgz", - "integrity": "sha512-+ys2glK5YgwZ9KhwWblfAQIPABtiB5OdKEpPOpcvr7B5ygYTwZuSUNObX9MRu/MyiRo1zDlUvlxHltBphq/bLQ==", - "requires": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", - "tslib": "^1.10.0" - } - }, - "@azure/ms-rest-azure-js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz", - "integrity": "sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q==", - "requires": { - "@azure/core-auth": "^1.1.4", - "@azure/ms-rest-js": "^2.2.0", - "tslib": "^1.10.0" - } - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" - } - } - }, "vscode-azurekudu": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/vscode-azurekudu/-/vscode-azurekudu-0.2.0.tgz", @@ -23738,11 +23670,6 @@ "tslib": "^1.10.0" } }, - "vscode-extension-telemetry": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.3.2.tgz", - "integrity": "sha512-zVvd5MNtMP4x7seq/yFeD+yrXIX5pXz6YaohI1pgDXCTEDs6yn377KisHXY2we8gw+u0gYug75+5QfewrCQ2cw==" - }, "vscode-nls": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", @@ -24115,8 +24042,7 @@ "xpath.js": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz", - "integrity": "sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==", - "dev": true + "integrity": "sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==" }, "xregexp": { "version": "4.3.0", diff --git a/package.json b/package.json index a8fa8f393..b0636b714 100644 --- a/package.json +++ b/package.json @@ -1104,20 +1104,23 @@ "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "vsce": "^1.87.0", - "vscode-azureextensiondev": "^0.10.2", + "vscode-azureextensiondev": "^0.10.4", "vscode-test": "^1.5.2", "webpack": "^5.28.0", "webpack-cli": "^4.6.0" }, "dependencies": { - "@azure/arm-appinsights": "^2.1.0", - "@azure/arm-appservice": "^6.0.0", - "@azure/arm-cosmosdb": "^9.0.0", - "@azure/arm-eventhub": "^3.2.0", - "@azure/arm-servicebus": "^3.2.0", - "@azure/arm-storage": "^15.0.0", + "@azure/arm-appinsights": "^4.0.0", + "@azure/arm-appservice": "^11.0.0", + "@azure/arm-cosmosdb": "^15.0.0", + "@azure/arm-eventhub": "^5.0.0", + "@azure/arm-servicebus": "^5.0.0", + "@azure/arm-storage": "^17.0.0", "@azure/ms-rest-js": "^2.2.1", "@azure/storage-blob": "^12.5.0", + "@microsoft/vscode-azext-azureappservice": "^0.1.0", + "@microsoft/vscode-azext-azureutils": "^0.1.0", + "@microsoft/vscode-azext-utils": "^0.1.0", "escape-string-regexp": "^4.0.0", "extract-zip": "^2.0.1", "fs-extra": "^4.0.2", @@ -1128,8 +1131,6 @@ "portfinder": "^1.0.23", "ps-tree": "^1.1.1", "semver": "^5.7.1", - "vscode-azureappservice": "^0.86.3", - "vscode-azureextensionui": "^0.48.5", "vscode-azurekudu": "^0.2.0", "vscode-nls": "^4.1.1", "websocket": "^1.0.29", diff --git a/src/FuncVersion.ts b/src/FuncVersion.ts index 7e73f0bfd..54285c5c6 100644 --- a/src/FuncVersion.ts +++ b/src/FuncVersion.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions } from 'vscode-azureextensionui'; +import { IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions } from '@microsoft/vscode-azext-utils'; import { localize } from './localize'; import { openUrl } from './utils/openUrl'; diff --git a/src/commands/addBinding/BindingCreateStep.ts b/src/commands/addBinding/BindingCreateStep.ts index 63736f67b..16403050f 100644 --- a/src/commands/addBinding/BindingCreateStep.ts +++ b/src/commands/addBinding/BindingCreateStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep } from "@microsoft/vscode-azext-utils"; import { Progress, Uri, window, workspace } from "vscode"; -import { AzureWizardExecuteStep } from "vscode-azureextensionui"; import { IFunctionBinding, IFunctionJson } from "../../funcConfig/function"; import { IBindingTemplate } from "../../templates/IBindingTemplate"; import { confirmEditJsonFile } from '../../utils/fs'; diff --git a/src/commands/addBinding/BindingDirectionStep.ts b/src/commands/addBinding/BindingDirectionStep.ts index 9249cae6f..7df9150c4 100644 --- a/src/commands/addBinding/BindingDirectionStep.ts +++ b/src/commands/addBinding/BindingDirectionStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import { localize } from '../../localize'; import { IBindingWizardContext } from './IBindingWizardContext'; diff --git a/src/commands/addBinding/BindingListStep.ts b/src/commands/addBinding/BindingListStep.ts index 89f26396c..e26fcd43b 100644 --- a/src/commands/addBinding/BindingListStep.ts +++ b/src/commands/addBinding/BindingListStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from '@microsoft/vscode-azext-utils'; import { ProjectLanguage } from '../../constants'; import { ext } from '../../extensionVariables'; import { FuncVersion } from '../../FuncVersion'; diff --git a/src/commands/addBinding/addBinding.ts b/src/commands/addBinding/addBinding.ts index 874ec9f66..2d7089c8f 100644 --- a/src/commands/addBinding/addBinding.ts +++ b/src/commands/addBinding/addBinding.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, IActionContext } from "@microsoft/vscode-azext-utils"; import { Uri, WorkspaceFolder } from "vscode"; -import { AzureWizard, IActionContext } from "vscode-azureextensionui"; import { ProjectLanguage, projectTemplateKeySetting } from "../../constants"; import { ext } from "../../extensionVariables"; import { FuncVersion } from "../../FuncVersion"; diff --git a/src/commands/addBinding/createBindingWizard.ts b/src/commands/addBinding/createBindingWizard.ts index dc41ddcfe..41ef5a831 100644 --- a/src/commands/addBinding/createBindingWizard.ts +++ b/src/commands/addBinding/createBindingWizard.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizard } from "vscode-azureextensionui"; +import { AzureWizard } from "@microsoft/vscode-azext-utils"; import { localize } from "../../localize"; import { BindingCreateStep } from "./BindingCreateStep"; import { BindingDirectionStep } from "./BindingDirectionStep"; diff --git a/src/commands/addBinding/settingSteps/AzureConnectionCreateStepBase.ts b/src/commands/addBinding/settingSteps/AzureConnectionCreateStepBase.ts index 978b21516..39adaf717 100644 --- a/src/commands/addBinding/settingSteps/AzureConnectionCreateStepBase.ts +++ b/src/commands/addBinding/settingSteps/AzureConnectionCreateStepBase.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils'; import { Progress } from 'vscode'; -import { AzureWizardExecuteStep } from 'vscode-azureextensionui'; import { setLocalAppSetting } from '../../../funcConfig/local.settings'; import { localize } from '../../../localize'; import { IBindingSetting } from '../../../templates/IBindingTemplate'; diff --git a/src/commands/addBinding/settingSteps/BindingSettingStepBase.ts b/src/commands/addBinding/settingSteps/BindingSettingStepBase.ts index 0f8327386..5dc9f66f7 100644 --- a/src/commands/addBinding/settingSteps/BindingSettingStepBase.ts +++ b/src/commands/addBinding/settingSteps/BindingSettingStepBase.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep } from "vscode-azureextensionui"; +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { BindingSettingValue } from "../../../funcConfig/function"; import { IBindingSetting } from "../../../templates/IBindingTemplate"; import { getBindingSetting, setBindingSetting } from "../../createFunction/IFunctionWizardContext"; diff --git a/src/commands/addBinding/settingSteps/BooleanPromptStep.ts b/src/commands/addBinding/settingSteps/BooleanPromptStep.ts index d4a4fffb7..9754c3a16 100644 --- a/src/commands/addBinding/settingSteps/BooleanPromptStep.ts +++ b/src/commands/addBinding/settingSteps/BooleanPromptStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IAzureQuickPickItem } from "vscode-azureextensionui"; +import { IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { BindingSettingValue } from "../../../funcConfig/function"; import { envUtils } from "../../../utils/envUtils"; import { IBindingWizardContext } from "../IBindingWizardContext"; diff --git a/src/commands/addBinding/settingSteps/EnumPromptStep.ts b/src/commands/addBinding/settingSteps/EnumPromptStep.ts index 66df29918..44d0d3b87 100644 --- a/src/commands/addBinding/settingSteps/EnumPromptStep.ts +++ b/src/commands/addBinding/settingSteps/EnumPromptStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IAzureQuickPickItem } from "vscode-azureextensionui"; +import { IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { BindingSettingValue } from "../../../funcConfig/function"; import { IBindingWizardContext } from "../IBindingWizardContext"; import { BindingSettingStepBase } from "./BindingSettingStepBase"; diff --git a/src/commands/addBinding/settingSteps/LocalAppSettingCreateStep.ts b/src/commands/addBinding/settingSteps/LocalAppSettingCreateStep.ts index b74539914..48a997ac1 100644 --- a/src/commands/addBinding/settingSteps/LocalAppSettingCreateStep.ts +++ b/src/commands/addBinding/settingSteps/LocalAppSettingCreateStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils'; import { Progress } from 'vscode'; -import { AzureWizardExecuteStep } from 'vscode-azureextensionui'; import { localSettingsFileName } from '../../../constants'; import { setLocalAppSetting } from '../../../funcConfig/local.settings'; import { localize } from '../../../localize'; diff --git a/src/commands/addBinding/settingSteps/LocalAppSettingListStep.ts b/src/commands/addBinding/settingSteps/LocalAppSettingListStep.ts index c0208e732..d444ba827 100644 --- a/src/commands/addBinding/settingSteps/LocalAppSettingListStep.ts +++ b/src/commands/addBinding/settingSteps/LocalAppSettingListStep.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, ISubscriptionActionContext, IWizardOptions } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; -import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, ISubscriptionActionContext, IWizardOptions, StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication } from 'vscode-azureextensionui'; import { localSettingsFileName } from '../../../constants'; import { ext } from '../../../extensionVariables'; import { BindingSettingValue } from '../../../funcConfig/function'; diff --git a/src/commands/addBinding/settingSteps/LocalAppSettingValueStep.ts b/src/commands/addBinding/settingSteps/LocalAppSettingValueStep.ts index 2fdffa87c..c1056cb95 100644 --- a/src/commands/addBinding/settingSteps/LocalAppSettingValueStep.ts +++ b/src/commands/addBinding/settingSteps/LocalAppSettingValueStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../../localize'; import { IBindingWizardContext } from '../IBindingWizardContext'; diff --git a/src/commands/addBinding/settingSteps/StorageConnectionCreateStep.ts b/src/commands/addBinding/settingSteps/StorageConnectionCreateStep.ts index e5d3b2dda..5b578b013 100644 --- a/src/commands/addBinding/settingSteps/StorageConnectionCreateStep.ts +++ b/src/commands/addBinding/settingSteps/StorageConnectionCreateStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IStorageAccountWizardContext } from 'vscode-azureextensionui'; +import { IStorageAccountWizardContext } from '@microsoft/vscode-azext-azureutils'; import { getStorageConnectionString } from '../../../utils/azure'; import { IBindingWizardContext } from '../IBindingWizardContext'; import { AzureConnectionCreateStepBase, IConnection } from './AzureConnectionCreateStepBase'; diff --git a/src/commands/addBinding/settingSteps/addBindingSettingSteps.ts b/src/commands/addBinding/settingSteps/addBindingSettingSteps.ts index ddf3313ca..4e36bd277 100644 --- a/src/commands/addBinding/settingSteps/addBindingSettingSteps.ts +++ b/src/commands/addBinding/settingSteps/addBindingSettingSteps.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep } from "vscode-azureextensionui"; +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { IBindingSetting, ValueType } from "../../../templates/IBindingTemplate"; import { IBindingWizardContext } from "../IBindingWizardContext"; import { BindingNameStep } from "./BindingNameStep"; diff --git a/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBConnectionCreateStep.ts b/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBConnectionCreateStep.ts index ed2f07397..2059f8fbf 100644 --- a/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBConnectionCreateStep.ts +++ b/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBConnectionCreateStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { CosmosDBManagementClient, CosmosDBManagementModels } from '@azure/arm-cosmosdb'; +import { CosmosDBManagementClient, DatabaseAccountGetResults, DatabaseAccountListKeysResult } from '@azure/arm-cosmosdb'; import { getResourceGroupFromId } from '../../../../utils/azure'; import { createCosmosDBClient } from '../../../../utils/azureClients'; import { nonNullProp } from '../../../../utils/nonNull'; @@ -13,14 +13,14 @@ import { ICosmosDBWizardContext } from './ICosmosDBWizardContext'; export class CosmosDBConnectionCreateStep extends AzureConnectionCreateStepBase { public async getConnection(context: ICosmosDBWizardContext): Promise { - const databaseAccount: CosmosDBManagementModels.DatabaseAccountGetResults = nonNullProp(context, 'databaseAccount'); + const databaseAccount: DatabaseAccountGetResults = nonNullProp(context, 'databaseAccount'); const name: string = nonNullProp(databaseAccount, 'name'); const client: CosmosDBManagementClient = await createCosmosDBClient(context); const resourceGroup: string = getResourceGroupFromId(nonNullProp(databaseAccount, 'id')); // NOTE: We have to generate the connection string ourselves rather than calling client.databaseAccounts.listConnectionStrings // (The runtime currently only handles Cosmos DB connection strings _not_ mongo connection strings) - const keys: CosmosDBManagementModels.DatabaseAccountListKeysResult = await client.databaseAccounts.listKeys(resourceGroup, name); + const keys: DatabaseAccountListKeysResult = await client.databaseAccounts.listKeys(resourceGroup, name); return { name: name, connectionString: `AccountEndpoint=${nonNullProp(databaseAccount, 'documentEndpoint')};AccountKey=${nonNullProp(keys, 'primaryMasterKey')};` diff --git a/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBListStep.ts b/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBListStep.ts index 735e7349e..3c2c66817 100644 --- a/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBListStep.ts +++ b/src/commands/addBinding/settingSteps/cosmosDB/CosmosDBListStep.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { CosmosDBManagementClient } from '@azure/arm-cosmosdb'; -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../../../localize'; import { promptForResource } from '../../../../utils/azure'; import { createCosmosDBClient } from '../../../../utils/azureClients'; @@ -14,7 +15,8 @@ export class CosmosDBListStep extends AzureWizardPromptStep { const placeHolder: string = localize('placeHolder', 'Select a database account'); const client: CosmosDBManagementClient = await createCosmosDBClient(context); - context.databaseAccount = await promptForResource(context, placeHolder, client.databaseAccounts.list()); + context.databaseAccount = await promptForResource(context, placeHolder, + uiUtils.listAllIterator(client.databaseAccounts.list())); } public shouldPrompt(context: ICosmosDBWizardContext): boolean { diff --git a/src/commands/addBinding/settingSteps/cosmosDB/ICosmosDBWizardContext.ts b/src/commands/addBinding/settingSteps/cosmosDB/ICosmosDBWizardContext.ts index 102d489b5..c0af0389e 100644 --- a/src/commands/addBinding/settingSteps/cosmosDB/ICosmosDBWizardContext.ts +++ b/src/commands/addBinding/settingSteps/cosmosDB/ICosmosDBWizardContext.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { CosmosDBManagementModels } from '@azure/arm-cosmosdb'; -import { ISubscriptionActionContext } from 'vscode-azureextensionui'; +import { DatabaseAccountGetResults } from '@azure/arm-cosmosdb'; +import { ISubscriptionActionContext } from '@microsoft/vscode-azext-utils'; export interface ICosmosDBWizardContext extends ISubscriptionActionContext { - databaseAccount?: CosmosDBManagementModels.DatabaseAccountGetResults; + databaseAccount?: DatabaseAccountGetResults; } diff --git a/src/commands/addBinding/settingSteps/eventHub/EventHubAuthRuleListStep.ts b/src/commands/addBinding/settingSteps/eventHub/EventHubAuthRuleListStep.ts index 9ced7981e..bb069eb29 100644 --- a/src/commands/addBinding/settingSteps/eventHub/EventHubAuthRuleListStep.ts +++ b/src/commands/addBinding/settingSteps/eventHub/EventHubAuthRuleListStep.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { EventHubManagementClient, EventHubManagementModels } from '@azure/arm-eventhub'; -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { AuthorizationRule, EventHubManagementClient } from '@azure/arm-eventhub'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../../../localize'; import { IBaseResourceWithName, promptForResource } from '../../../../utils/azure'; import { createEventHubClient } from '../../../../utils/azureClients'; @@ -22,16 +23,16 @@ export class EventHubAuthRuleListStep extends AzureWizardPromptStep { - const namespaceRules: EventHubManagementModels.AuthorizationRule[] = await client.namespaces.listAuthorizationRules(resourceGroupName, namespaceName); + async function getEventHubAuthRules(): Promise { + const namespaceRules: AuthorizationRule[] = await uiUtils.listAllIterator(client.namespaces.listAuthorizationRules(resourceGroupName, namespaceName)); namespaceRules.forEach((r: IBaseResourceWithName) => r._description = namespaceDescription); - const hubRules: EventHubManagementModels.AuthorizationRule[] = await client.eventHubs.listAuthorizationRules(resourceGroupName, namespaceName, eventHubName); + const hubRules: AuthorizationRule[] = await uiUtils.listAllIterator(client.eventHubs.listAuthorizationRules(resourceGroupName, namespaceName, eventHubName)); hubRules.forEach((r: IBaseResourceWithName) => r._description = hubDescription); return hubRules.concat(namespaceRules); } const placeHolder: string = localize('placeHolder', 'Select an event hub policy'); - const result: (EventHubManagementModels.AuthorizationRule & IBaseResourceWithName) | undefined = await promptForResource(context, placeHolder, getEventHubAuthRules()); + const result: (AuthorizationRule & IBaseResourceWithName) | undefined = await promptForResource(context, placeHolder, getEventHubAuthRules()); if (result) { context.authRuleName = nonNullProp(result, 'name'); context.isNamespaceAuthRule = result._description === namespaceDescription; diff --git a/src/commands/addBinding/settingSteps/eventHub/EventHubConnectionCreateStep.ts b/src/commands/addBinding/settingSteps/eventHub/EventHubConnectionCreateStep.ts index 0bbd2a653..5b72be0b1 100644 --- a/src/commands/addBinding/settingSteps/eventHub/EventHubConnectionCreateStep.ts +++ b/src/commands/addBinding/settingSteps/eventHub/EventHubConnectionCreateStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { EventHubManagementClient, EventHubManagementModels } from '@azure/arm-eventhub'; +import { AccessKeys, EventHubManagementClient } from '@azure/arm-eventhub'; import { createEventHubClient } from '../../../../utils/azureClients'; import { nonNullProp } from '../../../../utils/nonNull'; import { IBindingWizardContext } from '../../IBindingWizardContext'; @@ -20,10 +20,10 @@ export class EventHubConnectionCreateStep extends AzureConnectionCreateStepBase< const client: EventHubManagementClient = await createEventHubClient(context); let connectionString: string; if (context.isNamespaceAuthRule) { - const keys: EventHubManagementModels.AccessKeys = await client.namespaces.listKeys(resourceGroupName, namespaceName, authRuleName); + const keys: AccessKeys = await client.namespaces.listKeys(resourceGroupName, namespaceName, authRuleName); connectionString = `${nonNullProp(keys, 'primaryConnectionString')};EntityPath=${eventHubName}`; } else { - const keys: EventHubManagementModels.AccessKeys = await client.eventHubs.listKeys(resourceGroupName, namespaceName, eventHubName, authRuleName); + const keys: AccessKeys = await client.eventHubs.listKeys(resourceGroupName, namespaceName, eventHubName, authRuleName); connectionString = nonNullProp(keys, 'primaryConnectionString'); } diff --git a/src/commands/addBinding/settingSteps/eventHub/EventHubListStep.ts b/src/commands/addBinding/settingSteps/eventHub/EventHubListStep.ts index 86104c4b6..67a8f108e 100644 --- a/src/commands/addBinding/settingSteps/eventHub/EventHubListStep.ts +++ b/src/commands/addBinding/settingSteps/eventHub/EventHubListStep.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { EventHubManagementClient, EventHubManagementModels } from '@azure/arm-eventhub'; -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { EHNamespace, EventHubManagementClient } from '@azure/arm-eventhub'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../../../localize'; import { promptForResource } from '../../../../utils/azure'; import { createEventHubClient } from '../../../../utils/azureClients'; @@ -18,7 +19,8 @@ export class EventHubListStep extends AzureWizardPromptStep { const placeHolder: string = localize('placeHolder', 'Select an event hub namespace'); const client: EventHubManagementClient = await createEventHubClient(context); - const result: EventHubManagementModels.EHNamespace | undefined = await promptForResource(context, placeHolder, client.namespaces.list()); + const result: EHNamespace | undefined = await promptForResource(context, placeHolder, + uiUtils.listAllIterator(client.namespaces.list())); if (result) { context.namespaceName = nonNullProp(result, 'name'); context.resourceGroupName = getResourceGroupFromId(nonNullProp(result, 'id')); diff --git a/src/commands/addBinding/settingSteps/eventHub/IEventHubWizardContext.ts b/src/commands/addBinding/settingSteps/eventHub/IEventHubWizardContext.ts index 96444216a..5926d349e 100644 --- a/src/commands/addBinding/settingSteps/eventHub/IEventHubWizardContext.ts +++ b/src/commands/addBinding/settingSteps/eventHub/IEventHubWizardContext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ISubscriptionActionContext } from 'vscode-azureextensionui'; +import { ISubscriptionActionContext } from '@microsoft/vscode-azext-utils'; export interface IEventHubWizardContext extends ISubscriptionActionContext { namespaceName?: string; diff --git a/src/commands/addBinding/settingSteps/serviceBus/IServiceBusWizardContext.ts b/src/commands/addBinding/settingSteps/serviceBus/IServiceBusWizardContext.ts index 762242dcf..00bd76793 100644 --- a/src/commands/addBinding/settingSteps/serviceBus/IServiceBusWizardContext.ts +++ b/src/commands/addBinding/settingSteps/serviceBus/IServiceBusWizardContext.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ServiceBusManagementModels } from '@azure/arm-servicebus'; -import { ISubscriptionActionContext } from 'vscode-azureextensionui'; +import { SBNamespace } from '@azure/arm-servicebus'; +import { ISubscriptionActionContext } from '@microsoft/vscode-azext-utils'; export interface IServiceBusWizardContext extends ISubscriptionActionContext { - sbNamespace?: ServiceBusManagementModels.SBNamespace; + sbNamespace?: SBNamespace; } diff --git a/src/commands/addBinding/settingSteps/serviceBus/ServiceBusConnectionCreateStep.ts b/src/commands/addBinding/settingSteps/serviceBus/ServiceBusConnectionCreateStep.ts index 66504e77f..b80324fc3 100644 --- a/src/commands/addBinding/settingSteps/serviceBus/ServiceBusConnectionCreateStep.ts +++ b/src/commands/addBinding/settingSteps/serviceBus/ServiceBusConnectionCreateStep.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ServiceBusManagementClient, ServiceBusManagementModels } from '@azure/arm-servicebus'; +import { AccessKeys, SBAuthorizationRule, SBNamespace, ServiceBusManagementClient } from '@azure/arm-servicebus'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; import { localize } from '../../../../localize'; import { getResourceGroupFromId } from '../../../../utils/azure'; import { createServiceBusClient } from '../../../../utils/azureClients'; @@ -14,18 +15,18 @@ import { IServiceBusWizardContext } from './IServiceBusWizardContext'; export class ServiceBusConnectionCreateStep extends AzureConnectionCreateStepBase { public async getConnection(context: IServiceBusWizardContext): Promise { - const sbNamespace: ServiceBusManagementModels.SBNamespace = nonNullProp(context, 'sbNamespace'); + const sbNamespace: SBNamespace = nonNullProp(context, 'sbNamespace'); const id: string = nonNullProp(sbNamespace, 'id'); const name: string = nonNullProp(sbNamespace, 'name'); const resourceGroup: string = getResourceGroupFromId(id); const client: ServiceBusManagementClient = await createServiceBusClient(context); - const authRules: ServiceBusManagementModels.SBAuthorizationRule[] = await client.namespaces.listAuthorizationRules(resourceGroup, name); - const authRule: ServiceBusManagementModels.SBAuthorizationRule | undefined = authRules.find(ar => ar.rights.some(r => r.toLowerCase() === 'listen')); + const authRules: SBAuthorizationRule[] = await uiUtils.listAllIterator(client.namespaces.listAuthorizationRules(resourceGroup, name)); + const authRule: SBAuthorizationRule | undefined = authRules.find(ar => ar.rights && ar.rights.some(r => r.toLowerCase() === 'listen')); if (!authRule) { throw new Error(localize('noAuthRule', 'Failed to get connection string for service bus namespace "{0}".', name)); } - const keys: ServiceBusManagementModels.AccessKeys = await client.namespaces.listKeys(resourceGroup, name, nonNullProp(authRule, 'name')); + const keys: AccessKeys = await client.namespaces.listKeys(resourceGroup, name, nonNullProp(authRule, 'name')); return { name: name, connectionString: nonNullProp(keys, 'primaryConnectionString') diff --git a/src/commands/addBinding/settingSteps/serviceBus/ServiceBusListStep.ts b/src/commands/addBinding/settingSteps/serviceBus/ServiceBusListStep.ts index e4c45b4a8..927c4b1e8 100644 --- a/src/commands/addBinding/settingSteps/serviceBus/ServiceBusListStep.ts +++ b/src/commands/addBinding/settingSteps/serviceBus/ServiceBusListStep.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { ServiceBusManagementClient } from '@azure/arm-servicebus'; -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../../../localize'; import { promptForResource } from '../../../../utils/azure'; import { createServiceBusClient } from '../../../../utils/azureClients'; @@ -14,7 +15,8 @@ export class ServiceBusListStep extends AzureWizardPromptStep { const placeHolder: string = localize('placeHolder', 'Select a service bus namespace'); const client: ServiceBusManagementClient = await createServiceBusClient(context); - context.sbNamespace = await promptForResource(context, placeHolder, client.namespaces.list()); + context.sbNamespace = await promptForResource(context, placeHolder, + uiUtils.listAllIterator(client.namespaces.list())); } public shouldPrompt(context: IServiceBusWizardContext): boolean { diff --git a/src/commands/api/createFunctionFromApi.ts b/src/commands/api/createFunctionFromApi.ts index 143fee0e0..8071781b8 100644 --- a/src/commands/api/createFunctionFromApi.ts +++ b/src/commands/api/createFunctionFromApi.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { callWithTelemetryAndErrorHandling, IActionContext } from "vscode-azureextensionui"; +import { callWithTelemetryAndErrorHandling, IActionContext } from "@microsoft/vscode-azext-utils"; import * as api from '../../vscode-azurefunctions.api'; import { createFunctionInternal } from "../createFunction/createFunction"; diff --git a/src/commands/api/downloadAppSettingsFromApi.ts b/src/commands/api/downloadAppSettingsFromApi.ts index e73fe6e39..eeb0f9bfa 100644 --- a/src/commands/api/downloadAppSettingsFromApi.ts +++ b/src/commands/api/downloadAppSettingsFromApi.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { callWithTelemetryAndErrorHandling, IActionContext } from "vscode-azureextensionui"; +import { callWithTelemetryAndErrorHandling, IActionContext } from "@microsoft/vscode-azext-utils"; import { IAppSettingsClient } from "../../vscode-azurefunctions.api"; import { downloadAppSettingsInternal } from "../appSettings/downloadAppSettings"; diff --git a/src/commands/api/revealTreeItem.ts b/src/commands/api/revealTreeItem.ts index 0787e09d9..e281848ba 100644 --- a/src/commands/api/revealTreeItem.ts +++ b/src/commands/api/revealTreeItem.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from "vscode-azureextensionui"; +import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; export async function revealTreeItem(resourceId: string): Promise { diff --git a/src/commands/api/uploadAppSettingsFromApi.ts b/src/commands/api/uploadAppSettingsFromApi.ts index b944218d6..a4b4aa46d 100644 --- a/src/commands/api/uploadAppSettingsFromApi.ts +++ b/src/commands/api/uploadAppSettingsFromApi.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { callWithTelemetryAndErrorHandling, IActionContext } from "vscode-azureextensionui"; +import { callWithTelemetryAndErrorHandling, IActionContext } from "@microsoft/vscode-azext-utils"; import { IAppSettingsClient } from "../../vscode-azurefunctions.api"; import { uploadAppSettingsInternal } from "../appSettings/uploadAppSettings"; diff --git a/src/commands/appSettings/AzureWebJobsStorageExecuteStep.ts b/src/commands/appSettings/AzureWebJobsStorageExecuteStep.ts index 89176a1f1..cf7f59e9b 100644 --- a/src/commands/appSettings/AzureWebJobsStorageExecuteStep.ts +++ b/src/commands/appSettings/AzureWebJobsStorageExecuteStep.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardExecuteStep, IStorageAccountWizardContext } from 'vscode-azureextensionui'; +import { IStorageAccountWizardContext } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils'; import { localEmulatorConnectionString } from '../../constants'; import { azureWebJobsStorageKey, MismatchBehavior, setLocalAppSetting } from '../../funcConfig/local.settings'; import { getStorageConnectionString } from '../../utils/azure'; diff --git a/src/commands/appSettings/AzureWebJobsStoragePromptStep.ts b/src/commands/appSettings/AzureWebJobsStoragePromptStep.ts index f745c5010..8a6d8acf7 100644 --- a/src/commands/appSettings/AzureWebJobsStoragePromptStep.ts +++ b/src/commands/appSettings/AzureWebJobsStoragePromptStep.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardPromptStep, ISubscriptionActionContext, IWizardOptions } from '@microsoft/vscode-azext-utils'; import { MessageItem } from 'vscode'; -import { AzureWizardPromptStep, ISubscriptionActionContext, IWizardOptions, StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { IAzureWebJobsStorageWizardContext } from './IAzureWebJobsStorageWizardContext'; diff --git a/src/commands/appSettings/IAzureWebJobsStorageWizardContext.ts b/src/commands/appSettings/IAzureWebJobsStorageWizardContext.ts index a16a69163..aaeab9803 100644 --- a/src/commands/appSettings/IAzureWebJobsStorageWizardContext.ts +++ b/src/commands/appSettings/IAzureWebJobsStorageWizardContext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext, ISubscriptionContext } from "vscode-azureextensionui"; +import { IActionContext, ISubscriptionContext } from "@microsoft/vscode-azext-utils"; export interface IAzureWebJobsStorageWizardContext extends IActionContext, Partial { projectPath: string; diff --git a/src/commands/appSettings/decryptLocalSettings.ts b/src/commands/appSettings/decryptLocalSettings.ts index 29637fbce..228f38771 100644 --- a/src/commands/appSettings/decryptLocalSettings.ts +++ b/src/commands/appSettings/decryptLocalSettings.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { Uri } from "vscode"; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from "../../extensionVariables"; import { localize } from '../../localize'; import { cpUtils } from "../../utils/cpUtils"; diff --git a/src/commands/appSettings/downloadAppSettings.ts b/src/commands/appSettings/downloadAppSettings.ts index 4c08a2bb3..432d3d170 100644 --- a/src/commands/appSettings/downloadAppSettings.ts +++ b/src/commands/appSettings/downloadAppSettings.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from "@azure/arm-appservice"; +import { StringDictionary } from "@azure/arm-appservice"; +import { AppSettingsTreeItem, confirmOverwriteSettings, IAppSettingsClient } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as vscode from 'vscode'; -import { AppSettingsTreeItem, confirmOverwriteSettings, IAppSettingsClient } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; import { localSettingsFileName, viewOutput } from "../../constants"; import { ext } from "../../extensionVariables"; import { getLocalSettingsJson, ILocalSettingsJson } from "../../funcConfig/local.settings"; @@ -46,7 +46,7 @@ export async function downloadAppSettingsInternal(context: IActionContext, clien localSettings.Values = {}; } - const remoteSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const remoteSettings: StringDictionary = await client.listApplicationSettings(); ext.outputChannel.appendLog(localize('downloadingSettings', 'Downloading settings...'), { resourceName: client.fullName }); if (remoteSettings.properties) { diff --git a/src/commands/appSettings/encryptLocalSettings.ts b/src/commands/appSettings/encryptLocalSettings.ts index 08d76e558..039b71e3b 100644 --- a/src/commands/appSettings/encryptLocalSettings.ts +++ b/src/commands/appSettings/encryptLocalSettings.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { Uri } from "vscode"; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from "../../extensionVariables"; import { localize } from '../../localize'; import { cpUtils } from "../../utils/cpUtils"; diff --git a/src/commands/appSettings/getLocalSettingsFile.ts b/src/commands/appSettings/getLocalSettingsFile.ts index 780623495..2488ab934 100644 --- a/src/commands/appSettings/getLocalSettingsFile.ts +++ b/src/commands/appSettings/getLocalSettingsFile.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { workspace, WorkspaceFolder } from "vscode"; -import { IActionContext } from 'vscode-azureextensionui'; import { localSettingsFileName } from "../../constants"; import { selectWorkspaceFile } from "../../utils/workspace"; import { tryGetFunctionProjectRoot } from "../createNewProject/verifyIsProject"; diff --git a/src/commands/appSettings/setAzureWebJobsStorage.ts b/src/commands/appSettings/setAzureWebJobsStorage.ts index 58e219118..5a1cc7f1e 100644 --- a/src/commands/appSettings/setAzureWebJobsStorage.ts +++ b/src/commands/appSettings/setAzureWebJobsStorage.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; -import { AzureWizard, IActionContext } from 'vscode-azureextensionui'; import { localize } from '../../localize'; import { AzureWebJobsStorageExecuteStep } from './AzureWebJobsStorageExecuteStep'; import { AzureWebJobsStoragePromptStep } from './AzureWebJobsStoragePromptStep'; diff --git a/src/commands/appSettings/toggleSlotSetting.ts b/src/commands/appSettings/toggleSlotSetting.ts index c609ee467..5d51171da 100644 --- a/src/commands/appSettings/toggleSlotSetting.ts +++ b/src/commands/appSettings/toggleSlotSetting.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AppSettingTreeItem } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; +import { AppSettingTreeItem } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; export async function toggleSlotSetting(context: IActionContext, node?: AppSettingTreeItem): Promise { diff --git a/src/commands/appSettings/uploadAppSettings.ts b/src/commands/appSettings/uploadAppSettings.ts index 9ad2dd007..133bc0f13 100644 --- a/src/commands/appSettings/uploadAppSettings.ts +++ b/src/commands/appSettings/uploadAppSettings.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from "@azure/arm-appservice"; +import { StringDictionary } from "@azure/arm-appservice"; +import { AppSettingsTreeItem, confirmOverwriteSettings, IAppSettingsClient } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as vscode from 'vscode'; -import { AppSettingsTreeItem, confirmOverwriteSettings, IAppSettingsClient } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; import { localSettingsFileName, viewOutput } from "../../constants"; import { ext } from "../../extensionVariables"; import { ILocalSettingsJson } from "../../funcConfig/local.settings"; @@ -45,7 +45,7 @@ export async function uploadAppSettingsInternal(context: IActionContext, client: } if (localSettings.Values) { - const remoteSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const remoteSettings: StringDictionary = await client.listApplicationSettings(); if (!remoteSettings.properties) { remoteSettings.properties = {}; } diff --git a/src/commands/browseWebsite.ts b/src/commands/browseWebsite.ts index 1e195ee77..4a9d3a407 100644 --- a/src/commands/browseWebsite.ts +++ b/src/commands/browseWebsite.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; import { SlotTreeItemBase } from '../tree/SlotTreeItemBase'; diff --git a/src/commands/configureDeploymentSource.ts b/src/commands/configureDeploymentSource.ts index 903fffe7b..5f1fd04ea 100644 --- a/src/commands/configureDeploymentSource.ts +++ b/src/commands/configureDeploymentSource.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { editScmType } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { editScmType } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; import { SlotTreeItemBase } from '../tree/SlotTreeItemBase'; diff --git a/src/commands/copyFunctionUrl.ts b/src/commands/copyFunctionUrl.ts index b7572279b..f5e265317 100644 --- a/src/commands/copyFunctionUrl.ts +++ b/src/commands/copyFunctionUrl.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { FunctionTreeItemBase } from '../tree/FunctionTreeItemBase'; diff --git a/src/commands/createChildNode.ts b/src/commands/createChildNode.ts index 03515387d..035834a61 100644 --- a/src/commands/createChildNode.ts +++ b/src/commands/createChildNode.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtParentTreeItem, IActionContext } from 'vscode-azureextensionui'; +import { AzExtParentTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; export async function createChildNode(context: IActionContext, expectedContextValue: string | RegExp, node?: AzExtParentTreeItem): Promise { diff --git a/src/commands/createFunction/FunctionCreateStepBase.ts b/src/commands/createFunction/FunctionCreateStepBase.ts index 2a3089dda..787f41487 100644 --- a/src/commands/createFunction/FunctionCreateStepBase.ts +++ b/src/commands/createFunction/FunctionCreateStepBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import { Progress, Uri, window, workspace } from 'vscode'; -import { AzureWizardExecuteStep, callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { IFunctionTemplate } from '../../templates/IFunctionTemplate'; diff --git a/src/commands/createFunction/FunctionListStep.ts b/src/commands/createFunction/FunctionListStep.ts index d721ea8cb..78c2a5839 100644 --- a/src/commands/createFunction/FunctionListStep.ts +++ b/src/commands/createFunction/FunctionListStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions, IWizardOptions } from '@microsoft/vscode-azext-utils'; import * as escape from 'escape-string-regexp'; -import { AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions, IWizardOptions } from 'vscode-azureextensionui'; import { JavaBuildTool, ProjectLanguage, TemplateFilter, templateFilterSetting } from '../../constants'; import { canValidateAzureWebJobStorageOnDebug } from '../../debug/validatePreDebug'; import { ext } from '../../extensionVariables'; diff --git a/src/commands/createFunction/FunctionNameStepBase.ts b/src/commands/createFunction/FunctionNameStepBase.ts index b95d8b15b..63b664a74 100644 --- a/src/commands/createFunction/FunctionNameStepBase.ts +++ b/src/commands/createFunction/FunctionNameStepBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; import { localize } from '../../localize'; import { IFunctionTemplate } from '../../templates/IFunctionTemplate'; import { nonNullProp } from '../../utils/nonNull'; diff --git a/src/commands/createFunction/IFunctionWizardContext.ts b/src/commands/createFunction/IFunctionWizardContext.ts index e4e9fa652..d9da66e6b 100644 --- a/src/commands/createFunction/IFunctionWizardContext.ts +++ b/src/commands/createFunction/IFunctionWizardContext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ISubscriptionContext } from "vscode-azureextensionui"; +import { ISubscriptionContext } from "@microsoft/vscode-azext-utils"; import { BindingSettingValue } from "../../funcConfig/function"; import { IBindingSetting } from "../../templates/IBindingTemplate"; import { IFunctionTemplate } from "../../templates/IFunctionTemplate"; diff --git a/src/commands/createFunction/createFunction.ts b/src/commands/createFunction/createFunction.ts index 2f2e57f53..3fd567416 100644 --- a/src/commands/createFunction/createFunction.ts +++ b/src/commands/createFunction/createFunction.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, IActionContext, UserCancelledError } from '@microsoft/vscode-azext-utils'; import { commands, MessageItem, Uri, window, workspace, WorkspaceFolder } from 'vscode'; -import { AzureWizard, IActionContext, UserCancelledError } from 'vscode-azureextensionui'; import { ProjectLanguage, projectTemplateKeySetting } from '../../constants'; import { NoWorkspaceError } from '../../errors'; import { addLocalFuncTelemetry } from '../../funcCoreTools/getLocalFuncCoreToolsVersion'; diff --git a/src/commands/createFunction/dotnetSteps/DotnetFunctionCreateStep.ts b/src/commands/createFunction/dotnetSteps/DotnetFunctionCreateStep.ts index ed48db797..3801a8724 100644 --- a/src/commands/createFunction/dotnetSteps/DotnetFunctionCreateStep.ts +++ b/src/commands/createFunction/dotnetSteps/DotnetFunctionCreateStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../../extensionVariables'; import { FuncVersion } from '../../../FuncVersion'; import { executeDotnetTemplateCommand, validateDotnetInstalled } from '../../../templates/dotnet/executeDotnetTemplateCommand'; diff --git a/src/commands/createFunction/dotnetSteps/DotnetNamespaceStep.ts b/src/commands/createFunction/dotnetSteps/DotnetNamespaceStep.ts index b64ea74f5..3ade4937a 100644 --- a/src/commands/createFunction/dotnetSteps/DotnetNamespaceStep.ts +++ b/src/commands/createFunction/dotnetSteps/DotnetNamespaceStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import * as XRegExp from 'xregexp'; import { localize } from "../../../localize"; import { IDotnetFunctionWizardContext } from './IDotnetFunctionWizardContext'; diff --git a/src/commands/createFunction/openAPISteps/OpenAPICreateStep.ts b/src/commands/createFunction/openAPISteps/OpenAPICreateStep.ts index e46a86911..be2008848 100644 --- a/src/commands/createFunction/openAPISteps/OpenAPICreateStep.ts +++ b/src/commands/createFunction/openAPISteps/OpenAPICreateStep.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { ProgressLocation, Uri, window } from "vscode"; -import { AzureWizardExecuteStep, DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { ProjectLanguage } from "../../../constants"; import { ext } from "../../../extensionVariables"; import { localize } from "../../../localize"; diff --git a/src/commands/createFunction/openAPISteps/OpenAPIGetSpecificationFileStep.ts b/src/commands/createFunction/openAPISteps/OpenAPIGetSpecificationFileStep.ts index ca146756f..6d873615c 100644 --- a/src/commands/createFunction/openAPISteps/OpenAPIGetSpecificationFileStep.ts +++ b/src/commands/createFunction/openAPISteps/OpenAPIGetSpecificationFileStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { OpenDialogOptions, Uri, workspace } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { IFunctionWizardContext } from "../IFunctionWizardContext"; export class OpenAPIGetSpecificationFileStep extends AzureWizardPromptStep { diff --git a/src/commands/createFunctionApp/FunctionAppCreateStep.ts b/src/commands/createFunctionApp/FunctionAppCreateStep.ts index 69afc0a15..fe45ce35a 100644 --- a/src/commands/createFunctionApp/FunctionAppCreateStep.ts +++ b/src/commands/createFunctionApp/FunctionAppCreateStep.ts @@ -3,10 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementClient, WebSiteManagementMappers, WebSiteManagementModels as SiteModels, WebSiteManagementModels } from '@azure/arm-appservice'; +import { NameValuePair, Site, SiteConfig, WebSiteManagementClient } from '@azure/arm-appservice'; +import { CustomLocation, IAppServiceWizardContext, ParsedSite, WebsiteOS } from '@microsoft/vscode-azext-azureappservice'; +import { LocationListStep } from '@microsoft/vscode-azext-azureutils'; +import { AzureWizardExecuteStep, parseError } from '@microsoft/vscode-azext-utils'; import { Progress } from 'vscode'; -import { CustomLocation, IAppServiceWizardContext, ParsedSite, WebsiteOS } from 'vscode-azureappservice'; -import { AzureWizardExecuteStep, LocationListStep, parseError } from 'vscode-azureextensionui'; import { contentConnectionStringKey, contentShareKey, extensionVersionKey, ProjectLanguage, runFromPackageKey, webProvider } from '../../constants'; import { ext } from '../../extensionVariables'; import { azureWebJobsStorageKey } from '../../funcConfig/local.settings'; @@ -42,7 +43,7 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStep { + private async getNewSite(context: IFunctionAppWizardContext, stack: FullFunctionAppStack): Promise { const location = await LocationListStep.getLocation(context, webProvider); - const site: WebSiteManagementModels.Site = { + const site: Site = { name: context.newSiteName, kind: getSiteKind(context), location: nonNullProp(location, 'name'), @@ -80,49 +81,22 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStepsite).extendedLocation = { name: customLocation.id, type: 'customLocation' }; + site.extendedLocation = { name: customLocation.id, type: 'customLocation' }; } - private async getNewSiteConfig(context: IFunctionAppWizardContext, stack: FullFunctionAppStack): Promise { + private async getNewSiteConfig(context: IFunctionAppWizardContext, stack: FullFunctionAppStack): Promise { const stackSettings: FunctionAppRuntimeSettings = nonNullProp(stack.minorVersion.stackSettings, context.newSiteOS === WebsiteOS.linux ? 'linuxRuntimeSettings' : 'windowsRuntimeSettings'); // /~https://github.com/microsoft/vscode-azurefunctions/issues/2990 if (context.newSiteOS === 'windows' && context.version === FuncVersion.v4) { stackSettings.siteConfigPropertiesDictionary.netFrameworkVersion = 'v6.0' } - const newSiteConfig: SiteModels.SiteConfig = stackSettings.siteConfigPropertiesDictionary; + const newSiteConfig: SiteConfig = stackSettings.siteConfigPropertiesDictionary; const storageConnectionString: string = (await getStorageConnectionString(context)).connectionString; - const appSettings: SiteModels.NameValuePair[] = [ + const appSettings: NameValuePair[] = [ { name: azureWebJobsStorageKey, value: storageConnectionString diff --git a/src/commands/createFunctionApp/FunctionAppHostingPlanStep.ts b/src/commands/createFunctionApp/FunctionAppHostingPlanStep.ts index 87f946829..ff154e5ed 100644 --- a/src/commands/createFunctionApp/FunctionAppHostingPlanStep.ts +++ b/src/commands/createFunctionApp/FunctionAppHostingPlanStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AppServicePlanListStep, IAppServiceWizardContext, setLocationsTask } from 'vscode-azureappservice'; -import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from 'vscode-azureextensionui'; +import { AppServicePlanListStep, IAppServiceWizardContext, setLocationsTask } from '@microsoft/vscode-azext-azureappservice'; +import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from '@microsoft/vscode-azext-utils'; import { localize } from '../../localize'; import { getRandomHexString } from '../../utils/fs'; import { nonNullProp } from '../../utils/nonNull'; diff --git a/src/commands/createFunctionApp/IFunctionAppWizardContext.ts b/src/commands/createFunctionApp/IFunctionAppWizardContext.ts index 228f292a4..31a473257 100644 --- a/src/commands/createFunctionApp/IFunctionAppWizardContext.ts +++ b/src/commands/createFunctionApp/IFunctionAppWizardContext.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IAppServiceWizardContext } from 'vscode-azureappservice'; -import { ICreateChildImplContext } from 'vscode-azureextensionui'; +import { IAppServiceWizardContext } from '@microsoft/vscode-azext-azureappservice'; +import { ICreateChildImplContext } from '@microsoft/vscode-azext-utils'; import { FuncVersion } from '../../FuncVersion'; import { AppStackMajorVersion, AppStackMinorVersion } from './stacks/models/AppStackModel'; import { FunctionAppRuntimes, FunctionAppStack } from './stacks/models/FunctionAppStackModel'; diff --git a/src/commands/createFunctionApp/createFunctionApp.ts b/src/commands/createFunctionApp/createFunctionApp.ts index 36538b904..d0f49dcdc 100644 --- a/src/commands/createFunctionApp/createFunctionApp.ts +++ b/src/commands/createFunctionApp/createFunctionApp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtParentTreeItem, IActionContext } from 'vscode-azureextensionui'; +import { AzExtParentTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { ProductionSlotTreeItem } from '../../tree/ProductionSlotTreeItem'; diff --git a/src/commands/createFunctionApp/showSiteCreated.ts b/src/commands/createFunctionApp/showSiteCreated.ts index 9c7c4fe57..c7834279d 100644 --- a/src/commands/createFunctionApp/showSiteCreated.ts +++ b/src/commands/createFunctionApp/showSiteCreated.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { window } from 'vscode'; -import { ParsedSite } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; import { viewOutput } from '../../constants'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; diff --git a/src/commands/createFunctionApp/stacks/FunctionAppStackStep.ts b/src/commands/createFunctionApp/stacks/FunctionAppStackStep.ts index 8af6d6825..295a96fc0 100644 --- a/src/commands/createFunctionApp/stacks/FunctionAppStackStep.ts +++ b/src/commands/createFunctionApp/stacks/FunctionAppStackStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { setLocationsTask, SiteOSStep, WebsiteOS } from 'vscode-azureappservice'; -import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from 'vscode-azureextensionui'; +import { setLocationsTask, SiteOSStep, WebsiteOS } from '@microsoft/vscode-azext-azureappservice'; +import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from '@microsoft/vscode-azext-utils'; import { getMajorVersion, promptForFuncVersion } from '../../../FuncVersion'; import { localize } from '../../../localize'; import { FullFunctionAppStack, IFunctionAppWizardContext } from '../IFunctionAppWizardContext'; diff --git a/src/commands/createFunctionApp/stacks/getStackPicks.ts b/src/commands/createFunctionApp/stacks/getStackPicks.ts index 520ebfb86..42255fffe 100644 --- a/src/commands/createFunctionApp/stacks/getStackPicks.ts +++ b/src/commands/createFunctionApp/stacks/getStackPicks.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse, ServiceClient } from '@azure/ms-rest-js'; -import { createGenericClient, IAzureQuickPickItem, parseError } from 'vscode-azureextensionui'; +import { createGenericClient } from '@microsoft/vscode-azext-azureutils'; +import { IAzureQuickPickItem, parseError } from '@microsoft/vscode-azext-utils'; import { hiddenStacksSetting } from '../../../constants'; import { FuncVersion } from '../../../FuncVersion'; import { localize } from '../../../localize'; diff --git a/src/commands/createNewProject/FolderListStep.ts b/src/commands/createNewProject/FolderListStep.ts index eb6a9b559..d0664468a 100644 --- a/src/commands/createNewProject/FolderListStep.ts +++ b/src/commands/createNewProject/FolderListStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils'; import { localize } from '../../localize'; import { getContainingWorkspace, selectWorkspaceFolder } from '../../utils/workspace'; import { IProjectWizardContext } from './IProjectWizardContext'; diff --git a/src/commands/createNewProject/IProjectWizardContext.ts b/src/commands/createNewProject/IProjectWizardContext.ts index c72b798dc..2f63bd4af 100644 --- a/src/commands/createNewProject/IProjectWizardContext.ts +++ b/src/commands/createNewProject/IProjectWizardContext.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { Uri, WorkspaceFolder } from "vscode"; -import { IActionContext } from "vscode-azureextensionui"; import { ProjectLanguage } from "../../constants"; import { FuncVersion } from "../../FuncVersion"; import { cliFeedUtils } from "../../utils/cliFeedUtils"; diff --git a/src/commands/createNewProject/NewProjectLanguageStep.ts b/src/commands/createNewProject/NewProjectLanguageStep.ts index 675606cd4..77c0b1950 100644 --- a/src/commands/createNewProject/NewProjectLanguageStep.ts +++ b/src/commands/createNewProject/NewProjectLanguageStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions, UserCancelledError } from '@microsoft/vscode-azext-utils'; import { QuickPickOptions } from 'vscode'; -import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions, UserCancelledError } from 'vscode-azureextensionui'; import { ProjectLanguage } from '../../constants'; import { localize } from '../../localize'; import { nonNullProp } from '../../utils/nonNull'; diff --git a/src/commands/createNewProject/OpenBehaviorStep.ts b/src/commands/createNewProject/OpenBehaviorStep.ts index 106ddc238..26f944ad3 100644 --- a/src/commands/createNewProject/OpenBehaviorStep.ts +++ b/src/commands/createNewProject/OpenBehaviorStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from 'vscode-azureextensionui'; +import { AzureWizardPromptStep, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import { localize } from '../../localize'; import { IProjectWizardContext, OpenBehavior } from './IProjectWizardContext'; diff --git a/src/commands/createNewProject/OpenFolderStep.ts b/src/commands/createNewProject/OpenFolderStep.ts index bd8eb064b..6163612bf 100644 --- a/src/commands/createNewProject/OpenFolderStep.ts +++ b/src/commands/createNewProject/OpenFolderStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils'; import { commands, Uri, workspace, WorkspaceFolder } from 'vscode'; -import { AzureWizardExecuteStep } from 'vscode-azureextensionui'; import { IProjectWizardContext } from './IProjectWizardContext'; export class OpenFolderStep extends AzureWizardExecuteStep { diff --git a/src/commands/createNewProject/ProjectCreateStep/CustomProjectCreateStep.ts b/src/commands/createNewProject/ProjectCreateStep/CustomProjectCreateStep.ts index edd99de2f..40bb54a54 100644 --- a/src/commands/createNewProject/ProjectCreateStep/CustomProjectCreateStep.ts +++ b/src/commands/createNewProject/ProjectCreateStep/CustomProjectCreateStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { IHostJsonV2 } from '../../../funcConfig/host'; import { ScriptProjectCreateStep } from './ScriptProjectCreateStep'; diff --git a/src/commands/createNewProject/ProjectCreateStep/DotnetProjectCreateStep.ts b/src/commands/createNewProject/ProjectCreateStep/DotnetProjectCreateStep.ts index c3a93073b..fa4735294 100644 --- a/src/commands/createNewProject/ProjectCreateStep/DotnetProjectCreateStep.ts +++ b/src/commands/createNewProject/ProjectCreateStep/DotnetProjectCreateStep.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { gitignoreFileName, hostFileName, localSettingsFileName, ProjectLanguage } from '../../../constants'; import { azureWebJobsStorageKey, MismatchBehavior, setLocalAppSetting } from '../../../funcConfig/local.settings'; import { FuncVersion, getMajorVersion } from '../../../FuncVersion'; diff --git a/src/commands/createNewProject/ProjectCreateStep/GradleProjectCreateSteps.ts b/src/commands/createNewProject/ProjectCreateStep/GradleProjectCreateSteps.ts index b147a729f..fbbf12170 100644 --- a/src/commands/createNewProject/ProjectCreateStep/GradleProjectCreateSteps.ts +++ b/src/commands/createNewProject/ProjectCreateStep/GradleProjectCreateSteps.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as path from 'path'; import { Progress } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { buildGradleFileName, JavaBuildTool, settingsGradleFileName } from '../../../constants'; import { localize } from '../../../localize'; import { confirmOverwriteFile } from '../../../utils/fs'; diff --git a/src/commands/createNewProject/ProjectCreateStep/MavenProjectCreateSteps.ts b/src/commands/createNewProject/ProjectCreateStep/MavenProjectCreateSteps.ts index 9cf68d376..c42b7ceff 100644 --- a/src/commands/createNewProject/ProjectCreateStep/MavenProjectCreateSteps.ts +++ b/src/commands/createNewProject/ProjectCreateStep/MavenProjectCreateSteps.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as os from 'os'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { JavaBuildTool } from '../../../constants'; import { ext } from '../../../extensionVariables'; import * as fsUtil from '../../../utils/fs'; diff --git a/src/commands/createNewProject/ProjectCreateStep/PowerShellProjectCreateStep.ts b/src/commands/createNewProject/ProjectCreateStep/PowerShellProjectCreateStep.ts index 6e49c196a..00f2eb8f9 100644 --- a/src/commands/createNewProject/ProjectCreateStep/PowerShellProjectCreateStep.ts +++ b/src/commands/createNewProject/ProjectCreateStep/PowerShellProjectCreateStep.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from '@azure/ms-rest-js'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { Progress } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { workerRuntimeVersionKey } from '../../../constants'; import { IHostJsonV2 } from '../../../funcConfig/host'; import { hasMinFuncCliVersion } from '../../../funcCoreTools/hasMinFuncCliVersion'; diff --git a/src/commands/createNewProject/ProjectCreateStep/ProjectCreateStepBase.ts b/src/commands/createNewProject/ProjectCreateStep/ProjectCreateStepBase.ts index 32d8c01b3..26b941c02 100644 --- a/src/commands/createNewProject/ProjectCreateStep/ProjectCreateStepBase.ts +++ b/src/commands/createNewProject/ProjectCreateStep/ProjectCreateStepBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import { Progress } from 'vscode'; -import { AzureWizardExecuteStep, callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { localize } from '../../../localize'; import { gitUtils } from '../../../utils/gitUtils'; import { IProjectWizardContext } from '../IProjectWizardContext'; diff --git a/src/commands/createNewProject/ProjectCreateStep/ScriptProjectCreateStep.ts b/src/commands/createNewProject/ProjectCreateStep/ScriptProjectCreateStep.ts index b7df56bf7..7d8ef3028 100644 --- a/src/commands/createNewProject/ProjectCreateStep/ScriptProjectCreateStep.ts +++ b/src/commands/createNewProject/ProjectCreateStep/ScriptProjectCreateStep.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as os from 'os'; import * as path from 'path'; import { Progress } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { gitignoreFileName, hostFileName, localSettingsFileName, workerRuntimeKey } from '../../../constants'; import { IHostJsonV1, IHostJsonV2 } from '../../../funcConfig/host'; import { ILocalSettingsJson } from '../../../funcConfig/local.settings'; diff --git a/src/commands/createNewProject/createNewProject.ts b/src/commands/createNewProject/createNewProject.ts index 280593160..57ffdbb83 100644 --- a/src/commands/createNewProject/createNewProject.ts +++ b/src/commands/createNewProject/createNewProject.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, IActionContext } from '@microsoft/vscode-azext-utils'; import { window } from 'vscode'; -import { AzureWizard, IActionContext } from 'vscode-azureextensionui'; import { funcVersionSetting, ProjectLanguage, projectLanguageSetting, projectOpenBehaviorSetting, projectTemplateKeySetting } from '../../constants'; import { addLocalFuncTelemetry } from '../../funcCoreTools/getLocalFuncCoreToolsVersion'; import { tryGetLocalFuncVersion } from '../../funcCoreTools/tryGetLocalFuncVersion'; diff --git a/src/commands/createNewProject/dotnetSteps/DotnetRuntimeStep.ts b/src/commands/createNewProject/dotnetSteps/DotnetRuntimeStep.ts index fa24541b8..acf8ac8b9 100644 --- a/src/commands/createNewProject/dotnetSteps/DotnetRuntimeStep.ts +++ b/src/commands/createNewProject/dotnetSteps/DotnetRuntimeStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { hiddenStacksSetting } from "../../../constants"; import { promptForFuncVersion } from "../../../FuncVersion"; import { localize } from "../../../localize"; diff --git a/src/commands/createNewProject/javaSteps/JavaAppNameStep.ts b/src/commands/createNewProject/javaSteps/JavaAppNameStep.ts index 13067218b..6e8c8a9cc 100644 --- a/src/commands/createNewProject/javaSteps/JavaAppNameStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaAppNameStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { InputBoxOptions } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { localize } from "../../../localize"; import { nonNullProp } from "../../../utils/nonNull"; import { IJavaProjectWizardContext } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaArtifactIdStep.ts b/src/commands/createNewProject/javaSteps/JavaArtifactIdStep.ts index 96f3168c5..28b58d4bd 100644 --- a/src/commands/createNewProject/javaSteps/JavaArtifactIdStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaArtifactIdStep.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import * as path from 'path'; import { InputBoxOptions } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext, validateMavenIdentifier } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaBuildToolStep.ts b/src/commands/createNewProject/javaSteps/JavaBuildToolStep.ts index aaea4e315..23d2db014 100644 --- a/src/commands/createNewProject/javaSteps/JavaBuildToolStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaBuildToolStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { JavaBuildTool, previewDescription } from "../../../constants"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaGroupIdStep.ts b/src/commands/createNewProject/javaSteps/JavaGroupIdStep.ts index 0f79fd9ed..318c3d6c4 100644 --- a/src/commands/createNewProject/javaSteps/JavaGroupIdStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaGroupIdStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { InputBoxOptions } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext, validateMavenIdentifier } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaPackageNameStep.ts b/src/commands/createNewProject/javaSteps/JavaPackageNameStep.ts index b26ce37fe..37c39f6d8 100644 --- a/src/commands/createNewProject/javaSteps/JavaPackageNameStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaPackageNameStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { InputBoxOptions } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaProjectVersionStep.ts b/src/commands/createNewProject/javaSteps/JavaProjectVersionStep.ts index 1b4c62e06..5d5d7bdb2 100644 --- a/src/commands/createNewProject/javaSteps/JavaProjectVersionStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaProjectVersionStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { InputBoxOptions } from "vscode"; -import { AzureWizardPromptStep } from "vscode-azureextensionui"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/JavaVersionStep.ts b/src/commands/createNewProject/javaSteps/JavaVersionStep.ts index 878efe95f..6e3674b41 100644 --- a/src/commands/createNewProject/javaSteps/JavaVersionStep.ts +++ b/src/commands/createNewProject/javaSteps/JavaVersionStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { hasMinFuncCliVersion } from "../../../funcCoreTools/hasMinFuncCliVersion"; import { localize } from "../../../localize"; import { IJavaProjectWizardContext } from "./IJavaProjectWizardContext"; diff --git a/src/commands/createNewProject/javaSteps/addJavaCreateProjectSteps.ts b/src/commands/createNewProject/javaSteps/addJavaCreateProjectSteps.ts index 77355e4ae..bb6b1dd8a 100644 --- a/src/commands/createNewProject/javaSteps/addJavaCreateProjectSteps.ts +++ b/src/commands/createNewProject/javaSteps/addJavaCreateProjectSteps.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardExecuteStep, AzureWizardPromptStep } from "vscode-azureextensionui"; +import { AzureWizardExecuteStep, AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { IProjectWizardContext } from "../IProjectWizardContext"; import { GradleProjectCreateStep } from "../ProjectCreateStep/GradleProjectCreateSteps"; import { MavenProjectCreateStep } from "../ProjectCreateStep/MavenProjectCreateSteps"; diff --git a/src/commands/createNewProject/pythonSteps/EnterPythonAliasStep.ts b/src/commands/createNewProject/pythonSteps/EnterPythonAliasStep.ts index cca39d210..c0af27b25 100644 --- a/src/commands/createNewProject/pythonSteps/EnterPythonAliasStep.ts +++ b/src/commands/createNewProject/pythonSteps/EnterPythonAliasStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, parseError } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, parseError } from "@microsoft/vscode-azext-utils"; import { localize } from "../../../localize"; import { IPythonVenvWizardContext } from "./IPythonVenvWizardContext"; import { getPythonVersion, getSupportedPythonVersions, isSupportedPythonVersion } from './pythonVersion'; diff --git a/src/commands/createNewProject/pythonSteps/IPythonVenvWizardContext.ts b/src/commands/createNewProject/pythonSteps/IPythonVenvWizardContext.ts index da3c8daa8..9a9468378 100644 --- a/src/commands/createNewProject/pythonSteps/IPythonVenvWizardContext.ts +++ b/src/commands/createNewProject/pythonSteps/IPythonVenvWizardContext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from "vscode-azureextensionui"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { FuncVersion } from "../../../FuncVersion"; export interface IPythonVenvWizardContext extends IActionContext { diff --git a/src/commands/createNewProject/pythonSteps/PythonAliasListStep.ts b/src/commands/createNewProject/pythonSteps/PythonAliasListStep.ts index eaae4a587..a7a3f2f2e 100644 --- a/src/commands/createNewProject/pythonSteps/PythonAliasListStep.ts +++ b/src/commands/createNewProject/pythonSteps/PythonAliasListStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from "@microsoft/vscode-azext-utils"; import { localize } from "../../../localize"; import { getGlobalSetting } from "../../../vsCodeConfig/settings"; import { EnterPythonAliasStep } from "./EnterPythonAliasStep"; diff --git a/src/commands/createNewProject/pythonSteps/PythonVenvCreateStep.ts b/src/commands/createNewProject/pythonSteps/PythonVenvCreateStep.ts index 3eebf00c1..e71d8f6f8 100644 --- a/src/commands/createNewProject/pythonSteps/PythonVenvCreateStep.ts +++ b/src/commands/createNewProject/pythonSteps/PythonVenvCreateStep.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { Progress } from 'vscode'; -import { AzureWizardExecuteStep } from 'vscode-azureextensionui'; import { requirementsFileName } from '../../../constants'; import { ext } from '../../../extensionVariables'; import { localize } from "../../../localize"; diff --git a/src/commands/createNewProject/pythonSteps/pythonVersion.ts b/src/commands/createNewProject/pythonSteps/pythonVersion.ts index 8861a4027..b4fe98f7a 100644 --- a/src/commands/createNewProject/pythonSteps/pythonVersion.ts +++ b/src/commands/createNewProject/pythonSteps/pythonVersion.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../../extensionVariables'; import { getLocalFuncCoreToolsVersion } from '../../../funcCoreTools/getLocalFuncCoreToolsVersion'; import { FuncVersion, getMajorVersion } from '../../../FuncVersion'; diff --git a/src/commands/createNewProject/verifyIsProject.ts b/src/commands/createNewProject/verifyIsProject.ts index cc84fd085..1a5e5feef 100644 --- a/src/commands/createNewProject/verifyIsProject.ts +++ b/src/commands/createNewProject/verifyIsProject.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { MessageItem, WorkspaceFolder } from 'vscode'; -import { DialogResponses, IActionContext, IAzureQuickPickItem } from 'vscode-azureextensionui'; import { hostFileName, projectSubpathSetting } from '../../constants'; import { localize } from '../../localize'; import { telemetryUtils } from '../../utils/telemetryUtils'; diff --git a/src/commands/createSlot.ts b/src/commands/createSlot.ts index 4fbad605c..978d4625c 100644 --- a/src/commands/createSlot.ts +++ b/src/commands/createSlot.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { SlotsTreeItem } from '../tree/SlotsTreeItem'; import { SlotTreeItem } from '../tree/SlotTreeItem'; diff --git a/src/commands/deleteFunction.ts b/src/commands/deleteFunction.ts index a7c22e14c..f4062d955 100644 --- a/src/commands/deleteFunction.ts +++ b/src/commands/deleteFunction.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtTreeItem, IActionContext, ITreeItemPickerContext } from 'vscode-azureextensionui'; +import { AzExtTreeItem, IActionContext, ITreeItemPickerContext } from '@microsoft/vscode-azext-utils'; import { localize } from '../localize'; import { deleteNode } from './deleteNode'; diff --git a/src/commands/deleteFunctionApp.ts b/src/commands/deleteFunctionApp.ts index c15498705..8777ad67f 100644 --- a/src/commands/deleteFunctionApp.ts +++ b/src/commands/deleteFunctionApp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtTreeItem, IActionContext } from 'vscode-azureextensionui'; +import { AzExtTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; import { deleteNode } from './deleteNode'; diff --git a/src/commands/deleteNode.ts b/src/commands/deleteNode.ts index 1221164e5..3f4c8cb64 100644 --- a/src/commands/deleteNode.ts +++ b/src/commands/deleteNode.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtTreeItem, IActionContext } from 'vscode-azureextensionui'; +import { AzExtTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; export async function deleteNode(context: IActionContext, expectedContextValue: string | RegExp, node?: AzExtTreeItem): Promise { diff --git a/src/commands/deploy/deploy.ts b/src/commands/deploy/deploy.ts index 347c69292..1b5fd817a 100644 --- a/src/commands/deploy/deploy.ts +++ b/src/commands/deploy/deploy.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { SiteConfigResource } from '@azure/arm-appservice'; +import { deploy as innerDeploy, getDeployFsPath, getDeployNode, IDeployContext, IDeployPaths, showDeployConfirmation } from '@microsoft/vscode-azext-azureappservice'; +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { deploy as innerDeploy, getDeployFsPath, getDeployNode, IDeployContext, IDeployPaths, showDeployConfirmation } from 'vscode-azureappservice'; -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { deploySubpathSetting, ProjectLanguage, remoteBuildSetting, ScmType } from '../../constants'; import { ext } from '../../extensionVariables'; import { addLocalFuncTelemetry } from '../../funcCoreTools/getLocalFuncCoreToolsVersion'; @@ -51,7 +51,7 @@ async function deploy(actionContext: IActionContext, arg1: vscode.Uri | string | } const client = await node.site.createClient(actionContext); - const siteConfig: WebSiteManagementModels.SiteConfigResource = await client.getSiteConfig(); + const siteConfig: SiteConfigResource = await client.getSiteConfig(); const isConsumption: boolean = await client.getIsConsumption(actionContext); let isZipDeploy: boolean = siteConfig.scmType !== ScmType.LocalGit && siteConfig.scmType !== ScmType.GitHub; if (!isZipDeploy && node.site.isLinux && isConsumption) { @@ -113,7 +113,7 @@ async function deploy(actionContext: IActionContext, arg1: vscode.Uri | string | await notifyDeployComplete(context, node, context.workspaceFolder); } -async function updateWorkerProcessTo64BitIfRequired(context: IDeployContext, siteConfig: WebSiteManagementModels.SiteConfigResource, node: SlotTreeItemBase, language: ProjectLanguage): Promise { +async function updateWorkerProcessTo64BitIfRequired(context: IDeployContext, siteConfig: SiteConfigResource, node: SlotTreeItemBase, language: ProjectLanguage): Promise { const functionProject: string | undefined = await tryGetFunctionProjectRoot(context, context.workspaceFolder); if (functionProject === undefined) { return; @@ -130,7 +130,7 @@ async function updateWorkerProcessTo64BitIfRequired(context: IDeployContext, sit if (dialogResult === deployAnyway) { return; } - const config: WebSiteManagementModels.SiteConfigResource = { + const config: SiteConfigResource = { use32BitWorkerProcess: false }; const client = await node.site.createClient(context); diff --git a/src/commands/deploy/notifyDeployComplete.ts b/src/commands/deploy/notifyDeployComplete.ts index fd68eb01f..747ddc148 100644 --- a/src/commands/deploy/notifyDeployComplete.ts +++ b/src/commands/deploy/notifyDeployComplete.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as retry from 'p-retry'; import { MessageItem, window, WorkspaceFolder } from 'vscode'; -import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { RemoteFunctionsTreeItem } from '../../tree/remoteProject/RemoteFunctionsTreeItem'; diff --git a/src/commands/deploy/runPreDeployTask.ts b/src/commands/deploy/runPreDeployTask.ts index 6add2b798..114e8a326 100644 --- a/src/commands/deploy/runPreDeployTask.ts +++ b/src/commands/deploy/runPreDeployTask.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { handleFailedPreDeployTask, IDeployContext, IPreDeployTaskResult, tryRunPreDeployTask } from '@microsoft/vscode-azext-azureappservice'; +import { DialogResponses, UserCancelledError } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { handleFailedPreDeployTask, IDeployContext, IPreDeployTaskResult, tryRunPreDeployTask } from 'vscode-azureappservice'; -import { DialogResponses, UserCancelledError } from 'vscode-azureextensionui'; import { buildNativeDeps, packTaskName, preDeployTaskSetting, tasksFileName } from '../../constants'; import { ext } from '../../extensionVariables'; import { validateFuncCoreToolsInstalled } from '../../funcCoreTools/validateFuncCoreToolsInstalled'; diff --git a/src/commands/deploy/validateRemoteBuild.ts b/src/commands/deploy/validateRemoteBuild.ts index 7a1cfcaa4..6eae5587e 100644 --- a/src/commands/deploy/validateRemoteBuild.ts +++ b/src/commands/deploy/validateRemoteBuild.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IDeployContext, ParsedSite } from '@microsoft/vscode-azext-azureappservice'; import * as path from 'path'; import * as vscode from 'vscode'; -import { IDeployContext, ParsedSite } from 'vscode-azureappservice'; import { deploySubpathSetting, packTaskName, preDeployTaskSetting, ProjectLanguage, remoteBuildSetting } from '../../constants'; import { localize } from '../../localize'; import { updateWorkspaceSetting } from '../../vsCodeConfig/settings'; diff --git a/src/commands/deploy/verifyAppSettings.ts b/src/commands/deploy/verifyAppSettings.ts index c76a24aaf..605028248 100644 --- a/src/commands/deploy/verifyAppSettings.ts +++ b/src/commands/deploy/verifyAppSettings.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { StringDictionary } from '@azure/arm-appservice'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { ParsedSite } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; import { extensionVersionKey, ProjectLanguage, runFromPackageKey, workerRuntimeKey } from '../../constants'; import { ext } from '../../extensionVariables'; import { FuncVersion, tryParseFuncVersion } from '../../FuncVersion'; @@ -21,7 +21,7 @@ type VerifyAppSettingBooleans = { doRemoteBuild: boolean | undefined; isConsumpt export async function verifyAppSettings(context: IActionContext, node: SlotTreeItemBase, projectPath: string | undefined, version: FuncVersion, language: ProjectLanguage, bools: VerifyAppSettingBooleans): Promise { const client = await node.site.createClient(context); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const appSettings: StringDictionary = await client.listApplicationSettings(); if (appSettings.properties) { await verifyVersionAndLanguage(context, projectPath, node.site.fullName, version, language, appSettings.properties); diff --git a/src/commands/deployments/connectToGitHub.ts b/src/commands/deployments/connectToGitHub.ts index feeb8b95e..fb8166e88 100644 --- a/src/commands/deployments/connectToGitHub.ts +++ b/src/commands/deployments/connectToGitHub.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeploymentsTreeItem, editScmType } from "vscode-azureappservice"; -import { GenericTreeItem, IActionContext } from "vscode-azureextensionui"; +import { DeploymentsTreeItem, editScmType } from "@microsoft/vscode-azext-azureappservice"; +import { GenericTreeItem, IActionContext } from "@microsoft/vscode-azext-utils"; import { ScmType } from "../../constants"; import { ext } from "../../extensionVariables"; import { ProductionSlotTreeItem } from "../../tree/ProductionSlotTreeItem"; diff --git a/src/commands/deployments/disconnectRepo.ts b/src/commands/deployments/disconnectRepo.ts index 038d7e935..bb87a3d33 100644 --- a/src/commands/deployments/disconnectRepo.ts +++ b/src/commands/deployments/disconnectRepo.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeploymentsTreeItem, disconnectRepo as disconnectRepository } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; +import { DeploymentsTreeItem, disconnectRepo as disconnectRepository } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; import { SlotTreeItemBase } from '../../tree/SlotTreeItemBase'; diff --git a/src/commands/deployments/redeployDeployment.ts b/src/commands/deployments/redeployDeployment.ts index 4394401a8..719fa748d 100644 --- a/src/commands/deployments/redeployDeployment.ts +++ b/src/commands/deployments/redeployDeployment.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeploymentTreeItem } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; +import { DeploymentTreeItem } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; export async function redeployDeployment(context: IActionContext, node?: DeploymentTreeItem): Promise { diff --git a/src/commands/deployments/viewCommitInGitHub.ts b/src/commands/deployments/viewCommitInGitHub.ts index 5c82297ae..b6730cabf 100644 --- a/src/commands/deployments/viewCommitInGitHub.ts +++ b/src/commands/deployments/viewCommitInGitHub.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeploymentTreeItem } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; +import { DeploymentTreeItem } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; export async function viewCommitInGitHub(context: IActionContext, node?: DeploymentTreeItem): Promise { diff --git a/src/commands/deployments/viewDeploymentLogs.ts b/src/commands/deployments/viewDeploymentLogs.ts index 4bcee7520..c19df4d2d 100644 --- a/src/commands/deployments/viewDeploymentLogs.ts +++ b/src/commands/deployments/viewDeploymentLogs.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeploymentTreeItem } from "vscode-azureappservice"; -import { IActionContext } from "vscode-azureextensionui"; +import { DeploymentTreeItem } from "@microsoft/vscode-azext-azureappservice"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ext } from "../../extensionVariables"; export async function viewDeploymentLogs(context: IActionContext, node?: DeploymentTreeItem): Promise { diff --git a/src/commands/editAppSetting.ts b/src/commands/editAppSetting.ts index 38f43e2be..dfce6c393 100644 --- a/src/commands/editAppSetting.ts +++ b/src/commands/editAppSetting.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AppSettingTreeItem } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { AppSettingTreeItem } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; export async function editAppSetting(context: IActionContext, node?: AppSettingTreeItem): Promise { diff --git a/src/commands/executeFunction.ts b/src/commands/executeFunction.ts index 4712e659f..b00a27f48 100644 --- a/src/commands/executeFunction.ts +++ b/src/commands/executeFunction.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { SiteClient } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import { window } from 'vscode'; -import { SiteClient } from 'vscode-azureappservice'; -import { IActionContext, parseError } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { FuncVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts b/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts index 984ebeb66..154b2d314 100644 --- a/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts +++ b/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, AzureWizardPromptStep, IWizardOptions } from '@microsoft/vscode-azext-utils'; import { QuickPickItem, QuickPickOptions } from 'vscode'; -import { AzureWizardExecuteStep, AzureWizardPromptStep, IWizardOptions } from 'vscode-azureextensionui'; import { ProjectLanguage } from '../../constants'; import { localize } from '../../localize'; import { IProjectWizardContext } from '../createNewProject/IProjectWizardContext'; diff --git a/src/commands/initProjectForVSCode/InitVSCodeStep/DotnetInitVSCodeStep.ts b/src/commands/initProjectForVSCode/InitVSCodeStep/DotnetInitVSCodeStep.ts index d2ed46080..801fd3e40 100644 --- a/src/commands/initProjectForVSCode/InitVSCodeStep/DotnetInitVSCodeStep.ts +++ b/src/commands/initProjectForVSCode/InitVSCodeStep/DotnetInitVSCodeStep.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, parseError } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { DebugConfiguration, MessageItem, TaskDefinition } from 'vscode'; -import { DialogResponses, parseError } from 'vscode-azureextensionui'; import { func, hostStartCommand, ProjectLanguage } from '../../../constants'; import { FuncVersion, tryParseFuncVersion } from '../../../FuncVersion'; import { localize } from "../../../localize"; diff --git a/src/commands/initProjectForVSCode/InitVSCodeStep/InitVSCodeStepBase.ts b/src/commands/initProjectForVSCode/InitVSCodeStep/InitVSCodeStepBase.ts index 812426ec2..d631ecde3 100644 --- a/src/commands/initProjectForVSCode/InitVSCodeStep/InitVSCodeStepBase.ts +++ b/src/commands/initProjectForVSCode/InitVSCodeStep/InitVSCodeStepBase.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { DebugConfiguration, MessageItem, TaskDefinition, WorkspaceFolder } from 'vscode'; -import { AzureWizardExecuteStep, IActionContext } from 'vscode-azureextensionui'; import { deploySubpathSetting, func, funcVersionSetting, gitignoreFileName, launchFileName, preDeployTaskSetting, ProjectLanguage, projectLanguageSetting, projectSubpathSetting, settingsFileName, tasksFileName } from '../../../constants'; import { ext } from '../../../extensionVariables'; import { FuncVersion } from '../../../FuncVersion'; diff --git a/src/commands/initProjectForVSCode/detectProjectLanguage.ts b/src/commands/initProjectForVSCode/detectProjectLanguage.ts index 79650cf00..97454c499 100644 --- a/src/commands/initProjectForVSCode/detectProjectLanguage.ts +++ b/src/commands/initProjectForVSCode/detectProjectLanguage.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { buildGradleFileName, localSettingsFileName, pomXmlFileName, ProjectLanguage, workerRuntimeKey } from '../../constants'; import { getLocalSettingsJson, ILocalSettingsJson } from '../../funcConfig/local.settings'; import { dotnetUtils } from '../../utils/dotnetUtils'; diff --git a/src/commands/initProjectForVSCode/initProjectForVSCode.ts b/src/commands/initProjectForVSCode/initProjectForVSCode.ts index 82881407e..ee8651f99 100644 --- a/src/commands/initProjectForVSCode/initProjectForVSCode.ts +++ b/src/commands/initProjectForVSCode/initProjectForVSCode.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, IActionContext, UserCancelledError } from '@microsoft/vscode-azext-utils'; import { window, workspace, WorkspaceFolder } from 'vscode'; -import { AzureWizard, IActionContext, UserCancelledError } from 'vscode-azureextensionui'; import { funcVersionSetting, ProjectLanguage, projectLanguageSetting, projectTemplateKeySetting } from '../../constants'; import { NoWorkspaceError } from '../../errors'; import { tryGetLocalFuncVersion } from '../../funcCoreTools/tryGetLocalFuncVersion'; diff --git a/src/commands/initProjectForVSCode/javaSteps/addJavaInitVSCodeSteps.ts b/src/commands/initProjectForVSCode/javaSteps/addJavaInitVSCodeSteps.ts index 854393e37..11a3d9daf 100644 --- a/src/commands/initProjectForVSCode/javaSteps/addJavaInitVSCodeSteps.ts +++ b/src/commands/initProjectForVSCode/javaSteps/addJavaInitVSCodeSteps.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardExecuteStep, AzureWizardPromptStep } from "vscode-azureextensionui"; +import { AzureWizardExecuteStep, AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import { JavaBuildTool } from "../../../constants"; import { IProjectWizardContext } from "../../createNewProject/IProjectWizardContext"; import { IJavaProjectWizardContext } from "../../createNewProject/javaSteps/IJavaProjectWizardContext"; diff --git a/src/commands/initProjectForVSCode/pythonSteps/PythonVenvListStep.ts b/src/commands/initProjectForVSCode/pythonSteps/PythonVenvListStep.ts index 3256ba130..24cfbba0a 100644 --- a/src/commands/initProjectForVSCode/pythonSteps/PythonVenvListStep.ts +++ b/src/commands/initProjectForVSCode/pythonSteps/PythonVenvListStep.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzureWizardPromptStep, IAzureQuickPickItem } from "vscode-azureextensionui"; +import { AzureWizardPromptStep, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; import { localize } from "../../../localize"; import { IPythonVenvWizardContext } from "../../createNewProject/pythonSteps/IPythonVenvWizardContext"; diff --git a/src/commands/initProjectForVSCode/pythonSteps/addPythonInitVSCodeSteps.ts b/src/commands/initProjectForVSCode/pythonSteps/addPythonInitVSCodeSteps.ts index 6854d20e4..16e128660 100644 --- a/src/commands/initProjectForVSCode/pythonSteps/addPythonInitVSCodeSteps.ts +++ b/src/commands/initProjectForVSCode/pythonSteps/addPythonInitVSCodeSteps.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizardExecuteStep, AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; -import { AzureWizardExecuteStep, AzureWizardPromptStep } from "vscode-azureextensionui"; import { venvUtils } from '../../../utils/venvUtils'; import { getWorkspaceSetting } from "../../../vsCodeConfig/settings"; import { IProjectWizardContext } from "../../createNewProject/IProjectWizardContext"; diff --git a/src/commands/logstream/enableFileLogging.ts b/src/commands/logstream/enableFileLogging.ts index 4dfe5f492..99bde6355 100644 --- a/src/commands/logstream/enableFileLogging.ts +++ b/src/commands/logstream/enableFileLogging.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; -import { ParsedSite } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { SiteLogsConfig } from '@azure/arm-appservice'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; -export async function enableFileLogging(context: IActionContext, site: ParsedSite, logsConfig?: WebSiteManagementModels.SiteLogsConfig): Promise { +export async function enableFileLogging(context: IActionContext, site: ParsedSite, logsConfig?: SiteLogsConfig): Promise { const client = await site.createClient(context); logsConfig = logsConfig || await client.getLogsConfig(); diff --git a/src/commands/logstream/startStreamingLogs.ts b/src/commands/logstream/startStreamingLogs.ts index 3ec7507a6..e69e5df10 100644 --- a/src/commands/logstream/startStreamingLogs.ts +++ b/src/commands/logstream/startStreamingLogs.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ApplicationInsightsManagementClient, ApplicationInsightsManagementModels as AIModels } from '@azure/arm-appinsights'; -import { WebSiteManagementModels } from '@azure/arm-appservice'; -import * as appservice from 'vscode-azureappservice'; -import { ParsedSite } from 'vscode-azureappservice'; -import { AzExtTreeItem, DialogResponses, IActionContext } from 'vscode-azureextensionui'; +import { ApplicationInsightsManagementClient, ApplicationInsightsManagementModels } from '@azure/arm-appinsights'; +import { SiteLogsConfig, StringDictionary } from '@azure/arm-appservice'; +import * as appservice from '@microsoft/vscode-azext-azureappservice'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { AzExtTreeItem, DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { ProductionSlotTreeItem } from '../../tree/ProductionSlotTreeItem'; @@ -37,7 +37,7 @@ export async function startStreamingLogs(context: IActionContext, treeItem?: Slo } else { const verifyLoggingEnabled: () => Promise = async (): Promise => { const client = await site.createClient(context); - const logsConfig: WebSiteManagementModels.SiteLogsConfig = await client.getLogsConfig(); + const logsConfig: SiteLogsConfig = await client.getLogsConfig(); if (!isApplicationLoggingEnabled(logsConfig)) { const message: string = localize('enableApplicationLogging', 'Do you want to enable application logging for "{0}"?', client.fullName); await context.ui.showWarningMessage(message, { modal: true, stepName: 'enableAppLogging' }, DialogResponses.yes); @@ -55,15 +55,15 @@ export async function startStreamingLogs(context: IActionContext, treeItem?: Slo */ async function openLiveMetricsStream(context: IActionContext, site: ParsedSite, node: AzExtTreeItem): Promise { const client = await site.createClient(context); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const appSettings: StringDictionary = await client.listApplicationSettings(); const aiKey: string | undefined = appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY; if (!aiKey) { // /~https://github.com/microsoft/vscode-azurefunctions/issues/1432 throw new Error(localize('mustConfigureAI', 'You must configure Application Insights to stream logs on Linux Function Apps.')); } else { const aiClient: ApplicationInsightsManagementClient = await createAppInsightsClient([context, node]); - const components: AIModels.ApplicationInsightsComponentListResult = await aiClient.components.list(); - const component: AIModels.ApplicationInsightsComponent | undefined = components.find(c => c.instrumentationKey === aiKey); + const components: ApplicationInsightsManagementModels.ApplicationInsightsComponentListResult = await aiClient.components.list(); + const component: ApplicationInsightsManagementModels.ApplicationInsightsComponent | undefined = components.find(c => c.instrumentationKey === aiKey); if (!component) { throw new Error(localize('failedToFindAI', 'Failed to find application insights component.')); } else { @@ -81,7 +81,7 @@ async function openLiveMetricsStream(context: IActionContext, site: ParsedSite, } } -function isApplicationLoggingEnabled(config: WebSiteManagementModels.SiteLogsConfig): boolean { +function isApplicationLoggingEnabled(config: SiteLogsConfig): boolean { if (config.applicationLogs) { if (config.applicationLogs.fileSystem) { return config.applicationLogs.fileSystem.level !== undefined && config.applicationLogs.fileSystem.level.toLowerCase() !== 'off'; diff --git a/src/commands/logstream/stopStreamingLogs.ts b/src/commands/logstream/stopStreamingLogs.ts index d7f7d4633..b9febc662 100644 --- a/src/commands/logstream/stopStreamingLogs.ts +++ b/src/commands/logstream/stopStreamingLogs.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as appservice from 'vscode-azureappservice'; -import { ParsedSite } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import * as appservice from '@microsoft/vscode-azext-azureappservice'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../../extensionVariables'; import { ProductionSlotTreeItem } from '../../tree/ProductionSlotTreeItem'; import { RemoteFunctionTreeItem } from '../../tree/remoteProject/RemoteFunctionTreeItem'; diff --git a/src/commands/openFile.ts b/src/commands/openFile.ts index f6ffab4de..894a7e9f2 100644 --- a/src/commands/openFile.ts +++ b/src/commands/openFile.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { FileTreeItem } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { FileTreeItem } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; export async function openFile(context: IActionContext, node: FileTreeItem): Promise { context.telemetry.eventVersion = 2; diff --git a/src/commands/openInPortal.ts b/src/commands/openInPortal.ts index 118e56a9d..31ca9424c 100644 --- a/src/commands/openInPortal.ts +++ b/src/commands/openInPortal.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AzExtTreeItem, IActionContext, openInPortal as uiOpenInPortal } from 'vscode-azureextensionui'; +import { openInPortal as uiOpenInPortal } from '@microsoft/vscode-azext-azureutils'; +import { AzExtTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; diff --git a/src/commands/pickFuncProcess.ts b/src/commands/pickFuncProcess.ts index 993d0c8fa..df206f346 100644 --- a/src/commands/pickFuncProcess.ts +++ b/src/commands/pickFuncProcess.ts @@ -4,9 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from '@azure/ms-rest-js'; +import { AzExtRequestPrepareOptions, sendRequestWithTimeout } from '@microsoft/vscode-azext-azureutils'; +import { IActionContext, UserCancelledError } from '@microsoft/vscode-azext-utils'; import * as unixPsTree from 'ps-tree'; import * as vscode from 'vscode'; -import { AzExtRequestPrepareOptions, IActionContext, sendRequestWithTimeout, UserCancelledError } from 'vscode-azureextensionui'; import { hostStartTaskName } from '../constants'; import { IPreDebugValidateResult, preDebugValidate } from '../debug/validatePreDebug'; import { ext } from '../extensionVariables'; diff --git a/src/commands/registerCommands.ts b/src/commands/registerCommands.ts index f5994890d..22dde8e15 100644 --- a/src/commands/registerCommands.ts +++ b/src/commands/registerCommands.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AppSettingsTreeItem, AppSettingTreeItem, registerSiteCommand } from '@microsoft/vscode-azext-azureappservice'; +import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, registerCommand } from '@microsoft/vscode-azext-utils'; import { commands } from 'vscode'; -import { AppSettingsTreeItem, AppSettingTreeItem, registerSiteCommand } from 'vscode-azureappservice'; -import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, registerCommand } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { installOrUpdateFuncCoreTools } from '../funcCoreTools/installOrUpdateFuncCoreTools'; import { uninstallFuncCoreTools } from '../funcCoreTools/uninstallFuncCoreTools'; diff --git a/src/commands/remoteDebug/getRemoteDebugLanguage.ts b/src/commands/remoteDebug/getRemoteDebugLanguage.ts index c599b97fb..46f2e9c3e 100644 --- a/src/commands/remoteDebug/getRemoteDebugLanguage.ts +++ b/src/commands/remoteDebug/getRemoteDebugLanguage.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; -import { RemoteDebugLanguage } from 'vscode-azureappservice'; +import { SiteConfig } from '@azure/arm-appservice'; +import { RemoteDebugLanguage } from '@microsoft/vscode-azext-azureappservice'; -export function getRemoteDebugLanguage(siteConfig: WebSiteManagementModels.SiteConfig): RemoteDebugLanguage { +export function getRemoteDebugLanguage(siteConfig: SiteConfig): RemoteDebugLanguage { // Read siteConfig.linuxFxVersion to determine debugging support // If the Function App is running on Windows, it will be empty // If the Function App is running on Linux consumption, it will be empty diff --git a/src/commands/remoteDebug/startRemoteDebug.ts b/src/commands/remoteDebug/startRemoteDebug.ts index 1c1f557a0..8b8f88485 100644 --- a/src/commands/remoteDebug/startRemoteDebug.ts +++ b/src/commands/remoteDebug/startRemoteDebug.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { SiteConfig } from '@azure/arm-appservice'; +import * as appservice from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import * as appservice from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { ProductionSlotTreeItem } from '../../tree/ProductionSlotTreeItem'; import { SlotTreeItemBase } from '../../tree/SlotTreeItemBase'; @@ -18,7 +18,7 @@ export async function startRemoteDebug(context: IActionContext, node?: SlotTreeI } const siteClient = await node.site.createClient(context); - const siteConfig: WebSiteManagementModels.SiteConfig = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: true }, async (progress, token) => { + const siteConfig: SiteConfig = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: true }, async (progress, token) => { appservice.reportMessage('Fetching site configuration...', progress, token); return await siteClient.getSiteConfig(); }); diff --git a/src/commands/remoteDebugJava/DebugProxy.ts b/src/commands/remoteDebugJava/DebugProxy.ts index 993165514..5cf1369a5 100644 --- a/src/commands/remoteDebugJava/DebugProxy.ts +++ b/src/commands/remoteDebugJava/DebugProxy.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { User } from '@azure/arm-appservice'; +import { ParsedSite, pingFunctionApp } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { EventEmitter } from 'events'; import { createServer, Server, Socket } from 'net'; -import { ParsedSite, pingFunctionApp } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; import * as websocket from 'websocket'; import { ext } from '../../extensionVariables'; @@ -17,10 +17,10 @@ export class DebugProxy extends EventEmitter { private _wsconnection: websocket.connection | undefined; private readonly _site: ParsedSite; private readonly _port: number; - private readonly _publishCredential: WebSiteManagementModels.User; + private readonly _publishCredential: User; private _keepAlive: boolean; - constructor(site: ParsedSite, port: number, publishCredential: WebSiteManagementModels.User) { + constructor(site: ParsedSite, port: number, publishCredential: User) { super(); this._site = site; this._port = port; diff --git a/src/commands/remoteDebugJava/remoteDebugJavaFunctionApp.ts b/src/commands/remoteDebugJava/remoteDebugJavaFunctionApp.ts index d084733bf..c2e28a764 100644 --- a/src/commands/remoteDebugJava/remoteDebugJavaFunctionApp.ts +++ b/src/commands/remoteDebugJava/remoteDebugJavaFunctionApp.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { SiteConfigResource, StringDictionary, User } from '@azure/arm-appservice'; +import { SiteClient } from '@microsoft/vscode-azext-azureappservice'; +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as portfinder from 'portfinder'; import * as vscode from 'vscode'; -import { SiteClient } from 'vscode-azureappservice'; -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { localize } from '../../localize'; import { ProductionSlotTreeItem } from '../../tree/ProductionSlotTreeItem'; @@ -24,7 +24,7 @@ export async function remoteDebugJavaFunctionApp(context: IActionContext, node?: } const client: SiteClient = await node.site.createClient(context); const portNumber: number = await portfinder.getPortPromise(); - const publishCredential: WebSiteManagementModels.User = await client.getWebAppPublishCredential(); + const publishCredential: User = await client.getWebAppPublishCredential(); const debugProxy: DebugProxy = new DebugProxy(node.site, portNumber, publishCredential); debugProxy.on('error', (err: Error) => { @@ -36,8 +36,8 @@ export async function remoteDebugJavaFunctionApp(context: IActionContext, node?: // eslint-disable-next-line @typescript-eslint/no-misused-promises, @typescript-eslint/no-explicit-any, no-async-promise-executor return new Promise(async (resolve: (value: unknown) => void, reject: (e: any) => void): Promise => { try { - const siteConfig: WebSiteManagementModels.SiteConfigResource = await client.getSiteConfig(); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const siteConfig: SiteConfigResource = await client.getSiteConfig(); + const appSettings: StringDictionary = await client.listApplicationSettings(); if (needUpdateSiteConfig(siteConfig) || (appSettings.properties && needUpdateAppSettings(appSettings.properties))) { const confirmMsg: string = localize('confirmRemoteDebug', 'The configurations of the selected app will be changed before debugging. Would you like to continue?'); const result: vscode.MessageItem = await context.ui.showWarningMessage(confirmMsg, { modal: true }, DialogResponses.yes, DialogResponses.learnMore); @@ -81,7 +81,7 @@ export async function remoteDebugJavaFunctionApp(context: IActionContext, node?: } -async function updateSiteConfig(client: SiteClient, p: vscode.Progress<{}>, siteConfig: WebSiteManagementModels.SiteConfigResource): Promise { +async function updateSiteConfig(client: SiteClient, p: vscode.Progress<{}>, siteConfig: SiteConfigResource): Promise { p.report({ message: 'Fetching site configuration...' }); ext.outputChannel.appendLog('Fetching site configuration...'); if (needUpdateSiteConfig(siteConfig)) { @@ -95,7 +95,7 @@ async function updateSiteConfig(client: SiteClient, p: vscode.Progress<{}>, site } } -async function updateAppSettings(client: SiteClient, p: vscode.Progress<{}>, appSettings: WebSiteManagementModels.StringDictionary): Promise { +async function updateAppSettings(client: SiteClient, p: vscode.Progress<{}>, appSettings: StringDictionary): Promise { p.report({ message: 'Fetching application settings...' }); ext.outputChannel.appendLog('Fetching application settings...'); if (appSettings.properties && needUpdateAppSettings(appSettings.properties)) { @@ -109,7 +109,7 @@ async function updateAppSettings(client: SiteClient, p: vscode.Progress<{}>, app } } -function needUpdateSiteConfig(siteConfig: WebSiteManagementModels.SiteConfigResource): boolean { +function needUpdateSiteConfig(siteConfig: SiteConfigResource): boolean { return siteConfig.use32BitWorkerProcess || !siteConfig.webSocketsEnabled; } diff --git a/src/commands/renameAppSetting.ts b/src/commands/renameAppSetting.ts index 24763f0ac..d6e50b7c3 100644 --- a/src/commands/renameAppSetting.ts +++ b/src/commands/renameAppSetting.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AppSettingTreeItem } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { AppSettingTreeItem } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; export async function renameAppSetting(context: IActionContext, node?: AppSettingTreeItem): Promise { diff --git a/src/commands/restartFunctionApp.ts b/src/commands/restartFunctionApp.ts index c7f69f191..6f34f4e6b 100644 --- a/src/commands/restartFunctionApp.ts +++ b/src/commands/restartFunctionApp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { SlotTreeItemBase } from '../tree/SlotTreeItemBase'; import { startFunctionApp } from './startFunctionApp'; import { stopFunctionApp } from './stopFunctionApp'; diff --git a/src/commands/startFunctionApp.ts b/src/commands/startFunctionApp.ts index 8e85ad07d..3facf1101 100644 --- a/src/commands/startFunctionApp.ts +++ b/src/commands/startFunctionApp.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { SiteClient } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { SiteClient } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; diff --git a/src/commands/stopFunctionApp.ts b/src/commands/stopFunctionApp.ts index 2330b828a..e9a888545 100644 --- a/src/commands/stopFunctionApp.ts +++ b/src/commands/stopFunctionApp.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { SiteClient } from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { SiteClient } from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { ProductionSlotTreeItem } from '../tree/ProductionSlotTreeItem'; diff --git a/src/commands/swapSlot.ts b/src/commands/swapSlot.ts index a1b8327c5..2b13097bd 100644 --- a/src/commands/swapSlot.ts +++ b/src/commands/swapSlot.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as appservice from 'vscode-azureappservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import * as appservice from '@microsoft/vscode-azext-azureappservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ext } from '../extensionVariables'; import { SlotTreeItem } from '../tree/SlotTreeItem'; diff --git a/src/commands/updateDisabledState.ts b/src/commands/updateDisabledState.ts index f40bfce10..5054b5284 100644 --- a/src/commands/updateDisabledState.ts +++ b/src/commands/updateDisabledState.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { window } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { FuncVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/commands/viewProperties.ts b/src/commands/viewProperties.ts index d582937ba..f77e8819a 100644 --- a/src/commands/viewProperties.ts +++ b/src/commands/viewProperties.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext, openReadOnlyJson } from '@microsoft/vscode-azext-utils'; import { Uri, window } from 'vscode'; -import { IActionContext, openReadOnlyJson } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { LocalFunctionTreeItem } from '../tree/localProject/LocalFunctionTreeItem'; diff --git a/src/debug/FuncDebugProviderBase.ts b/src/debug/FuncDebugProviderBase.ts index 1249de4b1..aa902ed5f 100644 --- a/src/debug/FuncDebugProviderBase.ts +++ b/src/debug/FuncDebugProviderBase.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import { CancellationToken, DebugConfiguration, DebugConfigurationProvider, WorkspaceFolder } from 'vscode'; -import { callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { isFunctionProject } from '../commands/createNewProject/verifyIsProject'; import { hostStartTaskName } from '../constants'; import { IPreDebugValidateResult, preDebugValidate } from './validatePreDebug'; diff --git a/src/debug/FuncTaskProvider.ts b/src/debug/FuncTaskProvider.ts index 610722692..bf358507b 100644 --- a/src/debug/FuncTaskProvider.ts +++ b/src/debug/FuncTaskProvider.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as process from 'process'; import { CancellationToken, ShellExecution, ShellExecutionOptions, Task, TaskDefinition, TaskProvider, TaskScope, workspace, WorkspaceFolder } from 'vscode'; -import { callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { tryGetFunctionProjectRoot } from '../commands/createNewProject/verifyIsProject'; import { buildNativeDeps, extInstallCommand, func, hostStartCommand, packCommand, ProjectLanguage, projectLanguageSetting } from '../constants'; import { getFuncCliPath } from '../funcCoreTools/getFuncCliPath'; diff --git a/src/debug/validatePreDebug.ts b/src/debug/validatePreDebug.ts index 86c33a5ee..333d4e0ff 100644 --- a/src/debug/validatePreDebug.ts +++ b/src/debug/validatePreDebug.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { BlobServiceClient } from '@azure/storage-blob'; +import { AzureWizard, IActionContext, parseError } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as path from 'path'; import * as vscode from 'vscode'; -import { AzureWizard, IActionContext, parseError } from "vscode-azureextensionui"; import { AzureWebJobsStorageExecuteStep } from "../commands/appSettings/AzureWebJobsStorageExecuteStep"; import { AzureWebJobsStoragePromptStep } from "../commands/appSettings/AzureWebJobsStoragePromptStep"; import { IAzureWebJobsStorageWizardContext } from "../commands/appSettings/IAzureWebJobsStorageWizardContext"; diff --git a/src/downloadAzureProject/handleUri.ts b/src/downloadAzureProject/handleUri.ts index 63902c52d..43486c947 100644 --- a/src/downloadAzureProject/handleUri.ts +++ b/src/downloadAzureProject/handleUri.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as querystring from 'querystring'; import * as vscode from 'vscode'; -import { callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { getWorkspaceSetting } from '../vsCodeConfig/settings'; diff --git a/src/downloadAzureProject/setupProjectFolder.ts b/src/downloadAzureProject/setupProjectFolder.ts index 445d6ec31..9c8a2554d 100644 --- a/src/downloadAzureProject/setupProjectFolder.ts +++ b/src/downloadAzureProject/setupProjectFolder.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { HostKeys } from '@azure/arm-appservice'; import { RequestPrepareOptions } from '@azure/ms-rest-js'; +import { IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import * as extract from 'extract-zip'; import * as querystring from 'querystring'; import * as vscode from 'vscode'; -import { IActionContext, parseError } from 'vscode-azureextensionui'; import { initProjectForVSCode } from '../commands/initProjectForVSCode/initProjectForVSCode'; import { ProjectLanguage } from '../constants'; import { ext } from '../extensionVariables'; @@ -38,7 +38,7 @@ export async function setupProjectFolder(uri: vscode.Uri, vsCodeFilePathUri: vsc } const client = await slotTreeItem.site.createClient(context); - const hostKeys: WebSiteManagementModels.HostKeys | undefined = await client.listHostKeys(); + const hostKeys: HostKeys | undefined = await client.listHostKeys(); const defaultHostName: string | undefined = slotTreeItem.site.defaultHostName; if (!!hostKeys && hostKeys.masterKey && defaultHostName) { diff --git a/src/extension.ts b/src/extension.ts index 64c91bba7..2ce62d250 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -5,11 +5,11 @@ 'use strict'; -import { WebSiteManagementMappers } from '@azure/arm-appservice'; +import { registerAppServiceExtensionVariables } from '@microsoft/vscode-azext-azureappservice'; +import { registerAzureUtilsExtensionVariables } from '@microsoft/vscode-azext-azureutils'; +import { AzExtTreeDataProvider, callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, createExperimentationService, IActionContext, registerErrorHandler, registerEvent, registerReportIssueCommand, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils'; +import { AzureExtensionApiProvider } from '@microsoft/vscode-azext-utils/api'; import * as vscode from 'vscode'; -import { registerAppServiceExtensionVariables } from 'vscode-azureappservice'; -import { AzExtTreeDataProvider, callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, createExperimentationService, IActionContext, registerErrorHandler, registerEvent, registerReportIssueCommand, registerUIExtensionVariables } from 'vscode-azureextensionui'; -import { AzureExtensionApiProvider } from 'vscode-azureextensionui/api'; import { createFunctionFromApi } from './commands/api/createFunctionFromApi'; import { downloadAppSettingsFromApi } from './commands/api/downloadAppSettingsFromApi'; import { revealTreeItem } from './commands/api/revealTreeItem'; @@ -38,6 +38,7 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta context.subscriptions.push(ext.outputChannel); registerUIExtensionVariables(ext); + registerAzureUtilsExtensionVariables(ext); registerAppServiceExtensionVariables(ext); await callWithTelemetryAndErrorHandling('azureFunctions.activate', async (activateContext: IActionContext) => { @@ -86,13 +87,6 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('PowerShell', powershellDebugProvider)); context.subscriptions.push(vscode.workspace.registerTaskProvider(func, new FuncTaskProvider(nodeDebugProvider, pythonDebugProvider, javaDebugProvider, powershellDebugProvider))); - // Temporary workaround so that "powerShellVersion" is an allowed property on SiteConfig - // /~https://github.com/Azure/azure-sdk-for-js/issues/10552 - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - WebSiteManagementMappers.SiteConfig.type.modelProperties!.powerShellVersion = { serializedName: 'powerShellVersion', type: { name: 'String' } }; - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - WebSiteManagementMappers.SiteConfigResource.type.modelProperties!.powerShellVersion = { serializedName: 'properties.powerShellVersion', type: { name: 'String' } }; - context.subscriptions.push(vscode.window.registerUriHandler({ handleUri })); diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts index 2c1814074..9025db4ed 100644 --- a/src/extensionVariables.ts +++ b/src/extensionVariables.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtTreeDataProvider, AzExtTreeItem, IActionContext, IAzExtOutputChannel, IExperimentationServiceAdapter } from "@microsoft/vscode-azext-utils"; import { ExtensionContext, TreeView } from "vscode"; -import { AzExtTreeDataProvider, AzExtTreeItem, IActionContext, IAzExtOutputChannel, IExperimentationServiceAdapter } from "vscode-azureextensionui"; import { func } from "./constants"; import { CentralTemplateProvider } from "./templates/CentralTemplateProvider"; import { AzureAccountTreeItemWithProjects } from "./tree/AzureAccountTreeItemWithProjects"; diff --git a/src/funcConfig/local.settings.ts b/src/funcConfig/local.settings.ts index 07867e92b..57d8aeb6d 100644 --- a/src/funcConfig/local.settings.ts +++ b/src/funcConfig/local.settings.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import * as vscode from 'vscode'; -import { DialogResponses, IActionContext, parseError } from 'vscode-azureextensionui'; import { localSettingsFileName } from '../constants'; import { localize } from '../localize'; import * as fsUtil from '../utils/fs'; diff --git a/src/funcCoreTools/funcHostTask.ts b/src/funcCoreTools/funcHostTask.ts index a4ace7cac..0e166b450 100644 --- a/src/funcCoreTools/funcHostTask.ts +++ b/src/funcCoreTools/funcHostTask.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext, registerEvent } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import * as vscode from 'vscode'; -import { IActionContext, registerEvent } from 'vscode-azureextensionui'; import { tryGetFunctionProjectRoot } from '../commands/createNewProject/verifyIsProject'; import { localSettingsFileName } from '../constants'; import { getLocalSettingsJson } from '../funcConfig/local.settings'; diff --git a/src/funcCoreTools/getFuncCliPath.ts b/src/funcCoreTools/getFuncCliPath.ts index 53e612746..f50895f8b 100644 --- a/src/funcCoreTools/getFuncCliPath.ts +++ b/src/funcCoreTools/getFuncCliPath.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { WorkspaceFolder } from "vscode"; -import { IActionContext } from "vscode-azureextensionui"; import { ext } from "../extensionVariables"; import { localize } from "../localize"; import { getWorkspaceSetting } from "../vsCodeConfig/settings"; diff --git a/src/funcCoreTools/getLocalFuncCoreToolsVersion.ts b/src/funcCoreTools/getLocalFuncCoreToolsVersion.ts index 2577de097..4209438ec 100644 --- a/src/funcCoreTools/getLocalFuncCoreToolsVersion.ts +++ b/src/funcCoreTools/getLocalFuncCoreToolsVersion.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { cpUtils } from '../utils/cpUtils'; import { getFuncCliPath } from './getFuncCliPath'; diff --git a/src/funcCoreTools/getNpmDistTag.ts b/src/funcCoreTools/getNpmDistTag.ts index 86c27c4b0..b852b81fd 100644 --- a/src/funcCoreTools/getNpmDistTag.ts +++ b/src/funcCoreTools/getNpmDistTag.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from '@azure/ms-rest-js'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { FuncVersion, getMajorVersion } from '../FuncVersion'; import { localize } from '../localize'; import { requestUtils } from '../utils/requestUtils'; diff --git a/src/funcCoreTools/hasMinFuncCliVersion.ts b/src/funcCoreTools/hasMinFuncCliVersion.ts index b50fa54d9..cb24e462a 100644 --- a/src/funcCoreTools/hasMinFuncCliVersion.ts +++ b/src/funcCoreTools/hasMinFuncCliVersion.ts @@ -4,8 +4,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { FuncVersion, getMajorVersion } from "../FuncVersion"; import { getLocalFuncCoreToolsVersion } from './getLocalFuncCoreToolsVersion'; diff --git a/src/funcCoreTools/installFuncCoreTools.ts b/src/funcCoreTools/installFuncCoreTools.ts index 47a6aaa89..ff6bca5ea 100644 --- a/src/funcCoreTools/installFuncCoreTools.ts +++ b/src/funcCoreTools/installFuncCoreTools.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { funcPackageName, PackageManager } from '../constants'; import { ext } from '../extensionVariables'; import { FuncVersion, promptForFuncVersion } from '../FuncVersion'; diff --git a/src/funcCoreTools/installOrUpdateFuncCoreTools.ts b/src/funcCoreTools/installOrUpdateFuncCoreTools.ts index 8fb35a44f..7e4d174b5 100644 --- a/src/funcCoreTools/installOrUpdateFuncCoreTools.ts +++ b/src/funcCoreTools/installOrUpdateFuncCoreTools.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext, IAzureQuickPickItem } from 'vscode-azureextensionui'; +import { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import { PackageManager } from '../constants'; import { FuncVersion, promptForFuncVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/funcCoreTools/tryGetLocalFuncVersion.ts b/src/funcCoreTools/tryGetLocalFuncVersion.ts index 3dbb7212f..91b814d96 100644 --- a/src/funcCoreTools/tryGetLocalFuncVersion.ts +++ b/src/funcCoreTools/tryGetLocalFuncVersion.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { FuncVersion, tryParseFuncVersion } from '../FuncVersion'; import { getLocalFuncCoreToolsVersion } from './getLocalFuncCoreToolsVersion'; diff --git a/src/funcCoreTools/uninstallFuncCoreTools.ts b/src/funcCoreTools/uninstallFuncCoreTools.ts index 24989d6bd..a79ece245 100644 --- a/src/funcCoreTools/uninstallFuncCoreTools.ts +++ b/src/funcCoreTools/uninstallFuncCoreTools.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext, IAzureQuickPickItem } from 'vscode-azureextensionui'; +import { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import { funcPackageName, PackageManager } from '../constants'; import { ext } from '../extensionVariables'; import { FuncVersion } from '../FuncVersion'; diff --git a/src/funcCoreTools/updateFuncCoreTools.ts b/src/funcCoreTools/updateFuncCoreTools.ts index dea40e00d..2dcfa6198 100644 --- a/src/funcCoreTools/updateFuncCoreTools.ts +++ b/src/funcCoreTools/updateFuncCoreTools.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { funcPackageName, PackageManager } from '../constants'; import { ext } from '../extensionVariables'; import { FuncVersion } from '../FuncVersion'; diff --git a/src/funcCoreTools/validateFuncCoreToolsInstalled.ts b/src/funcCoreTools/validateFuncCoreToolsInstalled.ts index b6fab5977..fdc7e7207 100644 --- a/src/funcCoreTools/validateFuncCoreToolsInstalled.ts +++ b/src/funcCoreTools/validateFuncCoreToolsInstalled.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import { MessageItem } from 'vscode'; -import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { funcVersionSetting, PackageManager } from '../constants'; import { FuncVersion, tryParseFuncVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/funcCoreTools/validateFuncCoreToolsIsLatest.ts b/src/funcCoreTools/validateFuncCoreToolsIsLatest.ts index cb3cee669..5088625a7 100644 --- a/src/funcCoreTools/validateFuncCoreToolsIsLatest.ts +++ b/src/funcCoreTools/validateFuncCoreToolsIsLatest.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from '@azure/ms-rest-js'; +import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; import * as vscode from 'vscode'; -import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext, parseError } from 'vscode-azureextensionui'; import { PackageManager } from '../constants'; import { FuncVersion, tryParseFuncVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/templates/CentralTemplateProvider.ts b/src/templates/CentralTemplateProvider.ts index 8967889bb..4eb9cc46c 100644 --- a/src/templates/CentralTemplateProvider.ts +++ b/src/templates/CentralTemplateProvider.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import { ConfigurationChangeEvent, Disposable, workspace } from 'vscode'; -import { IActionContext, parseError } from 'vscode-azureextensionui'; import { ProjectLanguage, projectTemplateKeySetting, TemplateFilter } from '../constants'; import { ext, TemplateSource } from '../extensionVariables'; import { FuncVersion } from '../FuncVersion'; diff --git a/src/templates/TemplateProviderBase.ts b/src/templates/TemplateProviderBase.ts index 99a6f31cd..e18bd6dec 100644 --- a/src/templates/TemplateProviderBase.ts +++ b/src/templates/TemplateProviderBase.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { Disposable, env } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { ProjectLanguage } from '../constants'; import { NotImplementedError } from '../errors'; import { ext } from '../extensionVariables'; diff --git a/src/templates/dotnet/DotnetTemplateProvider.ts b/src/templates/dotnet/DotnetTemplateProvider.ts index 189f4b0ed..03b930b50 100644 --- a/src/templates/dotnet/DotnetTemplateProvider.ts +++ b/src/templates/dotnet/DotnetTemplateProvider.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { RelativePattern, workspace } from 'vscode'; -import { IActionContext } from 'vscode-azureextensionui'; import { ProjectLanguage } from '../../constants'; import { ext } from '../../extensionVariables'; import { FuncVersion, getMajorVersion } from '../../FuncVersion'; diff --git a/src/templates/dotnet/executeDotnetTemplateCommand.ts b/src/templates/dotnet/executeDotnetTemplateCommand.ts index 323126084..213875e1c 100644 --- a/src/templates/dotnet/executeDotnetTemplateCommand.ts +++ b/src/templates/dotnet/executeDotnetTemplateCommand.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { coerce as semVerCoerce, SemVer } from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from "../../extensionVariables"; import { FuncVersion } from '../../FuncVersion'; import { localize } from '../../localize'; diff --git a/src/templates/dotnet/parseDotnetTemplates.ts b/src/templates/dotnet/parseDotnetTemplates.ts index 0fe94586d..b4ae04c2b 100644 --- a/src/templates/dotnet/parseDotnetTemplates.ts +++ b/src/templates/dotnet/parseDotnetTemplates.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; +import { callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import { ProjectLanguage, TemplateFilter } from '../../constants'; import { ext } from '../../extensionVariables'; import { FuncVersion } from '../../FuncVersion'; diff --git a/src/templates/java/JavaTemplateProvider.ts b/src/templates/java/JavaTemplateProvider.ts index 1551ac937..80ef84c6c 100644 --- a/src/templates/java/JavaTemplateProvider.ts +++ b/src/templates/java/JavaTemplateProvider.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { JavaBuildTool, javaBuildTool, pomXmlFileName } from '../../constants'; import { localize } from '../../localize'; import { mavenUtils } from '../../utils/mavenUtils'; diff --git a/src/templates/script/ScriptBundleTemplateProvider.ts b/src/templates/script/ScriptBundleTemplateProvider.ts index 49f6ff147..b5f3644e4 100644 --- a/src/templates/script/ScriptBundleTemplateProvider.ts +++ b/src/templates/script/ScriptBundleTemplateProvider.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext, parseError } from 'vscode-azureextensionui'; import { hostFileName } from '../../constants'; import { IBundleMetadata, parseHostJson } from '../../funcConfig/host'; import { localize } from '../../localize'; diff --git a/src/templates/script/ScriptTemplateProvider.ts b/src/templates/script/ScriptTemplateProvider.ts index c03ccb0cd..578edc1fc 100644 --- a/src/templates/script/ScriptTemplateProvider.ts +++ b/src/templates/script/ScriptTemplateProvider.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as extract from 'extract-zip'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { FuncVersion } from '../../FuncVersion'; import { bundleFeedUtils } from '../../utils/bundleFeedUtils'; diff --git a/src/tree/AzureAccountTreeItemWithProjects.ts b/src/tree/AzureAccountTreeItemWithProjects.ts index 02a7b19a5..38c2b6809 100644 --- a/src/tree/AzureAccountTreeItemWithProjects.ts +++ b/src/tree/AzureAccountTreeItemWithProjects.ts @@ -3,9 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureAccountTreeItemBase } from '@microsoft/vscode-azext-azureutils'; +import { AzExtTreeItem, callWithTelemetryAndErrorHandling, GenericTreeItem, IActionContext, ISubscriptionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { Disposable, workspace, WorkspaceFolder } from 'vscode'; -import { AzExtTreeItem, AzureAccountTreeItemBase, callWithTelemetryAndErrorHandling, GenericTreeItem, IActionContext, ISubscriptionContext } from 'vscode-azureextensionui'; import { tryGetFunctionProjectRoot } from '../commands/createNewProject/verifyIsProject'; import { getFunctionAppName, getJavaDebugSubpath } from '../commands/initProjectForVSCode/InitVSCodeStep/JavaInitVSCodeStep'; import { funcVersionSetting, hostFileName, javaBuildTool, JavaBuildTool, ProjectLanguage, projectLanguageSetting, projectSubpathSetting } from '../constants'; diff --git a/src/tree/FunctionTreeItemBase.ts b/src/tree/FunctionTreeItemBase.ts index 6adbe6945..bed06ca5f 100644 --- a/src/tree/FunctionTreeItemBase.ts +++ b/src/tree/FunctionTreeItemBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { FunctionEnvelope } from '@azure/arm-appservice'; +import { AzExtTreeItem, IActionContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import * as url from 'url'; -import { AzExtTreeItem, IActionContext, TreeItemIconPath } from 'vscode-azureextensionui'; import { HttpAuthLevel, ParsedFunctionJson } from '../funcConfig/function'; import { IParsedHostJson } from '../funcConfig/host'; import { FuncVersion } from '../FuncVersion'; @@ -21,9 +21,9 @@ export abstract class FunctionTreeItemBase extends AzExtTreeItem { protected readonly _config: ParsedFunctionJson; private _disabled: boolean; - private _func: WebSiteManagementModels.FunctionEnvelope | undefined; + private _func: FunctionEnvelope | undefined; - protected constructor(parent: FunctionsTreeItemBase, config: ParsedFunctionJson, name: string, func: WebSiteManagementModels.FunctionEnvelope | undefined) { + protected constructor(parent: FunctionsTreeItemBase, config: ParsedFunctionJson, name: string, func: FunctionEnvelope | undefined) { super(parent); this._config = config; this.name = name; diff --git a/src/tree/FunctionsTreeItemBase.ts b/src/tree/FunctionsTreeItemBase.ts index 542c3064f..5bb413a82 100644 --- a/src/tree/FunctionsTreeItemBase.ts +++ b/src/tree/FunctionsTreeItemBase.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtParentTreeItem, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import { ThemeIcon } from 'vscode'; -import { AzExtParentTreeItem, TreeItemIconPath } from 'vscode-azureextensionui'; import { localize } from '../localize'; import { IProjectTreeItem } from './IProjectTreeItem'; import { getProjectContextValue, ProjectAccess, ProjectResource } from './projectContextValues'; diff --git a/src/tree/IProjectTreeItem.ts b/src/tree/IProjectTreeItem.ts index 23338384d..bf1d8b3ea 100644 --- a/src/tree/IProjectTreeItem.ts +++ b/src/tree/IProjectTreeItem.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { IParsedHostJson } from '../funcConfig/host'; import { FuncVersion } from '../FuncVersion'; import { ProjectSource } from './projectContextValues'; diff --git a/src/tree/ProductionSlotTreeItem.ts b/src/tree/ProductionSlotTreeItem.ts index 6f9b3f41f..1ead1b059 100644 --- a/src/tree/ProductionSlotTreeItem.ts +++ b/src/tree/ProductionSlotTreeItem.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ParsedSite } from 'vscode-azureappservice'; -import { AzExtTreeItem, IActionContext } from 'vscode-azureextensionui'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { AzExtTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { SlotsTreeItem } from './SlotsTreeItem'; import { SlotTreeItem } from './SlotTreeItem'; import { SlotTreeItemBase } from './SlotTreeItemBase'; diff --git a/src/tree/SlotTreeItem.ts b/src/tree/SlotTreeItem.ts index 1740bfac8..f63dd26a6 100644 --- a/src/tree/SlotTreeItem.ts +++ b/src/tree/SlotTreeItem.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ParsedSite } from 'vscode-azureappservice'; +import { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; import { SlotsTreeItem } from './SlotsTreeItem'; import { SlotTreeItemBase } from './SlotTreeItemBase'; diff --git a/src/tree/SlotTreeItemBase.ts b/src/tree/SlotTreeItemBase.ts index 5089b0b1d..c6f6803c1 100644 --- a/src/tree/SlotTreeItemBase.ts +++ b/src/tree/SlotTreeItemBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; -import { AppSettingsTreeItem, AppSettingTreeItem, deleteSite, DeploymentsTreeItem, DeploymentTreeItem, getFile, LogFilesTreeItem, ParsedSite, SiteFilesTreeItem } from 'vscode-azureappservice'; -import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, TreeItemIconPath } from 'vscode-azureextensionui'; +import { SiteConfig, SiteSourceControl, StringDictionary } from '@azure/arm-appservice'; +import { AppSettingsTreeItem, AppSettingTreeItem, deleteSite, DeploymentsTreeItem, DeploymentTreeItem, getFile, LogFilesTreeItem, ParsedSite, SiteFilesTreeItem } from '@microsoft/vscode-azext-azureappservice'; +import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import { runFromPackageKey } from '../constants'; import { IParsedHostJson, parseHostJson } from '../funcConfig/host'; import { FuncVersion, latestGAVersion, tryParseFuncVersion } from '../FuncVersion'; @@ -98,7 +98,7 @@ export abstract class SlotTreeItemBase extends AzExtParentTreeItem implements IP let version: FuncVersion | undefined; try { const client = await this.site.createClient(context); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const appSettings: StringDictionary = await client.listApplicationSettings(); version = tryParseFuncVersion(appSettings.properties && appSettings.properties.FUNCTIONS_EXTENSION_VERSION); } catch { // ignore and use default @@ -131,13 +131,13 @@ export abstract class SlotTreeItemBase extends AzExtParentTreeItem implements IP public async getApplicationSettings(context: IActionContext): Promise { const client = await this.site.createClient(context); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const appSettings: StringDictionary = await client.listApplicationSettings(); return appSettings.properties || {}; } public async setApplicationSetting(context: IActionContext, key: string, value: string): Promise { const client = await this.site.createClient(context); - const settings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const settings: StringDictionary = await client.listApplicationSettings(); if (!settings.properties) { settings.properties = {}; } @@ -163,8 +163,8 @@ export abstract class SlotTreeItemBase extends AzExtParentTreeItem implements IP public async loadMoreChildrenImpl(_clearCache: boolean, context: IActionContext): Promise { const client = await this.site.createClient(context); - const siteConfig: WebSiteManagementModels.SiteConfig = await client.getSiteConfig(); - const sourceControl: WebSiteManagementModels.SiteSourceControl = await client.getSourceControl(); + const siteConfig: SiteConfig = await client.getSiteConfig(); + const sourceControl: SiteSourceControl = await client.getSourceControl(); this.deploymentsNode = new DeploymentsTreeItem(this, this.site, siteConfig, sourceControl); if (!this._functionsTreeItem) { @@ -207,7 +207,7 @@ export abstract class SlotTreeItemBase extends AzExtParentTreeItem implements IP public async isReadOnly(context: IActionContext): Promise { const client = await this.site.createClient(context); - const appSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings(); + const appSettings: StringDictionary = await client.listApplicationSettings(); return [runFromPackageKey, 'WEBSITE_RUN_FROM_ZIP'].some(key => appSettings.properties && envUtils.isEnvironmentVariableSet(appSettings.properties[key])); } diff --git a/src/tree/SlotsTreeItem.ts b/src/tree/SlotsTreeItem.ts index ad4005168..cecbcec8d 100644 --- a/src/tree/SlotsTreeItem.ts +++ b/src/tree/SlotsTreeItem.ts @@ -3,9 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementClient, WebSiteManagementModels } from '@azure/arm-appservice'; -import { createSlot, ParsedSite } from 'vscode-azureappservice'; -import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, ICreateChildImplContext, TreeItemIconPath } from 'vscode-azureextensionui'; +import { Site, WebSiteManagementClient } from '@azure/arm-appservice'; +import { createSlot, ParsedSite } from '@microsoft/vscode-azext-azureappservice'; +import { uiUtils } from '@microsoft/vscode-azext-azureutils'; +import { AzExtParentTreeItem, AzExtTreeItem, IActionContext, ICreateChildImplContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import { showSiteCreated } from '../commands/createFunctionApp/showSiteCreated'; import { localize } from '../localize'; import { createWebSiteClient } from '../utils/azureClients'; @@ -45,19 +46,16 @@ export class SlotsTreeItem extends AzExtParentTreeItem { } const client: WebSiteManagementClient = await createWebSiteClient([context, this]); - const webAppCollection: WebSiteManagementModels.WebAppCollection = this._nextLink ? - await client.webApps.listSlotsNext(this._nextLink) : - await client.webApps.listSlots(this.parent.site.resourceGroup, this.parent.site.siteName); - - this._nextLink = webAppCollection.nextLink; + // /~https://github.com/Azure/azure-sdk-for-js/issues/20380 + const webAppCollection: Site[] = await uiUtils.listAllIterator(client.webApps.listSlots(this.parent.site.resourceGroup, this.parent.site.siteName)); return await this.createTreeItemsWithErrorHandling( webAppCollection, 'azFuncInvalidSlot', - (site: WebSiteManagementModels.Site) => { + (site: Site) => { return new SlotTreeItem(this, new ParsedSite(site, this.subscription)); }, - (site: WebSiteManagementModels.Site) => { + (site: Site) => { return site.name; } ); @@ -65,7 +63,7 @@ export class SlotsTreeItem extends AzExtParentTreeItem { public async createChildImpl(context: ICreateChildImplContext): Promise { const existingSlots: SlotTreeItem[] = await this.getCachedChildren(context); - const newSite: WebSiteManagementModels.Site = await createSlot(this.parent.site, existingSlots.map(s => s.site), context); + const newSite: Site = await createSlot(this.parent.site, existingSlots.map(s => s.site), context); const parsedSite = new ParsedSite(newSite, this.subscription); showSiteCreated(parsedSite, context); return new SlotTreeItem(this, parsedSite); diff --git a/src/tree/SubscriptionTreeItem.ts b/src/tree/SubscriptionTreeItem.ts index 41260a89f..6de9162ea 100644 --- a/src/tree/SubscriptionTreeItem.ts +++ b/src/tree/SubscriptionTreeItem.ts @@ -3,10 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementClient, WebSiteManagementModels } from '@azure/arm-appservice'; +import { Site, WebSiteManagementClient } from '@azure/arm-appservice'; +import { AppInsightsCreateStep, AppInsightsListStep, AppKind, AppServicePlanCreateStep, CustomLocationListStep, IAppServiceWizardContext, ParsedSite, 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'; -import { AppInsightsCreateStep, AppInsightsListStep, AppKind, AppServicePlanCreateStep, CustomLocationListStep, IAppServiceWizardContext, ParsedSite, SiteNameStep, WebsiteOS } from 'vscode-azureappservice'; -import { AzExtTreeItem, AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, ICreateChildImplContext, INewStorageAccountDefaults, LocationListStep, parseError, ResourceGroupCreateStep, ResourceGroupListStep, StorageAccountCreateStep, StorageAccountKind, StorageAccountListStep, StorageAccountPerformance, StorageAccountReplication, SubscriptionTreeItemBase, VerifyProvidersStep } from 'vscode-azureextensionui'; import { FunctionAppCreateStep } from '../commands/createFunctionApp/FunctionAppCreateStep'; import { FunctionAppHostingPlanStep, setConsumptionPlanProperties } from '../commands/createFunctionApp/FunctionAppHostingPlanStep'; import { IFunctionAppWizardContext } from '../commands/createFunctionApp/IFunctionAppWizardContext'; @@ -41,12 +42,11 @@ export class SubscriptionTreeItem extends SubscriptionTreeItemBase { this._nextLink = undefined; } + // Load more currently broken /~https://github.com/Azure/azure-sdk-for-js/issues/20380 const client: WebSiteManagementClient = await createWebSiteClient([context, this]); - let webAppCollection: WebSiteManagementModels.WebAppCollection; + let webAppCollection: Site[]; try { - webAppCollection = this._nextLink ? - await client.webApps.listNext(this._nextLink) : - await client.webApps.list(); + webAppCollection = await uiUtils.listAllIterator(client.webApps.list()); } catch (error) { if (parseError(error).errorType.toLowerCase() === 'notfound') { // This error type means the 'Microsoft.Web' provider has not been registered in this subscription @@ -58,19 +58,17 @@ export class SubscriptionTreeItem extends SubscriptionTreeItemBase { } } - this._nextLink = webAppCollection.nextLink; - return await this.createTreeItemsWithErrorHandling( webAppCollection, 'azFuncInvalidFunctionApp', - (site: WebSiteManagementModels.Site) => { + (site: Site) => { const parsedSite = new ParsedSite(site, this.subscription); if (parsedSite.isFunctionApp) { return new ProductionSlotTreeItem(this, parsedSite); } return undefined; }, - (site: WebSiteManagementModels.Site) => { + (site: Site) => { return site.name; } ); diff --git a/src/tree/localProject/InitLocalProjectTreeItem.ts b/src/tree/localProject/InitLocalProjectTreeItem.ts index 9a5688f52..9a28b0380 100644 --- a/src/tree/localProject/InitLocalProjectTreeItem.ts +++ b/src/tree/localProject/InitLocalProjectTreeItem.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtParentTreeItem, AzExtTreeItem, GenericTreeItem } from '@microsoft/vscode-azext-utils'; import { ThemeIcon, WorkspaceFolder } from 'vscode'; -import { AzExtParentTreeItem, AzExtTreeItem, GenericTreeItem } from 'vscode-azureextensionui'; import { localize } from '../../localize'; import { isLocalProjectCV } from '../projectContextValues'; import { LocalProjectTreeItemBase } from './LocalProjectTreeItemBase'; diff --git a/src/tree/localProject/InvalidLocalProjectTreeItem.ts b/src/tree/localProject/InvalidLocalProjectTreeItem.ts index f78264b23..2835b8424 100644 --- a/src/tree/localProject/InvalidLocalProjectTreeItem.ts +++ b/src/tree/localProject/InvalidLocalProjectTreeItem.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtParentTreeItem, AzExtTreeItem } from '@microsoft/vscode-azext-utils'; import { WorkspaceFolder } from 'vscode'; -import { AzExtParentTreeItem, AzExtTreeItem } from 'vscode-azureextensionui'; import { LocalProjectTreeItemBase } from './LocalProjectTreeItemBase'; export class InvalidLocalProjectTreeItem extends LocalProjectTreeItemBase { diff --git a/src/tree/localProject/LocalFunctionTreeItem.ts b/src/tree/localProject/LocalFunctionTreeItem.ts index 58aabad7e..7203db2cd 100644 --- a/src/tree/localProject/LocalFunctionTreeItem.ts +++ b/src/tree/localProject/LocalFunctionTreeItem.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; -import { IActionContext } from 'vscode-azureextensionui'; +import { FunctionEnvelope } from '@azure/arm-appservice'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { ParsedFunctionJson } from '../../funcConfig/function'; import { FunctionTreeItemBase } from '../FunctionTreeItemBase'; import { LocalFunctionsTreeItem } from './LocalFunctionsTreeItem'; @@ -13,12 +13,12 @@ export class LocalFunctionTreeItem extends FunctionTreeItemBase { public readonly parent: LocalFunctionsTreeItem; public readonly functionJsonPath: string | undefined; - private constructor(parent: LocalFunctionsTreeItem, name: string, config: ParsedFunctionJson, functionJsonPath: string | undefined, func: WebSiteManagementModels.FunctionEnvelope | undefined) { + private constructor(parent: LocalFunctionsTreeItem, name: string, config: ParsedFunctionJson, functionJsonPath: string | undefined, func: FunctionEnvelope | undefined) { super(parent, config, name, func); this.functionJsonPath = functionJsonPath; } - public static async create(context: IActionContext, parent: LocalFunctionsTreeItem, name: string, config: ParsedFunctionJson, functionJsonPath: string | undefined, func: WebSiteManagementModels.FunctionEnvelope | undefined): Promise { + public static async create(context: IActionContext, parent: LocalFunctionsTreeItem, name: string, config: ParsedFunctionJson, functionJsonPath: string | undefined, func: FunctionEnvelope | undefined): Promise { const ti: LocalFunctionTreeItem = new LocalFunctionTreeItem(parent, name, config, functionJsonPath, func); await ti.initAsync(context); return ti; diff --git a/src/tree/localProject/LocalFunctionsTreeItem.ts b/src/tree/localProject/LocalFunctionsTreeItem.ts index bd6ae5c79..8fad0c3d9 100644 --- a/src/tree/localProject/LocalFunctionsTreeItem.ts +++ b/src/tree/localProject/LocalFunctionsTreeItem.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { FunctionEnvelope } from '@azure/arm-appservice'; +import { AzExtTreeItem, GenericTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { ThemeIcon } from 'vscode'; -import { AzExtTreeItem, GenericTreeItem, IActionContext } from 'vscode-azureextensionui'; import { functionJsonFileName } from '../../constants'; import { ParsedFunctionJson } from '../../funcConfig/function'; import { runningFuncTaskMap } from '../../funcCoreTools/funcHostTask'; @@ -87,11 +87,11 @@ export class LocalFunctionsTreeItem extends FunctionsTreeItemBase { rejectUnauthorized: hostRequest.rejectUnauthorized }); return await this.createTreeItemsWithErrorHandling( - functions.parsedBody, + functions.parsedBody, 'azFuncInvalidLocalFunction', async func => { func = requestUtils.convertToAzureSdkObject(func); - return LocalFunctionTreeItem.create(context, this, nonNullProp(func, 'name'), func.config, undefined, func); + return LocalFunctionTreeItem.create(context, this, nonNullProp(func, 'name'), new ParsedFunctionJson(func.config), undefined, func); }, func => func.name ); diff --git a/src/tree/localProject/LocalProjectTreeItem.ts b/src/tree/localProject/LocalProjectTreeItem.ts index e3e9a79b5..cc2b87901 100644 --- a/src/tree/localProject/LocalProjectTreeItem.ts +++ b/src/tree/localProject/LocalProjectTreeItem.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtParentTreeItem, AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import { Disposable, Task, tasks, TaskScope, WorkspaceFolder } from 'vscode'; -import { AzExtParentTreeItem, AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; import { onDotnetFuncTaskReady } from '../../commands/pickFuncProcess'; import { functionJsonFileName, hostFileName, localSettingsFileName, ProjectLanguage } from '../../constants'; import { IParsedHostJson, parseHostJson } from '../../funcConfig/host'; diff --git a/src/tree/localProject/LocalProjectTreeItemBase.ts b/src/tree/localProject/LocalProjectTreeItemBase.ts index bfd7af580..bbce29d3c 100644 --- a/src/tree/localProject/LocalProjectTreeItemBase.ts +++ b/src/tree/localProject/LocalProjectTreeItemBase.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtParentTreeItem, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import { WorkspaceFolder } from 'vscode'; -import { AzExtParentTreeItem, TreeItemIconPath } from 'vscode-azureextensionui'; import { localize } from '../../localize'; import { treeUtils } from '../../utils/treeUtils'; diff --git a/src/tree/localProject/createRefreshFileWatcher.ts b/src/tree/localProject/createRefreshFileWatcher.ts index 51052b33a..245d49484 100644 --- a/src/tree/localProject/createRefreshFileWatcher.ts +++ b/src/tree/localProject/createRefreshFileWatcher.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from '@microsoft/vscode-azext-utils'; import { Disposable, FileSystemWatcher, workspace } from 'vscode'; -import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext } from 'vscode-azureextensionui'; export function createRefreshFileWatcher(ti: AzExtTreeItem, globPattern: string): Disposable { const refreshMethod: () => Promise = async (): Promise => { diff --git a/src/tree/remoteProject/RemoteFunctionTreeItem.ts b/src/tree/remoteProject/RemoteFunctionTreeItem.ts index 94980fc2d..0da19e4d5 100644 --- a/src/tree/remoteProject/RemoteFunctionTreeItem.ts +++ b/src/tree/remoteProject/RemoteFunctionTreeItem.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { FunctionEnvelope, HostKeys } from '@azure/arm-appservice'; +import { IFunctionKeys } from '@microsoft/vscode-azext-azureappservice'; +import { DialogResponses, IActionContext, parseError } from '@microsoft/vscode-azext-utils'; import { ProgressLocation, window } from 'vscode'; -import { IFunctionKeys } from 'vscode-azureappservice'; -import { DialogResponses, IActionContext, parseError } from 'vscode-azureextensionui'; import { ext } from '../../extensionVariables'; import { HttpAuthLevel, ParsedFunctionJson } from '../../funcConfig/function'; import { localize } from '../../localize'; @@ -17,11 +17,11 @@ import { RemoteFunctionsTreeItem } from './RemoteFunctionsTreeItem'; export class RemoteFunctionTreeItem extends FunctionTreeItemBase { public readonly parent: RemoteFunctionsTreeItem; - private constructor(parent: RemoteFunctionsTreeItem, config: ParsedFunctionJson, name: string, func: WebSiteManagementModels.FunctionEnvelope) { + private constructor(parent: RemoteFunctionsTreeItem, config: ParsedFunctionJson, name: string, func: FunctionEnvelope) { super(parent, config, name, func); } - public static async create(context: IActionContext, parent: RemoteFunctionsTreeItem, func: WebSiteManagementModels.FunctionEnvelope): Promise { + public static async create(context: IActionContext, parent: RemoteFunctionsTreeItem, func: FunctionEnvelope): Promise { const config: ParsedFunctionJson = new ParsedFunctionJson(func.config); const name: string = getFunctionNameFromId(nonNullProp(func, 'id')); const ti: RemoteFunctionTreeItem = new RemoteFunctionTreeItem(parent, config, name, func); @@ -70,7 +70,7 @@ export class RemoteFunctionTreeItem extends FunctionTreeItemBase { } } - const hostKeys: WebSiteManagementModels.HostKeys = await client.listHostKeys(); + const hostKeys: HostKeys = await client.listHostKeys(); return nonNullProp(hostKeys, 'masterKey'); } } diff --git a/src/tree/remoteProject/RemoteFunctionsTreeItem.ts b/src/tree/remoteProject/RemoteFunctionsTreeItem.ts index 745c07916..032dc783c 100644 --- a/src/tree/remoteProject/RemoteFunctionsTreeItem.ts +++ b/src/tree/remoteProject/RemoteFunctionsTreeItem.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels } from '@azure/arm-appservice'; +import { FunctionEnvelope } from '@azure/arm-appservice'; +import { AzExtTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import { isArray } from 'util'; -import { AzExtTreeItem, IActionContext } from 'vscode-azureextensionui'; import { localize } from '../../localize'; import { delay } from '../../utils/delay'; import { FunctionsTreeItemBase } from '../FunctionsTreeItemBase'; @@ -43,13 +43,12 @@ export class RemoteFunctionsTreeItem extends FunctionsTreeItemBase { } const client = await this.parent.site.createClient(context); - let funcs: WebSiteManagementModels.FunctionEnvelopeCollection; + let funcs: FunctionEnvelope[]; const maxTime = Date.now() + 2 * 60 * 1000; let attempt = 1; while (true) { - funcs = this._nextLink ? - await client.listFunctionsNext(this._nextLink) : - await client.listFunctions(); + // Load more currently broken /~https://github.com/Azure/azure-sdk-for-js/issues/20380 + funcs = await client.listFunctions(); // /~https://github.com/Azure/azure-functions-host/issues/3502 if (!isArray(funcs)) { @@ -66,20 +65,18 @@ export class RemoteFunctionsTreeItem extends FunctionsTreeItemBase { } } - this._nextLink = funcs.nextLink; - return await this.createTreeItemsWithErrorHandling( funcs, 'azFuncInvalidFunction', - async (fe: WebSiteManagementModels.FunctionEnvelope) => await RemoteFunctionTreeItem.create(context, this, fe), - (fe: WebSiteManagementModels.FunctionEnvelope) => { + async (fe: FunctionEnvelope) => await RemoteFunctionTreeItem.create(context, this, fe), + (fe: FunctionEnvelope) => { return fe.id ? getFunctionNameFromId(fe.id) : undefined; } ); } } -function isWarmupFunction(func: WebSiteManagementModels.FunctionEnvelope): boolean { +function isWarmupFunction(func: FunctionEnvelope): boolean { try { return !!func.id && getFunctionNameFromId(func.id).toLowerCase() === 'warmup'; } catch { diff --git a/src/utils/azure.ts b/src/utils/azure.ts index 7a014a23c..1c1c5476a 100644 --- a/src/utils/azure.ts +++ b/src/utils/azure.ts @@ -3,9 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { StorageManagementClient, StorageManagementModels } from '@azure/arm-storage'; +import { StorageAccount, StorageAccountListKeysResult, StorageManagementClient } from '@azure/arm-storage'; +import { IStorageAccountWizardContext } from '@microsoft/vscode-azext-azureutils'; +import { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import { isArray } from 'util'; -import { IActionContext, IAzureQuickPickItem, IStorageAccountWizardContext } from 'vscode-azureextensionui'; import { localize } from '../localize'; import { createStorageClient } from './azureClients'; import { nonNullProp, nonNullValue } from './nonNull'; @@ -64,11 +65,11 @@ export interface IResourceResult { export async function getStorageConnectionString(context: IStorageAccountWizardContext): Promise { const client: StorageManagementClient = await createStorageClient(context); - const storageAccount: StorageManagementModels.StorageAccount = nonNullProp(context, 'storageAccount'); + const storageAccount: StorageAccount = nonNullProp(context, 'storageAccount'); const name: string = nonNullProp(storageAccount, 'name'); const resourceGroup: string = getResourceGroupFromId(nonNullProp(storageAccount, 'id')); - const result: StorageManagementModels.StorageAccountListKeysResult = await client.storageAccounts.listKeys(resourceGroup, name); + const result: StorageAccountListKeysResult = await client.storageAccounts.listKeys(resourceGroup, name); const key: string = nonNullProp(nonNullValue(nonNullProp(result, 'keys')[0], 'keys[0]'), 'value'); let endpointSuffix: string = nonNullProp(context.environment, 'storageEndpointSuffix'); diff --git a/src/utils/azureClients.ts b/src/utils/azureClients.ts index fa4b8fb91..1bc07bcb5 100644 --- a/src/utils/azureClients.ts +++ b/src/utils/azureClients.ts @@ -9,7 +9,7 @@ import { CosmosDBManagementClient } from '@azure/arm-cosmosdb'; import { EventHubManagementClient } from '@azure/arm-eventhub'; import { ServiceBusManagementClient } from '@azure/arm-servicebus'; import { StorageManagementClient } from '@azure/arm-storage'; -import { AzExtClientContext, createAzureClient } from 'vscode-azureextensionui'; +import { AzExtClientContext, createAzureClient } from '@microsoft/vscode-azext-azureutils'; // Lazy-load @azure packages to improve startup performance. // NOTE: The client is the only import that matters, the rest of the types disappear when compiled to JavaScript diff --git a/src/utils/bundleFeedUtils.ts b/src/utils/bundleFeedUtils.ts index b8fe9fe19..32874beb6 100644 --- a/src/utils/bundleFeedUtils.ts +++ b/src/utils/bundleFeedUtils.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext, TemplateSource } from '../extensionVariables'; import { IBundleMetadata, IHostJsonV2 } from '../funcConfig/host'; import { localize } from '../localize'; diff --git a/src/utils/cliFeedUtils.ts b/src/utils/cliFeedUtils.ts index 80e301fc4..4719c4610 100644 --- a/src/utils/cliFeedUtils.ts +++ b/src/utils/cliFeedUtils.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as semver from 'semver'; -import { IActionContext } from 'vscode-azureextensionui'; import { ext, TemplateSource } from '../extensionVariables'; import { FuncVersion, getMajorVersion } from '../FuncVersion'; import { localize } from '../localize'; diff --git a/src/utils/cpUtils.ts b/src/utils/cpUtils.ts index 94c477a6b..768d1f155 100644 --- a/src/utils/cpUtils.ts +++ b/src/utils/cpUtils.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IAzExtOutputChannel } from '@microsoft/vscode-azext-utils'; import * as cp from 'child_process'; import * as os from 'os'; -import { IAzExtOutputChannel } from 'vscode-azureextensionui'; import { localize } from '../localize'; export namespace cpUtils { diff --git a/src/utils/dotnetUtils.ts b/src/utils/dotnetUtils.ts index 0c20434f0..0c6497946 100644 --- a/src/utils/dotnetUtils.ts +++ b/src/utils/dotnetUtils.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { ProjectLanguage } from '../constants'; import { FuncVersion } from '../FuncVersion'; import { localize } from "../localize"; diff --git a/src/utils/feedUtils.ts b/src/utils/feedUtils.ts index c25a2e9f4..057e5c439 100644 --- a/src/utils/feedUtils.ts +++ b/src/utils/feedUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from '@azure/ms-rest-js'; -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; import { nonNullProp } from './nonNull'; import { parseJson } from './parseJson'; import { requestUtils } from './requestUtils'; diff --git a/src/utils/fs.ts b/src/utils/fs.ts index f72f9e058..93c941097 100644 --- a/src/utils/fs.ts +++ b/src/utils/fs.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext, parseError } from "@microsoft/vscode-azext-utils"; import * as crypto from "crypto"; import * as fse from 'fs-extra'; import * as path from 'path'; import { MessageItem } from "vscode"; -import { DialogResponses, IActionContext, parseError } from "vscode-azureextensionui"; import { localize } from "../localize"; export async function writeFormattedJson(fsPath: string, data: object): Promise { diff --git a/src/utils/gradleUtils.ts b/src/utils/gradleUtils.ts index 0da08d188..eb9e4802c 100644 --- a/src/utils/gradleUtils.ts +++ b/src/utils/gradleUtils.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from "@microsoft/vscode-azext-utils"; import * as vscode from 'vscode'; -import { IActionContext } from "vscode-azureextensionui"; import { localize } from '../localize'; import { cpUtils } from './cpUtils'; diff --git a/src/utils/javaUtils.ts b/src/utils/javaUtils.ts index 71b9ef265..8076efb8e 100644 --- a/src/utils/javaUtils.ts +++ b/src/utils/javaUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse } from "@azure/ms-rest-js"; -import { IActionContext } from "vscode-azureextensionui"; +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { nonNullProp } from "./nonNull"; import { requestUtils } from "./requestUtils"; diff --git a/src/utils/mavenUtils.ts b/src/utils/mavenUtils.ts index ad612ada0..64795bcdf 100644 --- a/src/utils/mavenUtils.ts +++ b/src/utils/mavenUtils.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext, IAzExtOutputChannel, TelemetryProperties } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as vscode from 'vscode'; -import { DialogResponses, IActionContext, IAzExtOutputChannel, TelemetryProperties } from "vscode-azureextensionui"; import * as xml2js from 'xml2js'; import { localize } from '../localize'; import { cpUtils } from './cpUtils'; diff --git a/src/utils/requestUtils.ts b/src/utils/requestUtils.ts index b183a5c58..180713c2d 100644 --- a/src/utils/requestUtils.ts +++ b/src/utils/requestUtils.ts @@ -4,9 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { HttpOperationResponse, RequestPrepareOptions, ServiceClient, WebResource } from "@azure/ms-rest-js"; +import { AzExtRequestPrepareOptions, createGenericClient, sendRequestWithTimeout } from '@microsoft/vscode-azext-azureutils'; +import { IActionContext, parseError } from "@microsoft/vscode-azext-utils"; import * as fse from 'fs-extra'; import * as path from 'path'; -import { AzExtRequestPrepareOptions, createGenericClient, IActionContext, parseError, sendRequestWithTimeout } from "vscode-azureextensionui"; import { ext } from '../extensionVariables'; import { localize } from '../localize'; import { getWorkspaceSetting } from "../vsCodeConfig/settings"; diff --git a/src/utils/telemetryUtils.ts b/src/utils/telemetryUtils.ts index 3b063694d..5c494b549 100644 --- a/src/utils/telemetryUtils.ts +++ b/src/utils/telemetryUtils.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IActionContext } from 'vscode-azureextensionui'; +import { IActionContext } from '@microsoft/vscode-azext-utils'; export namespace telemetryUtils { export async function runWithDurationTelemetry(context: IActionContext, prefix: string, callback: () => Promise): Promise { diff --git a/src/utils/treeUtils.ts b/src/utils/treeUtils.ts index a952b6b7d..d469226c3 100644 --- a/src/utils/treeUtils.ts +++ b/src/utils/treeUtils.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; -import { TreeItemIconPath } from 'vscode-azureextensionui'; import { ext } from '../extensionVariables'; export namespace treeUtils { diff --git a/src/utils/verifyExtensionBundle.ts b/src/utils/verifyExtensionBundle.ts index ddfa21f14..702e92f2f 100644 --- a/src/utils/verifyExtensionBundle.ts +++ b/src/utils/verifyExtensionBundle.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; -import { IActionContext } from 'vscode-azureextensionui'; import { IBindingWizardContext } from '../commands/addBinding/IBindingWizardContext'; import { IFunctionWizardContext } from '../commands/createFunction/IFunctionWizardContext'; import { extensionsCsprojFileName, extInstallCommand, hostFileName, ProjectLanguage, settingsFileName, tasksFileName, vscodeFolderName } from '../constants'; diff --git a/src/utils/workspace.ts b/src/utils/workspace.ts index 35cdbf5a9..ced6850a8 100644 --- a/src/utils/workspace.ts +++ b/src/utils/workspace.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import * as globby from 'globby'; import * as path from 'path'; import * as vscode from 'vscode'; -import { IActionContext, IAzureQuickPickItem } from 'vscode-azureextensionui'; import { localize } from '../localize'; import * as fsUtils from './fs'; diff --git a/src/vsCodeConfig/promptToReinitializeProject.ts b/src/vsCodeConfig/promptToReinitializeProject.ts index ac1974119..233ea9d60 100644 --- a/src/vsCodeConfig/promptToReinitializeProject.ts +++ b/src/vsCodeConfig/promptToReinitializeProject.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { initProjectForVSCode } from '../commands/initProjectForVSCode/initProjectForVSCode'; import { localize } from '../localize'; import { getWorkspaceSetting, updateWorkspaceSetting } from './settings'; diff --git a/src/vsCodeConfig/settings.ts b/src/vsCodeConfig/settings.ts index e01716a35..5ab41af18 100644 --- a/src/vsCodeConfig/settings.ts +++ b/src/vsCodeConfig/settings.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { IActionContext } from "@microsoft/vscode-azext-utils"; import { ConfigurationTarget, Uri, workspace, WorkspaceConfiguration, WorkspaceFolder } from "vscode"; -import { IActionContext } from "vscode-azureextensionui"; import { ProjectLanguage } from '../constants'; import { ext } from "../extensionVariables"; import { dotnetUtils } from "../utils/dotnetUtils"; diff --git a/src/vsCodeConfig/verifyInitForVSCode.ts b/src/vsCodeConfig/verifyInitForVSCode.ts index e8214c4ca..dee008538 100644 --- a/src/vsCodeConfig/verifyInitForVSCode.ts +++ b/src/vsCodeConfig/verifyInitForVSCode.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import { initProjectForVSCode } from '../commands/initProjectForVSCode/initProjectForVSCode'; import { funcVersionSetting, ProjectLanguage, projectLanguageSetting } from '../constants'; import { FuncVersion, tryParseFuncVersion } from '../FuncVersion'; diff --git a/src/vsCodeConfig/verifyPythonVenv.ts b/src/vsCodeConfig/verifyPythonVenv.ts index 92467959b..bec8563ca 100644 --- a/src/vsCodeConfig/verifyPythonVenv.ts +++ b/src/vsCodeConfig/verifyPythonVenv.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureWizard, DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as fse from 'fs-extra'; import * as path from 'path'; import * as vscode from 'vscode'; -import { AzureWizard, DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { IPythonVenvWizardContext } from '../commands/createNewProject/pythonSteps/IPythonVenvWizardContext'; import { PythonAliasListStep } from '../commands/createNewProject/pythonSteps/PythonAliasListStep'; import { PythonVenvCreateStep } from '../commands/createNewProject/pythonSteps/PythonVenvCreateStep'; diff --git a/src/vsCodeConfig/verifyTargetFramework.ts b/src/vsCodeConfig/verifyTargetFramework.ts index 2cecdc8b4..ff135f5f9 100644 --- a/src/vsCodeConfig/verifyTargetFramework.ts +++ b/src/vsCodeConfig/verifyTargetFramework.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; -import { DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { deploySubpathSetting, ProjectLanguage } from '../constants'; import { localize } from '../localize'; import { dotnetUtils } from '../utils/dotnetUtils'; diff --git a/src/vsCodeConfig/verifyVSCodeConfigOnActivate.ts b/src/vsCodeConfig/verifyVSCodeConfigOnActivate.ts index ecf80dc50..c38018631 100644 --- a/src/vsCodeConfig/verifyVSCodeConfigOnActivate.ts +++ b/src/vsCodeConfig/verifyVSCodeConfigOnActivate.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; import * as vscode from 'vscode'; -import { callWithTelemetryAndErrorHandling, DialogResponses, IActionContext } from 'vscode-azureextensionui'; import { tryGetFunctionProjectRoot } from '../commands/createNewProject/verifyIsProject'; import { initProjectForVSCode } from '../commands/initProjectForVSCode/initProjectForVSCode'; import { funcVersionSetting, ProjectLanguage, projectLanguageSetting, TemplateFilter } from '../constants'; diff --git a/test/addBinding.test.ts b/test/addBinding.test.ts index 8b07087c3..2095d04d1 100644 --- a/test/addBinding.test.ts +++ b/test/addBinding.test.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzExtTreeItem } from '@microsoft/vscode-azext-utils'; import * as assert from 'assert'; import * as fse from 'fs-extra'; import * as path from 'path'; import { Uri } from 'vscode'; import { createTestActionContext, runWithTestActionContext } from 'vscode-azureextensiondev'; -import { AzExtTreeItem } from 'vscode-azureextensionui'; import { addBinding, createNewProjectInternal, ext, getRandomHexString, IFunctionBinding, IFunctionJson, ProjectLanguage } from '../extension.bundle'; import { cleanTestWorkspace, getTestWorkspaceFolder } from './global.test'; diff --git a/test/api.test.ts b/test/api.test.ts index eecc137b2..65a720cd8 100644 --- a/test/api.test.ts +++ b/test/api.test.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { AzureExtensionApiProvider } from "@microsoft/vscode-azext-utils/api"; import * as path from 'path'; import { Extension, extensions } from "vscode"; import { runWithInputs } from 'vscode-azureextensiondev'; -import { AzureExtensionApiProvider } from "vscode-azureextensionui/api"; import { nonNullValue, ProjectLanguage, registerOnActionStartHandler } from '../extension.bundle'; // eslint-disable-next-line no-restricted-imports import { AzureFunctionsExtensionApi } from '../src/vscode-azurefunctions.api'; diff --git a/test/nightly/functionAppOperations.test.ts b/test/nightly/functionAppOperations.test.ts index 24bb4a784..b0f2532d2 100644 --- a/test/nightly/functionAppOperations.test.ts +++ b/test/nightly/functionAppOperations.test.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WebSiteManagementModels as Models } from '@azure/arm-appservice'; +import { Site } from '@azure/arm-appservice'; +import { tryGetWebApp } from '@microsoft/vscode-azext-azureappservice'; import * as assert from 'assert'; import * as vscode from 'vscode'; -import { tryGetWebApp } from 'vscode-azureappservice'; import { runWithInputs, runWithTestActionContext } from 'vscode-azureextensiondev'; import { createFunctionAppAdvanced, deleteFunctionApp, DialogResponses, getRandomHexString, ProjectLanguage, registerOnActionStartHandler } from '../../extension.bundle'; import { cleanTestWorkspace, longRunningTestsEnabled } from '../global.test'; @@ -48,7 +48,7 @@ suite('Function App Operations', function (this: Mocha.Suite): void { await createFunctionAppAdvanced(context); }); }); - const createdApp: Models.Site | undefined = await tryGetWebApp(testClient, rgName, appName); + const createdApp: Site | undefined = await tryGetWebApp(testClient, rgName, appName); assert.ok(createdApp); }); @@ -59,7 +59,7 @@ suite('Function App Operations', function (this: Mocha.Suite): void { await createFunctionAppAdvanced(context); }); }); - const createdApp: Models.Site | undefined = await tryGetWebApp(testClient, rgName, app2Name); + const createdApp: Site | undefined = await tryGetWebApp(testClient, rgName, app2Name); assert.ok(createdApp); }); @@ -74,7 +74,7 @@ suite('Function App Operations', function (this: Mocha.Suite): void { await runWithFuncSetting('projectLanguage', ProjectLanguage.JavaScript, async () => { await runWithInputs(commandId, inputs, registerOnActionStartHandler, async () => { const actualFuncAppId: string = await vscode.commands.executeCommand(commandId, testAccount.getSubscriptionContext().subscriptionId, apiRgName); - const site: Models.Site | undefined = await tryGetWebApp(testClient, apiRgName, apiAppName); + const site: Site | undefined = await tryGetWebApp(testClient, apiRgName, apiAppName); assert.ok(site); assert.equal(actualFuncAppId, site.id); }); @@ -87,7 +87,7 @@ suite('Function App Operations', function (this: Mocha.Suite): void { await deleteFunctionApp(context); }); }); - const site: Models.Site | undefined = await tryGetWebApp(testClient, rgName, appName); + const site: Site | undefined = await tryGetWebApp(testClient, rgName, appName); assert.equal(site, undefined); }); @@ -97,7 +97,7 @@ suite('Function App Operations', function (this: Mocha.Suite): void { await deleteFunctionApp(context); }); }); - const site: Models.Site | undefined = await tryGetWebApp(testClient, rgName, app2Name); + const site: Site | undefined = await tryGetWebApp(testClient, rgName, app2Name); assert.equal(site, undefined); }); });