@microsoft/teamsfx-core 2.0.0-alpha.df941b6ed.0 → 2.0.0-alpha.e49547890.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/armInterface.d.ts +0 -5
- package/build/common/armInterface.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +6 -6
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +14 -7
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +6 -5
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +13 -9
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +12 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +11 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +6 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +20 -40
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +208 -295
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts +3 -3
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +4 -6
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts +0 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -21
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/fileHelper.d.ts +4 -0
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -0
- package/build/common/deps-checker/util/fileHelper.js +45 -0
- package/build/common/deps-checker/util/fileHelper.js.map +1 -0
- package/build/common/local/constants.d.ts +7 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +7 -0
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +2 -3
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/m365/errors.d.ts +1 -1
- package/build/common/m365/errors.d.ts.map +1 -1
- package/build/common/m365/errors.js +7 -7
- package/build/common/m365/errors.js.map +1 -1
- package/build/common/m365/launchHelper.js +2 -2
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +23 -0
- package/build/common/samples.js +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +1 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +1 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.d.ts +1 -0
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +6 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/versionMetadata.d.ts +5 -0
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +11 -0
- package/build/common/versionMetadata.js.map +1 -1
- package/build/component/code/utils.d.ts +3 -0
- package/build/component/code/utils.d.ts.map +1 -1
- package/build/component/code/utils.js +19 -8
- package/build/component/code/utils.js.map +1 -1
- package/build/component/configManager/diagnostic.d.ts +9 -0
- package/build/component/configManager/diagnostic.d.ts.map +1 -0
- package/build/component/configManager/diagnostic.js +47 -0
- package/build/component/configManager/diagnostic.js.map +1 -0
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +11 -5
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/constants.d.ts +7 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +60 -26
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -2
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +57 -72
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/debugHandler/appManifest.js +2 -1
- package/build/component/debugHandler/appManifest.js.map +1 -1
- package/build/component/debugHandler/error.d.ts +0 -1
- package/build/component/debugHandler/error.d.ts.map +1 -1
- package/build/component/debugHandler/error.js +1 -5
- package/build/component/debugHandler/error.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +4 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +5 -5
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +5 -14
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +3 -4
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/add/utility/constants.d.ts +1 -1
- package/build/component/driver/add/utility/constants.d.ts.map +1 -1
- package/build/component/driver/add/utility/constants.js +1 -1
- package/build/component/driver/add/utility/constants.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +4 -1
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/validator.d.ts.map +1 -1
- package/build/component/driver/arm/validator.js +0 -15
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +5 -6
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +1 -2
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +10 -17
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +3 -3
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +13 -13
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +2 -3
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +45 -13
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +6 -0
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/constant.d.ts.map +1 -0
- package/build/component/driver/devTool/constant.js.map +1 -0
- package/build/component/driver/devTool/error/dotnetInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/dotnetInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/{prerequisite → devTool}/error/dotnetInstallationUserError.js +2 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -0
- package/build/component/driver/devTool/error/funcInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/funcInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/{prerequisite → devTool}/error/funcInstallationUserError.js +2 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js.map +1 -0
- package/build/component/driver/{prerequisite → devTool}/installDriver.d.ts +1 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -0
- package/build/component/driver/{prerequisite → devTool}/installDriver.js +46 -17
- package/build/component/driver/devTool/installDriver.js.map +1 -0
- package/build/component/driver/{prerequisite → devTool}/interfaces/InstallToolArgs.d.ts +5 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.js.map +1 -0
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.d.ts +5 -0
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.d.ts.map +1 -0
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.js +22 -0
- package/build/component/driver/error/outputEnvironmentVariableUndefinedError.js.map +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +1 -2
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +1 -2
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -1
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -1
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +5 -6
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +14 -6
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +4 -2
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -11
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidateManifestArgs.d.ts +5 -0
- package/build/component/driver/teamsApp/interfaces/ValidateManifestArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +0 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +54 -20
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +80 -13
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/util/wrapUtil.js +1 -1
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/error/deployError.d.ts +0 -17
- package/build/component/error/deployError.d.ts.map +1 -1
- package/build/component/error/deployError.js +0 -80
- package/build/component/error/deployError.js.map +1 -1
- package/build/component/feature/apiconnector/errors.d.ts +0 -4
- package/build/component/feature/apiconnector/errors.d.ts.map +1 -1
- package/build/component/feature/apiconnector/errors.js +12 -16
- package/build/component/feature/apiconnector/errors.js.map +1 -1
- package/build/component/feature/bot/bot.js +8 -8
- package/build/component/feature/bot/bot.js.map +1 -1
- package/build/component/feature/bot/question.d.ts +6 -6
- package/build/component/feature/bot/question.d.ts.map +1 -1
- package/build/component/feature/bot/question.js +69 -38
- package/build/component/feature/bot/question.js.map +1 -1
- package/build/component/generator/constant.d.ts +2 -0
- package/build/component/generator/constant.d.ts.map +1 -1
- package/build/component/generator/constant.js +3 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/error.d.ts +9 -0
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +19 -1
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +25 -8
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +5 -2
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +20 -10
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/question.d.ts.map +1 -1
- package/build/component/generator/officeAddin/question.js +3 -3
- package/build/component/generator/officeAddin/question.js.map +1 -1
- package/build/component/generator/utils.d.ts +2 -0
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +64 -2
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +3 -2
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -2
- package/build/component/messages.js.map +1 -1
- package/build/component/question.d.ts +1 -0
- package/build/component/question.d.ts.map +1 -1
- package/build/component/question.js +15 -11
- package/build/component/question.js.map +1 -1
- package/build/component/resource/appManifest/appManifest.d.ts.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +3 -4
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +8 -12
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/constants.d.ts +1 -0
- package/build/component/resource/appManifest/constants.d.ts.map +1 -1
- package/build/component/resource/appManifest/constants.js +1 -0
- package/build/component/resource/appManifest/constants.js.map +1 -1
- package/build/component/resource/appManifest/errors.d.ts +0 -4
- package/build/component/resource/appManifest/errors.d.ts.map +1 -1
- package/build/component/resource/appManifest/errors.js +0 -7
- package/build/component/resource/appManifest/errors.js.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.d.ts +2 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.js +9 -14
- package/build/component/resource/appManifest/utils/ManifestUtils.js.map +1 -1
- package/build/component/resource/appManifest/utils/telemetry.d.ts +2 -0
- package/build/component/resource/appManifest/utils/telemetry.d.ts.map +1 -1
- package/build/component/resource/appManifest/utils/telemetry.js +2 -0
- package/build/component/resource/appManifest/utils/telemetry.js.map +1 -1
- package/build/component/resource/appManifest/utils/utils.d.ts.map +1 -1
- package/build/component/resource/appManifest/utils/utils.js +5 -1
- package/build/component/resource/appManifest/utils/utils.js.map +1 -1
- package/build/component/resource/azureSql/errors.js +28 -28
- package/build/component/resource/azureSql/errors.js.map +1 -1
- package/build/component/resource/azureStorage/configs.d.ts +1 -1
- package/build/component/resource/spfx/utils/question-helper.js +1 -1
- package/build/component/resource/spfx/utils/question-helper.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +1 -6
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +65 -131
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/azureSdkErrorHandler.d.ts +2 -1
- package/build/component/utils/azureSdkErrorHandler.d.ts.map +1 -1
- package/build/component/utils/azureSdkErrorHandler.js.map +1 -1
- package/build/component/utils/depsChecker/bicepChecker.d.ts.map +1 -1
- package/build/component/utils/depsChecker/bicepChecker.js +4 -7
- package/build/component/utils/depsChecker/bicepChecker.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +5 -8
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.js +2 -2
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +3 -3
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/core/FxCore.d.ts +89 -31
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +144 -607
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +12 -3
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +88 -31
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +2 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +1 -13
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +1 -57
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +3 -10
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.d.ts +1 -10
- package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +1 -207
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +3 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +81 -35
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts +0 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +110 -32
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -0
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts +2 -0
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +12 -8
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts +1 -0
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +134 -37
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.d.ts +1 -0
- package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/migrationContext.js +1 -0
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts +9 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +49 -18
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/question.d.ts +10 -3
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +181 -90
- package/build/core/question.js.map +1 -1
- package/build/core/types.d.ts +3 -3
- package/build/core/types.d.ts.map +1 -1
- package/build/error/arm.d.ts +6 -0
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +17 -1
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +30 -0
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +81 -1
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +14 -2
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +59 -11
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +28 -0
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +100 -1
- package/build/error/deploy.js.map +1 -1
- package/build/error/script.d.ts +14 -0
- package/build/error/script.d.ts.map +1 -0
- package/build/error/script.js +38 -0
- package/build/error/script.js.map +1 -0
- package/build/error/upgrade.d.ts +5 -0
- package/build/error/upgrade.d.ts.map +1 -0
- package/build/error/upgrade.js +16 -0
- package/build/error/upgrade.js.map +1 -0
- package/build/error/yml.d.ts +1 -1
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +5 -5
- package/build/error/yml.js.map +1 -1
- package/package.json +13 -8
- package/resource/package.nls.cs.json +307 -366
- package/resource/package.nls.de.json +307 -366
- package/resource/package.nls.es.json +307 -366
- package/resource/package.nls.fr.json +307 -366
- package/resource/package.nls.it.json +307 -366
- package/resource/package.nls.ja.json +307 -366
- package/resource/package.nls.json +118 -112
- package/resource/package.nls.ko.json +307 -366
- package/resource/package.nls.pl.json +307 -366
- package/resource/package.nls.pt-BR.json +307 -366
- package/resource/package.nls.ru.json +307 -366
- package/resource/package.nls.tr.json +307 -366
- package/resource/package.nls.zh-Hans.json +307 -366
- package/resource/package.nls.zh-Hant.json +307 -366
- package/resource/yaml.schema.json +33 -12
- package/templates/core/v3Migration/csharp.app.local.yml +13 -20
- package/templates/core/v3Migration/csharp.app.yml +20 -9
- package/templates/core/v3Migration/js.ts.app.local.yml +105 -53
- package/templates/core/v3Migration/js.ts.app.yml +149 -54
- package/templates/core/v3Migration/spfx.app.yml +61 -17
- package/templates/core/v3Migration/upgradeReport.md +4 -2
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/SSO/SsoOperations.cs +23 -8
- package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor +2 -1
- package/build/component/driver/aad/error/invalidParameterUserError.d.ts +0 -5
- package/build/component/driver/aad/error/invalidParameterUserError.d.ts.map +0 -1
- package/build/component/driver/aad/error/invalidParameterUserError.js +0 -29
- package/build/component/driver/aad/error/invalidParameterUserError.js.map +0 -1
- package/build/component/driver/aad/error/unhandledError.d.ts +0 -8
- package/build/component/driver/aad/error/unhandledError.d.ts.map +0 -1
- package/build/component/driver/aad/error/unhandledError.js +0 -33
- package/build/component/driver/aad/error/unhandledError.js.map +0 -1
- package/build/component/driver/botAadApp/error/invalidParameterUserError.d.ts +0 -5
- package/build/component/driver/botAadApp/error/invalidParameterUserError.d.ts.map +0 -1
- package/build/component/driver/botAadApp/error/invalidParameterUserError.js +0 -30
- package/build/component/driver/botAadApp/error/invalidParameterUserError.js.map +0 -1
- package/build/component/driver/botAadApp/error/unhandledError.d.ts +0 -8
- package/build/component/driver/botAadApp/error/unhandledError.d.ts.map +0 -1
- package/build/component/driver/botAadApp/error/unhandledError.js +0 -33
- package/build/component/driver/botAadApp/error/unhandledError.js.map +0 -1
- package/build/component/driver/botFramework/error/unhandledError.d.ts +0 -5
- package/build/component/driver/botFramework/error/unhandledError.d.ts.map +0 -1
- package/build/component/driver/botFramework/error/unhandledError.js +0 -25
- package/build/component/driver/botFramework/error/unhandledError.js.map +0 -1
- package/build/component/driver/file/error/unhandledError.d.ts +0 -5
- package/build/component/driver/file/error/unhandledError.d.ts.map +0 -1
- package/build/component/driver/file/error/unhandledError.js +0 -25
- package/build/component/driver/file/error/unhandledError.js.map +0 -1
- package/build/component/driver/m365/error/FileNotFoundUserError.d.ts +0 -5
- package/build/component/driver/m365/error/FileNotFoundUserError.d.ts.map +0 -1
- package/build/component/driver/m365/error/FileNotFoundUserError.js +0 -22
- package/build/component/driver/m365/error/FileNotFoundUserError.js.map +0 -1
- package/build/component/driver/m365/error/unhandledError.d.ts +0 -5
- package/build/component/driver/m365/error/unhandledError.d.ts.map +0 -1
- package/build/component/driver/m365/error/unhandledError.js +0 -25
- package/build/component/driver/m365/error/unhandledError.js.map +0 -1
- package/build/component/driver/prerequisite/constant.d.ts.map +0 -1
- package/build/component/driver/prerequisite/constant.js.map +0 -1
- package/build/component/driver/prerequisite/error/dotnetInstallationUserError.d.ts +0 -5
- package/build/component/driver/prerequisite/error/dotnetInstallationUserError.d.ts.map +0 -1
- package/build/component/driver/prerequisite/error/dotnetInstallationUserError.js.map +0 -1
- package/build/component/driver/prerequisite/error/funcInstallationUserError.d.ts +0 -5
- package/build/component/driver/prerequisite/error/funcInstallationUserError.d.ts.map +0 -1
- package/build/component/driver/prerequisite/error/funcInstallationUserError.js.map +0 -1
- package/build/component/driver/prerequisite/installDriver.d.ts.map +0 -1
- package/build/component/driver/prerequisite/installDriver.js.map +0 -1
- package/build/component/driver/prerequisite/interfaces/InstallToolArgs.d.ts.map +0 -1
- package/build/component/driver/prerequisite/interfaces/InstallToolArgs.js.map +0 -1
- package/build/core/middleware/envInfoWriter.d.ts +0 -8
- package/build/core/middleware/envInfoWriter.d.ts.map +0 -1
- package/build/core/middleware/envInfoWriter.js +0 -76
- package/build/core/middleware/envInfoWriter.js.map +0 -1
- package/build/core/middleware/envInfoWriterV3.d.ts +0 -6
- package/build/core/middleware/envInfoWriterV3.d.ts.map +0 -1
- package/build/core/middleware/envInfoWriterV3.js +0 -67
- package/build/core/middleware/envInfoWriterV3.js.map +0 -1
- package/build/core/middleware/projectSettingsWriter.d.ts +0 -6
- package/build/core/middleware/projectSettingsWriter.d.ts.map +0 -1
- package/build/core/middleware/projectSettingsWriter.js +0 -52
- package/build/core/middleware/projectSettingsWriter.js.map +0 -1
- /package/build/component/driver/{prerequisite → devTool}/constant.d.ts +0 -0
- /package/build/component/driver/{prerequisite → devTool}/constant.js +0 -0
- /package/build/component/driver/{prerequisite → devTool}/interfaces/InstallToolArgs.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EACL,OAAO,EAEP,MAAM,EAKP,MAAM,wBAAwB,CAAC;AAqBhC,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8H3B,OAAO,CAAC,YAAY;YA2BN,kBAAkB;CAWjC"}
|
|
@@ -11,7 +11,6 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
11
11
|
const tools_1 = require("../../../common/tools");
|
|
12
12
|
const constants_1 = require("../../resource/aadApp/constants");
|
|
13
13
|
const missingEnvError_1 = require("./error/missingEnvError");
|
|
14
|
-
const unhandledError_1 = require("./error/unhandledError");
|
|
15
14
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
16
15
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
17
16
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
@@ -21,19 +20,12 @@ const common_1 = require("../../../error/common");
|
|
|
21
20
|
const utils_1 = require("../util/utils");
|
|
22
21
|
const signInAudience_1 = require("./interface/signInAudience");
|
|
23
22
|
const updateProgress_1 = require("../middleware/updateProgress");
|
|
23
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
24
24
|
const actionName = "aadApp/create"; // DO NOT MODIFY the name
|
|
25
25
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-create";
|
|
26
26
|
const driverConstants = {
|
|
27
27
|
generateSecretErrorMessageKey: "driver.aadApp.error.generateSecretFailed",
|
|
28
28
|
};
|
|
29
|
-
const defaultOutputEnvVarNames = {
|
|
30
|
-
clientId: "AAD_APP_CLIENT_ID",
|
|
31
|
-
objectId: "AAD_APP_OBJECT_ID",
|
|
32
|
-
tenantId: "AAD_APP_TENANT_ID",
|
|
33
|
-
authorityHost: "AAD_APP_OAUTH_AUTHORITY_HOST",
|
|
34
|
-
authority: "AAD_APP_OAUTH_AUTHORITY",
|
|
35
|
-
clientSecret: "SECRET_AAD_APP_CLIENT_SECRET",
|
|
36
|
-
};
|
|
37
29
|
let CreateAadAppDriver = class CreateAadAppDriver {
|
|
38
30
|
constructor() {
|
|
39
31
|
this.description = localizeUtils_1.getLocalizedString(constants_2.descriptionMessageKeys.create);
|
|
@@ -49,9 +41,8 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
49
41
|
try {
|
|
50
42
|
(_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.startExecuteDriver, actionName));
|
|
51
43
|
this.validateArgs(args);
|
|
52
|
-
// TODO: Remove this logic when config manager forces schema validation
|
|
53
44
|
if (!outputEnvVarNames) {
|
|
54
|
-
|
|
45
|
+
throw new outputEnvironmentVariableUndefinedError_1.OutputEnvironmentVariableUndefinedError(actionName);
|
|
55
46
|
}
|
|
56
47
|
const aadAppClient = new aadAppClient_1.AadAppClient(context.m365TokenProvider);
|
|
57
48
|
const aadAppState = utils_1.loadStateFromEnv(outputEnvVarNames);
|
|
@@ -109,13 +100,13 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
109
100
|
(_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, message));
|
|
110
101
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
111
102
|
return {
|
|
112
|
-
result: teamsfx_api_1.err(new
|
|
103
|
+
result: teamsfx_api_1.err(new common_1.UnhandledUserError(error, actionName, helpLink)),
|
|
113
104
|
summaries: summaries,
|
|
114
105
|
};
|
|
115
106
|
}
|
|
116
107
|
else {
|
|
117
108
|
return {
|
|
118
|
-
result: teamsfx_api_1.err(new
|
|
109
|
+
result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
|
|
119
110
|
summaries: summaries,
|
|
120
111
|
};
|
|
121
112
|
}
|
|
@@ -123,7 +114,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
123
114
|
const message = JSON.stringify(error);
|
|
124
115
|
(_l = context.logProvider) === null || _l === void 0 ? void 0 : _l.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, message));
|
|
125
116
|
return {
|
|
126
|
-
result: teamsfx_api_1.err(new
|
|
117
|
+
result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
|
|
127
118
|
summaries: summaries,
|
|
128
119
|
};
|
|
129
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAEjC,yDAAsD;AACtD,uEAAgF;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,OAAO,EAAmC,OAAO,EAAE,MAAM,EAAY,MAAM,wBAAwB,CAAC;AAapG,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAyF9F,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,gBAAgB;CAKzB"}
|
|
@@ -6,7 +6,6 @@ const typedi_1 = require("typedi");
|
|
|
6
6
|
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
7
7
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
const unhandledError_1 = require("./error/unhandledError");
|
|
10
9
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
11
10
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
12
11
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
@@ -69,13 +68,13 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
|
|
|
69
68
|
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
70
69
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
71
70
|
return {
|
|
72
|
-
result: teamsfx_api_1.err(new
|
|
71
|
+
result: teamsfx_api_1.err(new common_1.UnhandledUserError(error, actionName, helpLink)),
|
|
73
72
|
summaries: summaries,
|
|
74
73
|
};
|
|
75
74
|
}
|
|
76
75
|
else {
|
|
77
76
|
return {
|
|
78
|
-
result: teamsfx_api_1.err(new
|
|
77
|
+
result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
|
|
79
78
|
summaries: summaries,
|
|
80
79
|
};
|
|
81
80
|
}
|
|
@@ -83,7 +82,7 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
|
|
|
83
82
|
const message = JSON.stringify(error);
|
|
84
83
|
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
85
84
|
return {
|
|
86
|
-
result: teamsfx_api_1.err(new
|
|
85
|
+
result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
|
|
87
86
|
summaries: summaries,
|
|
88
87
|
};
|
|
89
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":";;;;AAKA,mCAAiC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ async function loadManifest(manifestPath, state) {
|
|
|
64
64
|
const manifestString = common_1.expandEnvironmentVariable(manifestTemplate);
|
|
65
65
|
const unresolvedEnvironmentVariable = common_1.getEnvironmentVariables(manifestString);
|
|
66
66
|
if (unresolvedEnvironmentVariable && unresolvedEnvironmentVariable.length > 0) {
|
|
67
|
-
const error = new common_2.
|
|
67
|
+
const error = new common_2.MissingEnvironmentVariablesError("aadAppUpdate", unresolvedEnvironmentVariable.join(", "), manifestPath, helpLink);
|
|
68
68
|
throw error;
|
|
69
69
|
}
|
|
70
70
|
const manifest = JSON.parse(manifestString);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":";;;;AACA,qDAA+B;AAC/B,mDAA6B;AAC7B,wFAAqF;AACrF,sFAAuF;AACvF,0EAA0C;AAC1C,oEAAsE;AACtE,oDAAsD;AAGtD,kDAA2F;AAC3F,oDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare class Constants {
|
|
2
2
|
static readonly ActionName = "spfx/add";
|
|
3
|
-
static readonly LOCAL_CONTENT_URL = "https://{teamSiteDomain}
|
|
3
|
+
static readonly LOCAL_CONTENT_URL = "https://{teamSiteDomain}/_layouts/15/TeamsLogon.aspx?SPFX=true&dest={teamSitePath}/_layouts/15/TeamsWorkBench.aspx%3FcomponentId=%s%26teams%26personal%26forceLocale={locale}%26loadSPFX%3Dtrue%26debugManifestsFile%3Dhttps%3A%2F%2Flocalhost%3A4321%2Ftemp%2Fmanifests.js";
|
|
4
4
|
static readonly REMOTE_CONTENT_URL = "https://{teamSiteDomain}/_layouts/15/TeamsLogon.aspx?SPFX=true&dest=/_layouts/15/teamshostedapp.aspx%3Fteams%26personal%26componentId=%s%26forceLocale={locale}";
|
|
5
5
|
static readonly YO_RC_FILE = ".yo-rc.json";
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/add/utility/constants.ts"],"names":[],"mappings":"AAGA,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,UAAU,cAAc;IAExC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/add/utility/constants.ts"],"names":[],"mappings":"AAGA,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,UAAU,cAAc;IAExC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,iRAC+O;IAChR,MAAM,CAAC,QAAQ,CAAC,kBAAkB,qKACkI;IACpK,MAAM,CAAC,QAAQ,CAAC,UAAU,iBAAiB;CAC5C"}
|
|
@@ -7,7 +7,7 @@ class Constants {
|
|
|
7
7
|
}
|
|
8
8
|
exports.Constants = Constants;
|
|
9
9
|
Constants.ActionName = "spfx/add";
|
|
10
|
-
Constants.LOCAL_CONTENT_URL = "https://{teamSiteDomain}
|
|
10
|
+
Constants.LOCAL_CONTENT_URL = "https://{teamSiteDomain}/_layouts/15/TeamsLogon.aspx?SPFX=true&dest={teamSitePath}/_layouts/15/TeamsWorkBench.aspx%3FcomponentId=%s%26teams%26personal%26forceLocale={locale}%26loadSPFX%3Dtrue%26debugManifestsFile%3Dhttps%3A%2F%2Flocalhost%3A4321%2Ftemp%2Fmanifests.js";
|
|
11
11
|
Constants.REMOTE_CONTENT_URL = "https://{teamSiteDomain}/_layouts/15/TeamsLogon.aspx?SPFX=true&dest=/_layouts/15/teamshostedapp.aspx%3Fteams%26personal%26componentId=%s%26forceLocale={locale}";
|
|
12
12
|
Constants.YO_RC_FILE = ".yo-rc.json";
|
|
13
13
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/add/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,SAAS;;AAAtB,8BAQC;AAPiB,oBAAU,GAAG,UAAU,CAAC;AAExB,2BAAiB,GAC/B,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/add/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,SAAS;;AAAtB,8BAQC;AAPiB,oBAAU,GAAG,UAAU,CAAC;AAExB,2BAAiB,GAC/B,6QAA6Q,CAAC;AAChQ,4BAAkB,GAChC,iKAAiK,CAAC;AACpJ,oBAAU,GAAG,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployImpl.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzE,OAAO,EAEL,OAAO,EAEP,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,UAAU,EAAkB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAA4B,MAAM,WAAW,CAAC;AAOpE,qBAAa,aAAa;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,wBAAwB,CAAC;gBAEtB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAK3C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deployImpl.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzE,OAAO,EAEL,OAAO,EAEP,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,UAAU,EAAkB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAA4B,MAAM,WAAW,CAAC;AAOpE,qBAAa,aAAa;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,wBAAwB,CAAC;gBAEtB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAK3C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAkBlC,YAAY;IAQb,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;YAIhC,YAAY;IAQpB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAuB/D,cAAc,CAClB,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA2BnD,iBAAiB,CACrB,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,EAChC,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,sBAAsB,CAC1B,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,GAC/B,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YAU9C,iBAAiB;IAazB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAczD,OAAO,CAAC,cAAc;CAgBvB"}
|
|
@@ -32,9 +32,12 @@ class ArmDeployImpl {
|
|
|
32
32
|
await this.validateArgs();
|
|
33
33
|
await this.createClient();
|
|
34
34
|
const needBicepCli = util_1.hasBicepTemplate(this.args.templates);
|
|
35
|
-
if (needBicepCli) {
|
|
35
|
+
if (needBicepCli && this.args.bicepCliVersion) {
|
|
36
36
|
this.bicepCommand = await this.ensureBicepCli();
|
|
37
37
|
}
|
|
38
|
+
else {
|
|
39
|
+
this.bicepCommand = "bicep";
|
|
40
|
+
}
|
|
38
41
|
const deployRes = await this.deployTemplates();
|
|
39
42
|
if (deployRes.isOk()) {
|
|
40
43
|
const outputs = deployRes.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,yCAA0E;AAE1E,2CAA2C;AAC3C,sCAAiF;AACjF,wDAQgC;AAChC,yDAA2D;AAC3D,qDAA+B;AAC/B,+CAAgF;AAChF,qDAAyD;AACzD,iEAAmE;AACnE,wDAA4F;AAC5F,uEAA4E;AAE5E,mCAAoE;AACpE,kDAAgE;AAChE,gDAAmE;AACnE,4CAAuE;AAEvE,MAAM,QAAQ,GAAG,2CAA2C,CAAC;AAE7D,MAAa,aAAa;IAMxB,YAAY,IAAgB,EAAE,OAA0B;QACtD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,uBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/validator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAgB,MAAM,aAAa,CAAC;AAGvD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/validator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAgB,MAAM,aAAa,CAAC;AAGvD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CActE"}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.validateArgs = void 0;
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
|
-
const bicepChecker_1 = require("../../utils/depsChecker/bicepChecker");
|
|
8
7
|
const constant_1 = require("./constant");
|
|
9
8
|
const util_1 = require("./util/util");
|
|
10
9
|
async function validateArgs(args) {
|
|
@@ -17,23 +16,9 @@ async function validateArgs(args) {
|
|
|
17
16
|
}
|
|
18
17
|
const res = await validateTemplates(args.templates);
|
|
19
18
|
invalidParameters.push(...res);
|
|
20
|
-
const needBicepCli = util_1.hasBicepTemplate(args.templates);
|
|
21
|
-
if (!(await validateBicep(args.bicepCliVersion, needBicepCli))) {
|
|
22
|
-
invalidParameters.push("bicepCliVersion is invalid");
|
|
23
|
-
}
|
|
24
19
|
return invalidParameters;
|
|
25
20
|
}
|
|
26
21
|
exports.validateArgs = validateArgs;
|
|
27
|
-
async function validateBicep(bicepCliVersion, needBicepCli) {
|
|
28
|
-
if (!needBicepCli) {
|
|
29
|
-
return true;
|
|
30
|
-
}
|
|
31
|
-
if (bicepCliVersion) {
|
|
32
|
-
const versions = await bicepChecker_1.getAvailableBicepVersions();
|
|
33
|
-
return versions.includes(bicepCliVersion);
|
|
34
|
-
}
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
22
|
function validateTemplates(templates) {
|
|
38
23
|
const res = [];
|
|
39
24
|
if (templates.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,+BAAgD;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,+BAAgD;AAEhD,yCAA0C;AAE1C,sCAAiE;AAE1D,KAAK,UAAU,YAAY,CAAC,IAAgB;IACjD,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,eAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QAC9D,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;KACrD;IAED,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3B,iBAAiB,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;KACxD;IAED,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpD,iBAAiB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IAE/B,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAdD,oCAcC;AAED,SAAS,iBAAiB,CAAC,SAAyB;IAClD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;KAClD;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;YACxB,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;SACrC;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAsB;IAC9C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;QAC5B,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;KACvC;IAED,IAAI,QAAQ,CAAC,UAAU,IAAI,uBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;QAC3E,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;KACnC;IACD,MAAM,YAAY,GAAG,uBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,YAAY,KAAK,uBAAY,CAAC,IAAI,IAAI,YAAY,KAAK,uBAAY,CAAC,KAAK,EAAE;QAC7E,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC7B;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAiCjF,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IAEW,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAWnC,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAad,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAsFF,OAAO,CAAC,YAAY;CAUrB"}
|
|
@@ -7,8 +7,6 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const typedi_1 = require("typedi");
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const perf_hooks_1 = require("perf_hooks");
|
|
10
|
-
const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
|
|
11
|
-
const unhandledError_1 = require("./error/unhandledError");
|
|
12
10
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
13
11
|
const common_1 = require("../../utils/common");
|
|
14
12
|
const remoteBotRegistration_1 = require("../../resource/botService/botRegistration/remoteBotRegistration");
|
|
@@ -20,6 +18,7 @@ const constants_2 = require("../../resource/botService/botRegistration/constants
|
|
|
20
18
|
const utils_1 = require("../util/utils");
|
|
21
19
|
const updateProgress_1 = require("../middleware/updateProgress");
|
|
22
20
|
const unexpectedEmptyBotPasswordError_1 = require("./error/unexpectedEmptyBotPasswordError");
|
|
21
|
+
const common_2 = require("../../../error/common");
|
|
23
22
|
const actionName = "botAadApp/create"; // DO NOT MODIFY the name
|
|
24
23
|
const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
|
|
25
24
|
const successRegisterBotAad = `${actionName}/success`;
|
|
@@ -105,15 +104,15 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
105
104
|
const message = JSON.stringify((_g = error.response) === null || _g === void 0 ? void 0 : _g.data);
|
|
106
105
|
(_h = context.logProvider) === null || _h === void 0 ? void 0 : _h.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
107
106
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
108
|
-
throw new
|
|
107
|
+
throw new common_2.UnhandledUserError(new Error(error.response.data), actionName, helpLink);
|
|
109
108
|
}
|
|
110
109
|
else {
|
|
111
|
-
throw new
|
|
110
|
+
throw new common_2.UnhandledError(new Error(error.response.data), actionName);
|
|
112
111
|
}
|
|
113
112
|
}
|
|
114
113
|
const message = JSON.stringify(error);
|
|
115
114
|
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
116
|
-
throw new
|
|
115
|
+
throw new common_2.UnhandledError(error, actionName);
|
|
117
116
|
}
|
|
118
117
|
}
|
|
119
118
|
validateArgs(args) {
|
|
@@ -122,7 +121,7 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
122
121
|
invalidParameters.push("name");
|
|
123
122
|
}
|
|
124
123
|
if (invalidParameters.length > 0) {
|
|
125
|
-
throw new
|
|
124
|
+
throw new common_2.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
126
125
|
}
|
|
127
126
|
}
|
|
128
127
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAGjC,wDAAiF;AACjF,2CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,OAAO,EACL,iCAAiC,EAElC,MAAM,+CAA+C,CAAC;AAcvD,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAAyD;IAMvD,GAAG,CACd,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAWnC,OAAO,CAClB,IAAI,EAAE,iCAAiC,EACvC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAmErB,OAAO,CAAC,YAAY;CAoDrB"}
|
|
@@ -12,7 +12,6 @@ const common_1 = require("../../utils/common");
|
|
|
12
12
|
const constants_1 = require("../aad/utility/constants");
|
|
13
13
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
14
|
const updateProgress_1 = require("../middleware/updateProgress");
|
|
15
|
-
const unhandledError_1 = require("./error/unhandledError");
|
|
16
15
|
const localBotRegistration_1 = require("../../resource/botService/botRegistration/localBotRegistration");
|
|
17
16
|
const IBotRegistration_1 = require("../../resource/botService/appStudio/interfaces/IBotRegistration");
|
|
18
17
|
const common_2 = require("../../../error/common");
|
|
@@ -89,7 +88,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
89
88
|
}
|
|
90
89
|
const message = JSON.stringify(error);
|
|
91
90
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
92
|
-
throw new
|
|
91
|
+
throw new common_2.UnhandledError(error, actionName);
|
|
93
92
|
}
|
|
94
93
|
}
|
|
95
94
|
validateArgs(args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,+CAA6C;AAC7C,wDAA0D;AAG1D,mFAAgF;AAChF,iEAA8D;
|
|
1
|
+
{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorageDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"azureStorageDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAapE,OAAO,EAAE,OAAO,EAAe,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAelD,qBACa,wBAAyB,YAAW,UAAU;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IAEI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAM/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAIrE;AAED;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,eAAe;IAC/D,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAEjC;IACF,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAY;IAEpD,OAAO,SAC2G;IAElH,SAAS,CAAC,QAAQ,SAAyD;IAErE,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;mBA+CK,qBAAqB;YA8B5B,cAAc;IAuB5B,OAAO,CAAC,MAAM,CAAC,UAAU;IAIzB,iBAAiB;CAKlB"}
|
|
@@ -9,7 +9,6 @@ const tslib_1 = require("tslib");
|
|
|
9
9
|
*/
|
|
10
10
|
const azureDeployImpl_1 = require("./impl/azureDeployImpl");
|
|
11
11
|
const deployConstant_1 = require("../../../constant/deployConstant");
|
|
12
|
-
const deployError_1 = require("../../../error/deployError");
|
|
13
12
|
const fileOperation_1 = require("../../../utils/fileOperation");
|
|
14
13
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
15
14
|
const mime = tslib_1.__importStar(require("mime"));
|
|
@@ -20,6 +19,8 @@ const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTeleme
|
|
|
20
19
|
const commonConstant_1 = require("../../../constant/commonConstant");
|
|
21
20
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
22
21
|
const azureSdkErrorHandler_1 = require("../../../utils/azureSdkErrorHandler");
|
|
22
|
+
const deploy_1 = require("../../../../error/deploy");
|
|
23
|
+
const messages_1 = require("../../../messages");
|
|
23
24
|
const ACTION_NAME = "azureStorage/deploy";
|
|
24
25
|
let AzureStorageDeployDriver = class AzureStorageDeployDriver {
|
|
25
26
|
constructor() {
|
|
@@ -64,7 +65,6 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
64
65
|
this.helpLink = "https://aka.ms/teamsfx-actions/azure-storage-deploy";
|
|
65
66
|
}
|
|
66
67
|
async azureDeploy(args, azureResource, azureCredential) {
|
|
67
|
-
var _a;
|
|
68
68
|
await this.context.logProvider.debug("Start deploying to Azure Storage Service");
|
|
69
69
|
await this.context.logProvider.debug("Get Azure Storage Service deploy credential");
|
|
70
70
|
const containerClient = await AzureStorageDeployDriverImpl.createContainerClient(azureResource, azureCredential);
|
|
@@ -92,11 +92,8 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
92
92
|
});
|
|
93
93
|
const responses = await Promise.all(tasks);
|
|
94
94
|
const errorResponse = responses.find((res) => res.errorCode);
|
|
95
|
-
if (((_a = errorResponse === null || errorResponse === void 0 ? void 0 : errorResponse._response) === null || _a === void 0 ? void 0 : _a.status) === commonConstant_1.HttpStatusCode.INTERNAL_SERVER_ERROR) {
|
|
96
|
-
throw deployError_1.DeployExternalApiCallError.uploadToStorageRemoteError(sourceFolder, errorResponse);
|
|
97
|
-
}
|
|
98
95
|
if (errorResponse) {
|
|
99
|
-
throw
|
|
96
|
+
throw new deploy_1.AzureStorageUploadFilesError(azureResource.instanceId, sourceFolder, errorResponse, this.helpLink);
|
|
100
97
|
}
|
|
101
98
|
await this.context.logProvider.debug("Upload files to Azure Storage Service successfully");
|
|
102
99
|
return;
|
|
@@ -109,16 +106,15 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
109
106
|
await container.create();
|
|
110
107
|
}
|
|
111
108
|
return container;
|
|
112
|
-
}, (e) =>
|
|
109
|
+
}, (e) => new deploy_1.AzureStorageGetContainerError(azureResource.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e), (e) => new deploy_1.AzureStorageGetContainerError(azureResource.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e));
|
|
113
110
|
}
|
|
114
111
|
async deleteAllBlobs(client, storageName, logProvider) {
|
|
115
112
|
var e_1, _a;
|
|
116
|
-
var _b;
|
|
117
113
|
await logProvider.debug(`Deleting all existing blobs in container '${deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME}' for Azure Storage account '${storageName}'.`);
|
|
118
114
|
const deleteJobs = [];
|
|
119
115
|
try {
|
|
120
|
-
for (var
|
|
121
|
-
const blob =
|
|
116
|
+
for (var _b = tslib_1.__asyncValues(client.listBlobsFlat()), _c; _c = await _b.next(), !_c.done;) {
|
|
117
|
+
const blob = _c.value;
|
|
122
118
|
if (AzureStorageDeployDriverImpl.isBlobFile(blob)) {
|
|
123
119
|
deleteJobs.push(client.deleteBlob(blob.name));
|
|
124
120
|
}
|
|
@@ -127,17 +123,14 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
127
123
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
128
124
|
finally {
|
|
129
125
|
try {
|
|
130
|
-
if (
|
|
126
|
+
if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
|
|
131
127
|
}
|
|
132
128
|
finally { if (e_1) throw e_1.error; }
|
|
133
129
|
}
|
|
134
130
|
const responses = await Promise.all(deleteJobs);
|
|
135
131
|
const errorResponse = responses.find((res) => res.errorCode);
|
|
136
|
-
if (((_b = errorResponse === null || errorResponse === void 0 ? void 0 : errorResponse._response) === null || _b === void 0 ? void 0 : _b.status) === commonConstant_1.HttpStatusCode.INTERNAL_SERVER_ERROR) {
|
|
137
|
-
throw deployError_1.DeployExternalApiCallError.clearStorageRemoteError(errorResponse === null || errorResponse === void 0 ? void 0 : errorResponse._response.status, errorResponse);
|
|
138
|
-
}
|
|
139
132
|
if (errorResponse) {
|
|
140
|
-
throw
|
|
133
|
+
throw new deploy_1.AzureStorageClearBlobsError(storageName, errorResponse);
|
|
141
134
|
}
|
|
142
135
|
}
|
|
143
136
|
static isBlobFile(blob) {
|
|
@@ -145,8 +138,8 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
145
138
|
return ((_a = blob.properties.contentLength) !== null && _a !== void 0 ? _a : -1) > 0;
|
|
146
139
|
}
|
|
147
140
|
updateProgressbar() {
|
|
148
|
-
var _a
|
|
149
|
-
(_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(
|
|
141
|
+
var _a;
|
|
142
|
+
(_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.deployToAzure(this.workingDirectory, "Azure Storage Service"));
|
|
150
143
|
}
|
|
151
144
|
}
|
|
152
145
|
exports.AzureStorageDeployDriverImpl = AzureStorageDeployDriverImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,4DAAyD;AASzD,qEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"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"}
|