@microsoft/teamsfx-core 2.0.4-alpha.ef9e92acd.0 → 2.0.4-alpha.f2e5373f1.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/deps-checker/checkerFactory.d.ts +1 -2
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +2 -2
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/depsLogger.d.ts +14 -14
- package/build/common/deps-checker/depsLogger.d.ts.map +1 -1
- package/build/common/deps-checker/depsLogger.js +7 -21
- package/build/common/deps-checker/depsLogger.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +40 -35
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +3 -3
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +4 -4
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/progressIndicator.js +2 -2
- package/build/common/deps-checker/util/progressIndicator.js.map +1 -1
- package/build/common/featureFlags.d.ts +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +3 -0
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -0
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts +2 -2
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +13 -4
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +52 -13
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -0
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +22 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +38 -32
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +12 -10
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +14 -10
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +17 -5
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +8 -0
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +25 -21
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +26 -33
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +5 -0
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +167 -96
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +2 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +23 -1
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +7 -4
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +42 -8
- package/build/common/telemetry.js.map +1 -1
- package/build/component/configManager/interface.d.ts +5 -3
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -3
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +20 -49
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +6 -7
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +2 -3
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +5 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +6 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +10 -7
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +53 -55
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +2 -1
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +3 -3
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -0
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +2 -5
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +3 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +13 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -0
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +2 -5
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +58 -13
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +3 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +4 -1
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.js +1 -1
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/arm/deploy.d.ts +1 -3
- package/build/component/driver/arm/deploy.d.ts.map +1 -1
- package/build/component/driver/arm/deploy.js +1 -14
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +8 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +7 -6
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +1 -0
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +4 -7
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts +1 -0
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +6 -12
- 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 +12 -5
- 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 +11 -4
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +22 -14
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +8 -8
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +4 -4
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -0
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +9 -3
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +1 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +33 -11
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +12 -18
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +5 -11
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -7
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.d.ts +1 -0
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +6 -12
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +1 -0
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +10 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +31 -30
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +3 -3
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +21 -5
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +2 -0
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +1 -0
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +3 -6
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +1 -0
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +3 -6
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +1 -0
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +5 -6
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +3 -2
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +22 -24
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +2 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +3 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +3 -6
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +2 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -2
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +21 -10
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +1 -0
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +3 -6
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +3 -6
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.d.ts +2 -1
- package/build/component/error/componentError.d.ts.map +1 -1
- package/build/component/error/componentError.js +8 -4
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +25 -6
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +33 -8
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +4 -2
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +71 -21
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +2 -2
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +17 -14
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +9 -1
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +8 -4
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +4 -2
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +3 -3
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +2 -2
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +3 -3
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +2 -1
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +2 -3
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -4
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts +2 -2
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +7 -11
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/provisionUtils.d.ts +3 -3
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +3 -3
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +24 -2
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +2 -2
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +6 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/telemetry.js +2 -2
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +2 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +1 -4
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/charsetUtils.js +3 -3
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.d.ts +1 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +3 -3
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +8 -4
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts +3 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +16 -3
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +2 -2
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +40 -33
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +816 -66
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +2 -2
- package/build/core/collaborator.js.map +1 -1
- package/build/core/globalVars.d.ts +16 -0
- package/build/core/globalVars.d.ts.map +1 -1
- package/build/core/globalVars.js +34 -1
- package/build/core/globalVars.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +7 -3
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +4 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +34 -32
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +2 -1
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +3 -0
- 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.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +5 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/common.d.ts +2 -8
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +8 -33
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -0
- package/build/question/constants.d.ts.map +1 -0
- package/build/question/constants.js +12 -0
- package/build/question/constants.js.map +1 -0
- package/build/question/create.d.ts +11 -3
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +337 -246
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +4 -0
- package/build/question/generator.d.ts.map +1 -0
- package/build/question/generator.js +371 -0
- package/build/question/generator.js.map +1 -0
- package/build/question/index.d.ts +18 -30
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +13 -47
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateEnvInputs.d.ts +14 -0
- package/build/question/inputs/CreateEnvInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateEnvInputs.js +5 -0
- package/build/question/inputs/CreateEnvInputs.js.map +1 -0
- package/build/question/inputs/CreateProjectInputs.d.ts +40 -0
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateProjectInputs.js +5 -0
- package/build/question/inputs/CreateProjectInputs.js.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +12 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.js +5 -0
- package/build/question/inputs/CreateSampleProjectInputs.js.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts +14 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.js +5 -0
- package/build/question/inputs/DeployAadManifestInputs.js.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts +18 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.js +5 -0
- package/build/question/inputs/PermissionGrantInputs.js.map +1 -0
- package/build/question/inputs/PermissionListInputs.d.ts +16 -0
- package/build/question/inputs/PermissionListInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionListInputs.js +5 -0
- package/build/question/inputs/PermissionListInputs.js.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js +5 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +18 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js +5 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts +12 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js +5 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js +5 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +11 -0
- package/build/question/inputs/index.d.ts.map +1 -0
- package/build/question/inputs/index.js +16 -0
- package/build/question/inputs/index.js.map +1 -0
- package/build/question/options/CreateEnvOptions.d.ts +10 -0
- package/build/question/options/CreateEnvOptions.d.ts.map +1 -0
- package/build/question/options/CreateEnvOptions.js +24 -0
- package/build/question/options/CreateEnvOptions.js.map +1 -0
- package/build/question/options/CreateProjectOptions.d.ts +10 -0
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateProjectOptions.js +139 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts +10 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.js +52 -0
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -0
- package/build/question/options/DeployAadManifestOptions.d.ts +10 -0
- package/build/question/options/DeployAadManifestOptions.d.ts.map +1 -0
- package/build/question/options/DeployAadManifestOptions.js +21 -0
- package/build/question/options/DeployAadManifestOptions.js.map +1 -0
- package/build/question/options/PermissionGrantOptions.d.ts +10 -0
- package/build/question/options/PermissionGrantOptions.d.ts.map +1 -0
- package/build/question/options/PermissionGrantOptions.js +33 -0
- package/build/question/options/PermissionGrantOptions.js.map +1 -0
- package/build/question/options/PermissionListOptions.d.ts +10 -0
- package/build/question/options/PermissionListOptions.d.ts.map +1 -0
- package/build/question/options/PermissionListOptions.js +28 -0
- package/build/question/options/PermissionListOptions.js.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts +10 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.js +26 -0
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts +10 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.js +38 -0
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts +10 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.js +17 -0
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts +10 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.js +23 -0
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -0
- package/build/question/options/index.d.ts +11 -0
- package/build/question/options/index.d.ts.map +1 -0
- package/build/question/options/index.js +16 -0
- package/build/question/options/index.js.map +1 -0
- package/build/question/other.d.ts +12 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +124 -30
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +7 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +9 -3
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/validationUtils.d.ts +6 -3
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +25 -14
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts +8 -0
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +179 -259
- package/build/ui/visitor.js.map +1 -1
- package/package.json +8 -10
- package/resource/package.nls.json +32 -15
- package/resource/yaml-schema/{1.1.1 → v1.2}/yaml.schema.json +11 -5
- 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/Tab/GetUserProfile.razor +1 -2
- package/templates/plugins/resource/aad/auth/bot/README.md +281 -263
- package/templates/plugins/resource/aad/auth/bot/js/sso/handleMessageExtensionQueryWithToken.js +13 -3
- package/templates/plugins/resource/aad/auth/bot/js/sso/profileSsoCommandHandler.js +14 -5
- package/templates/plugins/resource/aad/auth/bot/ts/sso/handleMessageExtensionQueryWithToken.ts +11 -3
- package/templates/plugins/resource/aad/auth/bot/ts/sso/profileSsoCommandHandler.ts +12 -3
- package/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor +1 -2
- package/build/component/driver/middleware/updateProgress.d.ts +0 -6
- package/build/component/driver/middleware/updateProgress.d.ts.map +0 -1
- package/build/component/driver/middleware/updateProgress.js +0 -15
- package/build/component/driver/middleware/updateProgress.js.map +0 -1
- package/build/core/FxCoreImplementV3.d.ts +0 -47
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -702
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -14,7 +14,6 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
|
|
|
14
14
|
const constants_1 = require("./utility/constants");
|
|
15
15
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
16
16
|
const utils_1 = require("../util/utils");
|
|
17
|
-
const updateProgress_1 = require("../middleware/updateProgress");
|
|
18
17
|
const unexpectedEmptyBotPasswordError_1 = require("./error/unexpectedEmptyBotPasswordError");
|
|
19
18
|
const common_2 = require("../../../error/common");
|
|
20
19
|
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
@@ -30,12 +29,13 @@ const propertyKeys = {
|
|
|
30
29
|
let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
31
30
|
constructor() {
|
|
32
31
|
this.description = localizeUtils_1.getLocalizedString("driver.botAadApp.create.description");
|
|
32
|
+
this.progressTitle = localizeUtils_1.getLocalizedString(constants_1.progressBarKeys.creatingBotAadApp);
|
|
33
33
|
}
|
|
34
34
|
async run(args, context) {
|
|
35
35
|
return common_1.wrapRun(async () => {
|
|
36
36
|
const result = await this.handler(args, context);
|
|
37
37
|
return result.output;
|
|
38
|
-
});
|
|
38
|
+
}, actionName);
|
|
39
39
|
}
|
|
40
40
|
async execute(args, ctx, outputEnvVarNames) {
|
|
41
41
|
let summaries = [];
|
|
@@ -43,7 +43,7 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
43
43
|
const result = await this.handler(args, ctx, outputEnvVarNames);
|
|
44
44
|
summaries = result.summaries;
|
|
45
45
|
return result.output;
|
|
46
|
-
});
|
|
46
|
+
}, actionName);
|
|
47
47
|
return {
|
|
48
48
|
result: outputResult,
|
|
49
49
|
summaries,
|
|
@@ -131,10 +131,7 @@ tslib_1.__decorate([
|
|
|
131
131
|
tslib_1.__metadata("design:returntype", Promise)
|
|
132
132
|
], CreateBotAadAppDriver.prototype, "run", null);
|
|
133
133
|
tslib_1.__decorate([
|
|
134
|
-
lib_1.hooks([
|
|
135
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
136
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString(constants_1.progressBarKeys.creatingBotAadApp)),
|
|
137
|
-
]),
|
|
134
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
138
135
|
tslib_1.__metadata("design:type", Function),
|
|
139
136
|
tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
|
|
140
137
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -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,0DAA0B;AAC1B,+CAA6C;AAC7C,+CAA8C;AAC9C,mFAAgF;AAChF,mDAAsE;AACtE,iEAAmE;AACnE,yCAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
|
4
4
|
import { CreateOrUpdateBotFrameworkBotArgs } from "./interface/createOrUpdateBotFrameworkBotArgs";
|
|
5
5
|
export declare class CreateOrUpdateBotFrameworkBotDriver implements StepDriver {
|
|
6
6
|
description: string;
|
|
7
|
+
readonly progressTitle: string;
|
|
7
8
|
run(args: CreateOrUpdateBotFrameworkBotArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
8
9
|
execute(args: CreateOrUpdateBotFrameworkBotArgs, ctx: DriverContext): Promise<ExecutionResult>;
|
|
9
10
|
private handler;
|
|
@@ -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;AAEtE,OAAO,EACL,iCAAiC,EAElC,MAAM,+CAA+C,CAAC;AAgBvD,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA2E;IAGpF,GAAG,CACd,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,iCAAiC,EACvC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAwErB,OAAO,CAAC,YAAY;CAoDrB"}
|
|
@@ -11,7 +11,6 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
11
11
|
const common_1 = require("../../utils/common");
|
|
12
12
|
const constants_1 = require("../aad/utility/constants");
|
|
13
13
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
|
-
const updateProgress_1 = require("../middleware/updateProgress");
|
|
15
14
|
const botFrameworkRegistration_1 = require("../../resource/botService/botRegistration/botFrameworkRegistration");
|
|
16
15
|
const IBotRegistration_1 = require("../../resource/botService/appStudio/interfaces/IBotRegistration");
|
|
17
16
|
const common_2 = require("../../../error/common");
|
|
@@ -24,12 +23,13 @@ const botUrl = "https://dev.botframework.com/bots?id=";
|
|
|
24
23
|
let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDriver {
|
|
25
24
|
constructor() {
|
|
26
25
|
this.description = localizeUtils_1.getLocalizedString("driver.botFramework.description");
|
|
26
|
+
this.progressTitle = localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot");
|
|
27
27
|
}
|
|
28
28
|
async run(args, context) {
|
|
29
29
|
return common_1.wrapRun(async () => {
|
|
30
30
|
const result = await this.handler(args, context);
|
|
31
31
|
return result.output;
|
|
32
|
-
});
|
|
32
|
+
}, actionName);
|
|
33
33
|
}
|
|
34
34
|
async execute(args, ctx) {
|
|
35
35
|
let summaries = [];
|
|
@@ -37,7 +37,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
37
37
|
const result = await this.handler(args, ctx);
|
|
38
38
|
summaries = result.summaries;
|
|
39
39
|
return result.output;
|
|
40
|
-
});
|
|
40
|
+
}, actionName);
|
|
41
41
|
return {
|
|
42
42
|
result: outputResult,
|
|
43
43
|
summaries,
|
|
@@ -74,7 +74,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
74
74
|
configuredChannels,
|
|
75
75
|
};
|
|
76
76
|
telemetry_1.TelemetryUtils.init(context); // AppStudioClient will use TelemetryUtils to send telemetry.
|
|
77
|
-
const result = await botFrameworkRegistration_1.createOrUpdateBotRegistration(context.m365TokenProvider, botRegistrationData);
|
|
77
|
+
const result = await botFrameworkRegistration_1.createOrUpdateBotRegistration(context.m365TokenProvider, botRegistrationData, context.logProvider);
|
|
78
78
|
if (result.isErr()) {
|
|
79
79
|
throw result.error;
|
|
80
80
|
}
|
|
@@ -143,19 +143,13 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
143
143
|
}
|
|
144
144
|
};
|
|
145
145
|
tslib_1.__decorate([
|
|
146
|
-
lib_1.hooks([
|
|
147
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
148
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot")),
|
|
149
|
-
]),
|
|
146
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
150
147
|
tslib_1.__metadata("design:type", Function),
|
|
151
148
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
152
149
|
tslib_1.__metadata("design:returntype", Promise)
|
|
153
150
|
], CreateOrUpdateBotFrameworkBotDriver.prototype, "run", null);
|
|
154
151
|
tslib_1.__decorate([
|
|
155
|
-
lib_1.hooks([
|
|
156
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
157
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot")),
|
|
158
|
-
]),
|
|
152
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
159
153
|
tslib_1.__metadata("design:type", Function),
|
|
160
154
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
161
155
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -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;
|
|
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;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;
|
|
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;AAgBlD,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;IAGrE,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"}
|
|
@@ -21,6 +21,7 @@ const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
|
21
21
|
const azureSdkErrorHandler_1 = require("../../../utils/azureSdkErrorHandler");
|
|
22
22
|
const deploy_1 = require("../../../../error/deploy");
|
|
23
23
|
const messages_1 = require("../../../messages");
|
|
24
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
24
25
|
const ACTION_NAME = "azureStorage/deploy";
|
|
25
26
|
let AzureStorageDeployDriver = class AzureStorageDeployDriver {
|
|
26
27
|
constructor() {
|
|
@@ -65,12 +66,12 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
65
66
|
this.helpLink = "https://aka.ms/teamsfx-actions/azure-storage-deploy";
|
|
66
67
|
}
|
|
67
68
|
async azureDeploy(args, azureResource, azureCredential) {
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
this.context.logProvider.debug("Start deploying to Azure Storage Service");
|
|
70
|
+
this.context.logProvider.debug("Get Azure Storage Service deploy credential");
|
|
70
71
|
const containerClient = await AzureStorageDeployDriverImpl.createContainerClient(azureResource, azureCredential);
|
|
71
72
|
// delete all existing blobs
|
|
72
73
|
await this.deleteAllBlobs(containerClient, azureResource.instanceId, this.context.logProvider);
|
|
73
|
-
|
|
74
|
+
this.context.logProvider.debug("Uploading files to Azure Storage Service");
|
|
74
75
|
// upload all to storage
|
|
75
76
|
const ig = await this.handleIgnore(args, this.context);
|
|
76
77
|
const sourceFolder = this.distDirectory;
|
|
@@ -95,7 +96,7 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
95
96
|
if (errorResponse) {
|
|
96
97
|
throw new deploy_1.AzureStorageUploadFilesError(azureResource.instanceId, sourceFolder, errorResponse, this.helpLink);
|
|
97
98
|
}
|
|
98
|
-
|
|
99
|
+
this.context.logProvider.debug("Upload files to Azure Storage Service successfully");
|
|
99
100
|
return;
|
|
100
101
|
}
|
|
101
102
|
static async createContainerClient(azureResource, azureCredential) {
|
|
@@ -110,7 +111,7 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
110
111
|
}
|
|
111
112
|
async deleteAllBlobs(client, storageName, logProvider) {
|
|
112
113
|
var e_1, _a;
|
|
113
|
-
|
|
114
|
+
logProvider.debug(`Deleting all existing blobs in container '${deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME}' for Azure Storage account '${storageName}'.`);
|
|
114
115
|
const deleteJobs = [];
|
|
115
116
|
try {
|
|
116
117
|
for (var _b = tslib_1.__asyncValues(client.listBlobsFlat()), _c; _c = await _b.next(), !_c.done;) {
|
|
@@ -142,5 +143,11 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
142
143
|
(_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.deployToAzure(this.workingDirectory, "Azure Storage Service"));
|
|
143
144
|
}
|
|
144
145
|
}
|
|
146
|
+
tslib_1.__decorate([
|
|
147
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureStorageDeployDriverImpl" })]),
|
|
148
|
+
tslib_1.__metadata("design:type", Function),
|
|
149
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
|
|
150
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
151
|
+
], AzureStorageDeployDriverImpl.prototype, "azureDeploy", null);
|
|
145
152
|
exports.AzureStorageDeployDriverImpl = AzureStorageDeployDriverImpl;
|
|
146
153
|
//# sourceMappingURL=azureStorageDeployDriver.js.map
|
|
@@ -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,gEAAiE;AAEjE,wDAAwB;AACxB,mDAA6B;AAE7B,mCAAiC;AAGjC,kFAAgF;AAEhF,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,8EAAyE;AACzE,qDAIkC;AAClC,gDAAqD;
|
|
1
|
+
{"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,mCAAmC,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAoB,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,mCAAmC,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAoB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAgB3E;;GAEG;AACH,qBACa,qCAAsC,YAAW,UAAU;IACtE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAG1B;IACF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,wEACoC;IACvE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,wFAI1C;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SACwE;IAG5G,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpE;;;;OAIG;IAEG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiD3E,6BAA6B,CACjC,SAAS,EAAE,iBAAiB,EAC5B,eAAe,EAAE,iBAAiB,EAClC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,CAAC;CAoBpB"}
|
|
@@ -16,6 +16,7 @@ const messages_1 = require("../../../messages");
|
|
|
16
16
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
17
17
|
const azureSdkErrorHandler_1 = require("../../../utils/azureSdkErrorHandler");
|
|
18
18
|
const deploy_1 = require("../../../../error/deploy");
|
|
19
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
19
20
|
const ACTION_NAME = "azureStorage/enableStaticWebsite";
|
|
20
21
|
/**
|
|
21
22
|
* enable static website for azure storage account
|
|
@@ -29,7 +30,7 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
|
|
|
29
30
|
async run(args, context) {
|
|
30
31
|
var _a;
|
|
31
32
|
(_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.configureAzureStorageEnableStaticWebsite);
|
|
32
|
-
return common_1.wrapRun(() => this.config(args, context), undefined, context.logProvider);
|
|
33
|
+
return common_1.wrapRun(() => this.config(args, context), ACTION_NAME, undefined, context.logProvider);
|
|
33
34
|
}
|
|
34
35
|
execute(args, ctx) {
|
|
35
36
|
return common_1.wrapSummary(this.run.bind(this, args, ctx), [
|
|
@@ -45,12 +46,12 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
|
|
|
45
46
|
var _a, _b;
|
|
46
47
|
const logger = context.logProvider;
|
|
47
48
|
const input = AzureStorageStaticWebsiteConfigDriver_1.STORAGE_CONFIG_ARGS(args, AzureStorageStaticWebsiteConfigDriver_1.HELP_LINK);
|
|
48
|
-
|
|
49
|
+
logger.debug(`Enabling static website feature for Azure Storage account ${input.storageResourceId}`);
|
|
49
50
|
const azureInfo = azureResourceOperation_1.parseAzureResourceId(input.storageResourceId, AzureStorageStaticWebsiteConfigDriver_1.RESOURCE_PATTERN);
|
|
50
51
|
const azureTokenCredential = await azureResourceOperation_1.getAzureAccountCredential(context.azureAccountProvider);
|
|
51
52
|
const azureBlobClient = await azureResourceOperation_1.createBlobServiceClient(azureInfo, azureTokenCredential);
|
|
52
53
|
if (await this.isStorageStatusWebsiteEnabled(azureInfo, azureBlobClient, context)) {
|
|
53
|
-
|
|
54
|
+
logger.debug(`Static website feature is already enabled for Azure Storage account ${input.storageResourceId}.`);
|
|
54
55
|
return AzureStorageStaticWebsiteConfigDriver_1.RETURN_VALUE;
|
|
55
56
|
}
|
|
56
57
|
const properties = {
|
|
@@ -64,7 +65,7 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
|
|
|
64
65
|
return Promise.resolve(AzureStorageStaticWebsiteConfigDriver_1.RETURN_VALUE);
|
|
65
66
|
}
|
|
66
67
|
async isStorageStatusWebsiteEnabled(azureInfo, azureBlobClient, context) {
|
|
67
|
-
|
|
68
|
+
context.logProvider.debug(`Checking if static website feature is enabled in Azure Storage account '${azureInfo.instanceId}'.`);
|
|
68
69
|
return await azureSdkErrorHandler_1.wrapAzureOperation(async () => { var _a; return ((_a = (await azureBlobClient.getProperties()).staticWebsite) === null || _a === void 0 ? void 0 : _a.enabled) === true; }, (e) => new deploy_1.AzureStorageGetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e), (e) => new deploy_1.AzureStorageGetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e));
|
|
69
70
|
}
|
|
70
71
|
};
|
|
@@ -82,6 +83,12 @@ tslib_1.__decorate([
|
|
|
82
83
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
83
84
|
tslib_1.__metadata("design:returntype", Promise)
|
|
84
85
|
], AzureStorageStaticWebsiteConfigDriver.prototype, "run", null);
|
|
86
|
+
tslib_1.__decorate([
|
|
87
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureStorageStaticWebsiteConfigDriver" })]),
|
|
88
|
+
tslib_1.__metadata("design:type", Function),
|
|
89
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
90
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
91
|
+
], AzureStorageStaticWebsiteConfigDriver.prototype, "config", null);
|
|
85
92
|
AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDriver_1 = tslib_1.__decorate([
|
|
86
93
|
typedi_1.Service(ACTION_NAME)
|
|
87
94
|
], AzureStorageStaticWebsiteConfigDriver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAIlC,mCAAiC;AACjC,kDAA8F;AAE9F,kFAI+C;AAG/C,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,qEAAkE;AAClE,gDAAqD;AACrD,oEAAsE;AACtE,8EAAyE;AACzE,qDAGkC;
|
|
1
|
+
{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAarD,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;gBAGvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAWpB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAahB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAExD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IAqClB;;;;;OAKG;cACa,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAmB3F;;;;;;;OAOG;IAEG,gBAAgB,CACpB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC;IA0ElB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB;CAGlB"}
|
|
@@ -17,6 +17,8 @@ const localizeUtils_1 = require("../../../../../common/localizeUtils");
|
|
|
17
17
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
18
18
|
const fileOperation_1 = require("../../../../utils/fileOperation");
|
|
19
19
|
const deploy_1 = require("../../../../../error/deploy");
|
|
20
|
+
const globalVars_1 = require("../../../../../core/globalVars");
|
|
21
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
20
22
|
class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
21
23
|
constructor(args, context, serviceName, helpLink, summaries, summaryPrepare) {
|
|
22
24
|
super(args, context);
|
|
@@ -34,7 +36,7 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
34
36
|
const cost = await this.zipDeploy(args, azureResource, azureCredential);
|
|
35
37
|
await this.restartFunctionApp(azureResource);
|
|
36
38
|
if (cost > deployConstant_1.DeployConstant.DEPLOY_OVER_TIME) {
|
|
37
|
-
|
|
39
|
+
(_a = this.context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString("driver.deploy.notice.deployAcceleration", "https://aka.ms/teamsfx-config-run-from-package"));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
/**
|
|
@@ -48,17 +50,17 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
48
50
|
async zipDeploy(args, azureResource, azureCredential) {
|
|
49
51
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
50
52
|
const zipBuffer = await this.packageToZip(args, this.context);
|
|
51
|
-
|
|
53
|
+
this.context.logProvider.debug("Start to get Azure account info for deploy");
|
|
52
54
|
const config = await this.createAzureDeployConfig(azureResource, azureCredential);
|
|
53
|
-
|
|
55
|
+
this.context.logProvider.debug("Get Azure account info for deploy complete");
|
|
54
56
|
const endpoint = this.getZipDeployEndpoint(azureResource.instanceId);
|
|
55
|
-
|
|
57
|
+
this.context.logProvider.debug(`Start to upload code to ${endpoint}`);
|
|
56
58
|
const startTime = Date.now();
|
|
57
59
|
const location = await this.zipDeployPackage(endpoint, zipBuffer, config, this.context.logProvider);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
+
this.context.logProvider.debug("Upload code to Azure complete");
|
|
61
|
+
this.context.logProvider.debug("Start to check Azure deploy status");
|
|
60
62
|
const deployRes = await this.checkDeployStatus(location, config, this.context.logProvider);
|
|
61
|
-
|
|
63
|
+
this.context.logProvider.debug("Check Azure deploy status complete");
|
|
62
64
|
const cost = Date.now() - startTime;
|
|
63
65
|
this.context.telemetryReporter.sendTelemetryEvent("deployResponse", {
|
|
64
66
|
time_cost: cost.toString(),
|
|
@@ -91,9 +93,9 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
91
93
|
? this.zipFilePath
|
|
92
94
|
: path_1.default.join(this.workingDirectory, this.zipFilePath)
|
|
93
95
|
: path_1.default.join(this.workingDirectory, deployConstant_1.DeployConstant.DEPLOYMENT_TMP_FOLDER, deployConstant_1.DeployConstant.DEPLOYMENT_ZIP_CACHE_FILE);
|
|
94
|
-
|
|
96
|
+
(_a = this.context.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`start zip dist folder ${this.distDirectory}`);
|
|
95
97
|
const res = await fileOperation_1.zipFolderAsync(this.distDirectory, this.zipFilePath, ig);
|
|
96
|
-
|
|
98
|
+
(_b = this.context.logProvider) === null || _b === void 0 ? void 0 : _b.debug(`zip dist folder ${this.distDirectory} to ${this.zipFilePath} complete`);
|
|
97
99
|
return res;
|
|
98
100
|
}
|
|
99
101
|
/**
|
|
@@ -119,30 +121,30 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
119
121
|
if (((_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : commonConstant_1.HttpStatusCode.OK) >= commonConstant_1.HttpStatusCode.INTERNAL_SERVER_ERROR) {
|
|
120
122
|
retryCount += 1;
|
|
121
123
|
if (retryCount < deployConstant_1.DeployConstant.DEPLOY_UPLOAD_RETRY_TIMES) {
|
|
122
|
-
|
|
124
|
+
logger.warning(`Upload zip file failed with response status code: ${(_d = (_c = e.response) === null || _c === void 0 ? void 0 : _c.status) !== null && _d !== void 0 ? _d : "NA"}. Retrying...`);
|
|
123
125
|
}
|
|
124
126
|
else {
|
|
125
127
|
// if retry times exceed, throw error
|
|
126
|
-
|
|
128
|
+
logger.warning(`Retry times exceeded. Upload zip file failed with remote server error. Message: ${JSON.stringify((_e = e.response) === null || _e === void 0 ? void 0 : _e.data)}`);
|
|
127
129
|
throw new deploy_1.DeployZipPackageError(zipDeployEndpoint, new Error(`remote server error with status code: ${(_g = (_f = e.response) === null || _f === void 0 ? void 0 : _f.status) !== null && _g !== void 0 ? _g : "NA"}, message: ${JSON.stringify((_h = e.response) === null || _h === void 0 ? void 0 : _h.data)}`), this.helpLink);
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
132
|
else {
|
|
131
133
|
// None server error, throw
|
|
132
|
-
|
|
134
|
+
logger.error(`Upload zip file failed with response status code: ${(_k = (_j = e.response) === null || _j === void 0 ? void 0 : _j.status) !== null && _k !== void 0 ? _k : "NA"}, message: ${JSON.stringify((_l = e.response) === null || _l === void 0 ? void 0 : _l.data)}`);
|
|
133
135
|
throw new deploy_1.DeployZipPackageError(zipDeployEndpoint, new Error(`status code: ${(_o = (_m = e.response) === null || _m === void 0 ? void 0 : _m.status) !== null && _o !== void 0 ? _o : "NA"}, message: ${JSON.stringify((_p = e.response) === null || _p === void 0 ? void 0 : _p.data)}`), this.helpLink);
|
|
134
136
|
}
|
|
135
137
|
}
|
|
136
138
|
else {
|
|
137
139
|
// if the error is not axios error, throw
|
|
138
|
-
|
|
140
|
+
logger.error(`Upload zip file failed with error: ${JSON.stringify(e)}`);
|
|
139
141
|
throw new deploy_1.DeployZipPackageError(zipDeployEndpoint, e, this.helpLink);
|
|
140
142
|
}
|
|
141
143
|
}
|
|
142
144
|
}
|
|
143
145
|
if ((res === null || res === void 0 ? void 0 : res.status) !== commonConstant_1.HttpStatusCode.OK && (res === null || res === void 0 ? void 0 : res.status) !== commonConstant_1.HttpStatusCode.ACCEPTED) {
|
|
144
146
|
if (res === null || res === void 0 ? void 0 : res.status) {
|
|
145
|
-
|
|
147
|
+
logger.error(`Deployment is failed with error code: ${res.status}.`);
|
|
146
148
|
}
|
|
147
149
|
throw new deploy_1.DeployZipPackageError(zipDeployEndpoint, new Error(`status code: ${(_q = res === null || res === void 0 ? void 0 : res.status) !== null && _q !== void 0 ? _q : "NA"}`), this.helpLink);
|
|
148
150
|
}
|
|
@@ -161,5 +163,11 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
161
163
|
(_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.deployToAzure(this.workingDirectory, this.serviceName));
|
|
162
164
|
}
|
|
163
165
|
}
|
|
166
|
+
tslib_1.__decorate([
|
|
167
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureZipDeployImpl" })]),
|
|
168
|
+
tslib_1.__metadata("design:type", Function),
|
|
169
|
+
tslib_1.__metadata("design:paramtypes", [String, Buffer, Object, Object]),
|
|
170
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
171
|
+
], AzureZipDeployImpl.prototype, "zipDeployPackage", null);
|
|
164
172
|
exports.AzureZipDeployImpl = AzureZipDeployImpl;
|
|
165
173
|
//# sourceMappingURL=AzureZipDeployImpl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,uDAAoD;AAUpD,mDAAwD;AACxD,wEAAqE;AACrE,mCAAoC;AACpC,0DAAyC;AACzC,wEAAqE;AACrE,uEAAyE;AACzE,wDAAwB;AACxB,mEAAiE;AACjE,wDAAoE;
|
|
1
|
+
{"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAWlD,8BAAsB,eAAgB,SAAQ,cAAc;IAC1D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAa;IAElE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IACU,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAuDpC;;;;OAIG;IACG,uBAAuB,CAC3B,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAWlD,8BAAsB,eAAgB,SAAQ,cAAc;IAC1D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAa;IAElE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IACU,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAuDpC;;;;OAIG;IACG,uBAAuB,CAC3B,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cAyFb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}
|
|
@@ -68,7 +68,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
68
68
|
}
|
|
69
69
|
catch (e) {
|
|
70
70
|
if (axios_1.default.isAxiosError(e)) {
|
|
71
|
-
|
|
71
|
+
logger.error(`Check deploy status failed with response status code: ${(_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : "NA"}, message: ${JSON.stringify((_c = e.response) === null || _c === void 0 ? void 0 : _c.data)}`);
|
|
72
72
|
throw new deploy_1.CheckDeploymentStatusError(location, new Error(`status code: ${(_e = (_d = e.response) === null || _d === void 0 ? void 0 : _d.status) !== null && _e !== void 0 ? _e : "NA"}, message: ${JSON.stringify((_f = e.response) === null || _f === void 0 ? void 0 : _f.data)}`), this.helpLink);
|
|
73
73
|
}
|
|
74
74
|
throw new deploy_1.CheckDeploymentStatusError(location, e, this.helpLink);
|
|
@@ -79,13 +79,13 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
79
79
|
}
|
|
80
80
|
else if ((res === null || res === void 0 ? void 0 : res.status) === commonConstant_1.HttpStatusCode.OK || (res === null || res === void 0 ? void 0 : res.status) === commonConstant_1.HttpStatusCode.CREATED) {
|
|
81
81
|
if (((_g = res.data) === null || _g === void 0 ? void 0 : _g.status) === deployConstant_1.DeployStatus.Failed) {
|
|
82
|
-
|
|
82
|
+
this.logger.warning(localizeUtils_1.getDefaultString("error.deploy.DeployRemoteStartError", location, JSON.stringify(res.data)));
|
|
83
83
|
}
|
|
84
84
|
return res.data;
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
87
|
if (res.status) {
|
|
88
|
-
|
|
88
|
+
logger.error(`Deployment is failed with error code: ${res.status}.`);
|
|
89
89
|
}
|
|
90
90
|
throw new deploy_1.CheckDeploymentStatusError(location, new Error(`status code: ${(_h = res.status) !== null && _h !== void 0 ? _h : "NA"}`), this.helpLink);
|
|
91
91
|
}
|
|
@@ -105,7 +105,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
105
105
|
const defaultScope = "https://management.azure.com/.default";
|
|
106
106
|
const token = await azureCredential.getToken(defaultScope);
|
|
107
107
|
if (token) {
|
|
108
|
-
|
|
108
|
+
this.logger.info("Get AAD token successfully. Upload zip package through AAD Auth mode.");
|
|
109
109
|
return {
|
|
110
110
|
headers: {
|
|
111
111
|
"Content-Type": "application/octet-stream",
|
|
@@ -121,14 +121,14 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
121
121
|
this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-AAD-token-failed", {
|
|
122
122
|
error: "AAD token is empty.",
|
|
123
123
|
});
|
|
124
|
-
|
|
124
|
+
this.logger.info("Get AAD token failed. AAD Token is empty. Upload zip package through basic auth mode. Please check your Azure credential.");
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
catch (e) {
|
|
128
128
|
this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-AAD-token-failed", {
|
|
129
129
|
error: e.toString(),
|
|
130
130
|
});
|
|
131
|
-
|
|
131
|
+
this.logger.info(`Get AAD token failed with error: ${JSON.stringify(e)}. Upload zip package through basic auth mode.`);
|
|
132
132
|
}
|
|
133
133
|
// IF only enable AAD deploy, throw error
|
|
134
134
|
if (process.env["TEAMSFX_AAD_DEPLOY_ONLY"] === "true") {
|
|
@@ -152,12 +152,12 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
152
152
|
}
|
|
153
153
|
async restartFunctionApp(azureResource) {
|
|
154
154
|
var _a, _b;
|
|
155
|
-
|
|
155
|
+
this.context.logProvider.debug("Restarting function app...");
|
|
156
156
|
try {
|
|
157
157
|
await ((_b = (_a = this.managementClient) === null || _a === void 0 ? void 0 : _a.webApps) === null || _b === void 0 ? void 0 : _b.restart(azureResource.resourceGroupName, azureResource.instanceId));
|
|
158
158
|
}
|
|
159
159
|
catch (e) {
|
|
160
|
-
|
|
160
|
+
this.logger.warning(localizeUtils_1.getLocalizedString("driver.deploy.error.restartWebAppError"));
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AASlC,qDAA4D;AAE5D,qDAAkD;AAClD,yCAAmC;AACnC,0EAAoD;AACpD,wEAAmF;AACnF,0DAAyC;AACzC,uDAA0D;AAC1D,wEAAqE;AACrE,qFAGkD;AAGlD,qDAA+B;AAC/B,qEAAqE;AACrE,iFAA4E;AAC5E,uEAA2F;AAC3F,wDAIqC;AAErC,MAAsB,eAAgB,SAAQ,+BAAc;IAA5D;;QAUY,YAAO,GAA6C,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
|