@microsoft/teamsfx-core 1.12.0 → 1.12.1-rc.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/constants.d.ts +0 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +0 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +0 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +1 -7
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/local/localTelemetryReporter.d.ts +2 -1
- package/build/common/local/localTelemetryReporter.d.ts.map +1 -1
- package/build/common/local/localTelemetryReporter.js +6 -1
- package/build/common/local/localTelemetryReporter.js.map +1 -1
- package/build/common/localizeUtils.d.ts.map +1 -1
- package/build/common/localizeUtils.js +3 -0
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +2 -1
- 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/templates-config.json +1 -1
- package/build/common/tools.d.ts +0 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +8 -8
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.js +1 -1
- package/build/component/code/tabCode.d.ts +4 -0
- package/build/component/code/tabCode.d.ts.map +1 -1
- package/build/component/code/tabCode.js +89 -5
- package/build/component/code/tabCode.js.map +1 -1
- package/build/component/connection/azureResourceConfig.d.ts.map +1 -1
- package/build/component/connection/azureResourceConfig.js +9 -4
- package/build/component/connection/azureResourceConfig.js.map +1 -1
- package/build/component/constants.d.ts +3 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +7 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/core.d.ts +4 -2
- package/build/component/core.d.ts.map +1 -1
- package/build/component/core.js +5 -21
- package/build/component/core.js.map +1 -1
- package/build/component/feature/bot.d.ts +1 -1
- package/build/component/feature/bot.d.ts.map +1 -1
- package/build/component/feature/bot.js +13 -1
- package/build/component/feature/bot.js.map +1 -1
- package/build/component/feature/cicd.d.ts.map +1 -1
- package/build/component/feature/cicd.js +7 -3
- package/build/component/feature/cicd.js.map +1 -1
- package/build/component/feature/tab.d.ts +2 -0
- package/build/component/feature/tab.d.ts.map +1 -1
- package/build/component/feature/tab.js +43 -5
- package/build/component/feature/tab.js.map +1 -1
- package/build/component/migrate.d.ts +88 -0
- package/build/component/migrate.d.ts.map +1 -0
- package/build/component/migrate.js +53 -0
- package/build/component/migrate.js.map +1 -0
- package/build/component/resource/appManifest/appManifest.d.ts.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +1 -6
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/appManifest/constants.d.ts +1 -1
- package/build/component/resource/appManifest/constants.d.ts.map +1 -1
- package/build/component/resource/appManifest/constants.js +1 -1
- package/build/component/resource/appManifest/constants.js.map +1 -1
- package/build/component/resource/azureAppService/azureAppService.d.ts +13 -0
- package/build/component/resource/azureAppService/azureAppService.d.ts.map +1 -0
- package/build/component/resource/azureAppService/azureAppService.js +72 -0
- package/build/component/resource/azureAppService/azureAppService.js.map +1 -0
- package/build/component/resource/{azureFunction.d.ts → azureAppService/azureFunction.d.ts} +6 -6
- package/build/component/resource/azureAppService/azureFunction.d.ts.map +1 -0
- package/build/component/resource/azureAppService/azureFunction.js +60 -0
- package/build/component/resource/azureAppService/azureFunction.js.map +1 -0
- package/build/component/resource/azureAppService/azureWebApp.d.ts +19 -0
- package/build/component/resource/azureAppService/azureWebApp.d.ts.map +1 -0
- package/build/component/resource/azureAppService/azureWebApp.js +33 -0
- package/build/component/resource/azureAppService/azureWebApp.js.map +1 -0
- package/build/component/resource/azureAppService/errors.d.ts +15 -0
- package/build/component/resource/azureAppService/errors.d.ts.map +1 -0
- package/build/component/resource/azureAppService/errors.js +54 -0
- package/build/component/resource/azureAppService/errors.js.map +1 -0
- package/build/component/resource/azureAppService/messages.d.ts +10 -0
- package/build/component/resource/azureAppService/messages.d.ts.map +1 -0
- package/build/component/resource/azureAppService/messages.js +30 -0
- package/build/component/resource/azureAppService/messages.js.map +1 -0
- package/build/component/resource/azureResource.d.ts.map +1 -1
- package/build/component/resource/azureResource.js +9 -4
- package/build/component/resource/azureResource.js.map +1 -1
- package/build/component/resource/azureSql/actions/configure.d.ts.map +1 -1
- package/build/component/resource/azureSql/actions/configure.js +3 -3
- package/build/component/resource/azureSql/actions/configure.js.map +1 -1
- package/build/component/resource/azureSql/actions/provision.d.ts.map +1 -1
- package/build/component/resource/azureSql/actions/provision.js +1 -1
- package/build/component/resource/azureSql/actions/provision.js.map +1 -1
- package/build/component/resource/azureStorage.d.ts +1 -1
- package/build/component/resource/azureStorage.d.ts.map +1 -1
- package/build/component/resource/azureStorage.js +30 -13
- package/build/component/resource/azureStorage.js.map +1 -1
- package/build/component/resource/botService.d.ts +4 -2
- package/build/component/resource/botService.d.ts.map +1 -1
- package/build/component/resource/botService.js +17 -42
- package/build/component/resource/botService.js.map +1 -1
- package/build/component/utils.d.ts +2 -1
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +39 -24
- package/build/component/utils.js.map +1 -1
- package/build/component/workflow.d.ts +1 -0
- package/build/component/workflow.d.ts.map +1 -1
- package/build/component/workflow.js +24 -5
- package/build/component/workflow.js.map +1 -1
- package/build/core/FxCore.d.ts +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +61 -38
- package/build/core/FxCore.js.map +1 -1
- package/build/core/downloadSample.d.ts.map +1 -1
- package/build/core/downloadSample.js +10 -2
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/environment.d.ts +1 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +29 -16
- package/build/core/environment.js.map +1 -1
- package/build/core/generateAadManifestTemplate.d.ts.map +1 -1
- package/build/core/generateAadManifestTemplate.js +2 -1
- package/build/core/generateAadManifestTemplate.js.map +1 -1
- package/build/core/middleware/MigrationUtils.js +1 -1
- package/build/core/middleware/MigrationUtils.js.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.js +2 -4
- package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +1 -4
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriter.js +5 -4
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/envInfoWriterV3.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriterV3.js +4 -0
- package/build/core/middleware/envInfoWriterV3.js.map +1 -1
- package/build/core/middleware/index.d.ts +0 -2
- package/build/core/middleware/index.d.ts.map +1 -1
- package/build/core/middleware/index.js +0 -2
- package/build/core/middleware/index.js.map +1 -1
- package/build/core/middleware/questionModelV3.d.ts.map +1 -1
- package/build/core/middleware/questionModelV3.js +3 -6
- package/build/core/middleware/questionModelV3.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +9 -13
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.d.ts +4 -3
- package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.js +21 -7
- package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.d.ts +0 -1
- package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.js +3 -51
- package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/questions.d.ts +8 -1
- package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/questions.js +94 -1
- package/build/plugins/resource/apiconnector/questions.js.map +1 -1
- package/build/plugins/resource/apiconnector/telemetry.d.ts +1 -0
- package/build/plugins/resource/apiconnector/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/telemetry.js +1 -0
- package/build/plugins/resource/apiconnector/telemetry.js.map +1 -1
- package/build/plugins/resource/apiconnector/utils.d.ts +2 -1
- package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/utils.js +11 -1
- package/build/plugins/resource/apiconnector/utils.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +19 -40
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +6 -14
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +7 -232
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +4 -0
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +17 -10
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +5 -5
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +3 -3
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +75 -182
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +1 -9
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +89 -241
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts +7 -2
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +8 -22
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +1 -19
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +3 -46
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +3 -0
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +3 -0
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +12 -36
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.d.ts +3 -0
- package/build/plugins/resource/bot/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js +16 -0
- package/build/plugins/resource/bot/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/bot/v2/common.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/common.js +4 -7
- package/build/plugins/resource/bot/v2/common.js.map +1 -1
- package/build/plugins/resource/cicd/utils/buildScripts.d.ts.map +1 -1
- package/build/plugins/resource/cicd/utils/buildScripts.js +38 -16
- package/build/plugins/resource/cicd/utils/buildScripts.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +3 -9
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +2 -2
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +7 -23
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js +14 -0
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/plugins/resource/spfx/plugin.d.ts.map +1 -1
- package/build/plugins/resource/spfx/plugin.js +27 -34
- package/build/plugins/resource/spfx/plugin.js.map +1 -1
- package/build/plugins/resource/utils4v2.js +4 -4
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +0 -7
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +16 -0
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +9 -36
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +3 -7
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +11 -9
- package/templates/bicep/azureFunction.config.orchestration.bicep +3 -3
- package/templates/bicep/azureFunction.provision.orchestration.bicep +10 -10
- package/templates/bicep/azureStorage.provision.orchestration.bicep +8 -8
- package/templates/bicep/azureWebApp.config.orchestration.bicep +3 -3
- package/templates/bicep/azureWebApp.provision.module.bicep +6 -6
- package/templates/bicep/azureWebApp.provision.orchestration.bicep +10 -10
- package/templates/bicep/botService.parameters.json +4 -0
- package/templates/bicep/{botService.config.module.bicep → botService.provision.module.bicep} +2 -2
- package/templates/bicep/botService.provision.orchestration.bicep +8 -0
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/spfx/solution/README.md +1 -1
- package/build/component/resource/azureFunction.d.ts.map +0 -1
- package/build/component/resource/azureFunction.js +0 -117
- package/build/component/resource/azureFunction.js.map +0 -1
- package/build/component/resource/azureWebApp.d.ts +0 -28
- package/build/component/resource/azureWebApp.d.ts.map +0 -1
- package/build/component/resource/azureWebApp.js +0 -99
- package/build/component/resource/azureWebApp.js.map +0 -1
- package/build/core/middleware/localSettingsLoader.d.ts +0 -3
- package/build/core/middleware/localSettingsLoader.d.ts.map +0 -1
- package/build/core/middleware/localSettingsLoader.js +0 -69
- package/build/core/middleware/localSettingsLoader.js.map +0 -1
- package/build/core/middleware/localSettingsWriter.d.ts +0 -6
- package/build/core/middleware/localSettingsWriter.d.ts.map +0 -1
- package/build/core/middleware/localSettingsWriter.js +0 -33
- package/build/core/middleware/localSettingsWriter.js.map +0 -1
- package/templates/bicep/azureFunction.parameters.json +0 -4
- package/templates/bicep/azureWebApp.parameters.json +0 -4
- package/templates/bicep/botService.config.orchestration.bicep +0 -8
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"azureWebApp.js","sourceRoot":"","sources":["../../../../src/component/resource/azureAppService/azureWebApp.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;AACjC,uDAAoD;AAEpD,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,iCAAe;IAAxD;;QACW,SAAI,GAAG,eAAe,CAAC;QACvB,UAAK,GAAG,IAAI,CAAC;QACb,gBAAW,GAAG,eAAe,CAAC;QAC9B,oBAAe,GAAG,aAAa,CAAC;QAChC,YAAO,GAAG;YACjB,UAAU,EAAE;gBACV,GAAG,EAAE,YAAY;gBACjB,aAAa,EAAE,sEAAsE;aACtF;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,UAAU;gBACf,aAAa,EAAE,wDAAwD;aACxE;SACF,CAAC;QACO,oBAAe,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;CAAA,CAAA;AAhBY,mBAAmB;IAD/B,gBAAO,CAAC,eAAe,CAAC;GACZ,mBAAmB,CAgB/B;AAhBY,kDAAmB"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { UserError } from "@microsoft/teamsfx-api";
|
|
2
|
+
export declare class PreconditionError extends UserError {
|
|
3
|
+
constructor(source: string, messages: [string, string], suggestions: string[]);
|
|
4
|
+
}
|
|
5
|
+
export declare class TemplateZipFallbackError extends UserError {
|
|
6
|
+
constructor(source: string);
|
|
7
|
+
}
|
|
8
|
+
export declare class UnzipError extends UserError {
|
|
9
|
+
constructor(source: string, path?: string);
|
|
10
|
+
}
|
|
11
|
+
export declare function CheckThrowSomethingMissing<T>(source: string, name: string, value: T | undefined): T;
|
|
12
|
+
export declare class PackDirectoryExistenceError extends UserError {
|
|
13
|
+
constructor(source: string);
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=errors.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/azureAppService/errors.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,qBAAa,iBAAkB,SAAQ,SAAS;gBAClC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE;CAQ9E;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,MAAM,EAAE,MAAM;CAU3B;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;CAW1C;AAED,wBAAgB,0BAA0B,CAAC,CAAC,EAC1C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,GAAG,SAAS,GACnB,CAAC,CAOH;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,MAAM,EAAE,MAAM;CAS3B"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.PackDirectoryExistenceError = exports.CheckThrowSomethingMissing = exports.UnzipError = exports.TemplateZipFallbackError = exports.PreconditionError = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const messages_1 = require("./messages");
|
|
8
|
+
class PreconditionError extends teamsfx_api_1.UserError {
|
|
9
|
+
constructor(source, messages, suggestions) {
|
|
10
|
+
super(source, new.target.name, `${messages[0]}. Suggestions: ${suggestions.join(" ")}`, `${messages[1]}. Suggestions: ${suggestions.join(" ")}`);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.PreconditionError = PreconditionError;
|
|
14
|
+
class TemplateZipFallbackError extends teamsfx_api_1.UserError {
|
|
15
|
+
constructor(source) {
|
|
16
|
+
super(source, new.target.name, `Failed to download zip package and open local zip package. Suggestions: ${[
|
|
17
|
+
messages_1.Messages.CheckOutputLogAndTryToFix,
|
|
18
|
+
messages_1.Messages.RetryTheCurrentStep,
|
|
19
|
+
].join(" ")}`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.TemplateZipFallbackError = TemplateZipFallbackError;
|
|
23
|
+
class UnzipError extends teamsfx_api_1.UserError {
|
|
24
|
+
constructor(source, path) {
|
|
25
|
+
super(source, new.target.name, `Failed to unzip templates and write to disk. Suggestions: ${[
|
|
26
|
+
messages_1.Messages.CheckOutputLogAndTryToFix,
|
|
27
|
+
messages_1.Messages.ReopenWorkingDir(path),
|
|
28
|
+
messages_1.Messages.RetryTheCurrentStep,
|
|
29
|
+
].join(" ")}`);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.UnzipError = UnzipError;
|
|
33
|
+
function CheckThrowSomethingMissing(source, name, value) {
|
|
34
|
+
if (!value) {
|
|
35
|
+
throw new PreconditionError(source, messages_1.Messages.SomethingIsMissing(name), [
|
|
36
|
+
messages_1.Messages.RetryTheCurrentStep,
|
|
37
|
+
]);
|
|
38
|
+
}
|
|
39
|
+
return value;
|
|
40
|
+
}
|
|
41
|
+
exports.CheckThrowSomethingMissing = CheckThrowSomethingMissing;
|
|
42
|
+
class PackDirectoryExistenceError extends teamsfx_api_1.UserError {
|
|
43
|
+
constructor(source) {
|
|
44
|
+
const msg0 = `${messages_1.Messages.SomethingIsNotExisting("pack directory")[0]} Suggestions: ${[
|
|
45
|
+
messages_1.Messages.RecreateTheProject[0],
|
|
46
|
+
].join(" ")}`;
|
|
47
|
+
const msg1 = `${messages_1.Messages.SomethingIsNotExisting("pack directory")[1]} Suggestions: ${[
|
|
48
|
+
messages_1.Messages.RecreateTheProject[1],
|
|
49
|
+
].join(" ")}`;
|
|
50
|
+
super(source, new.target.name, msg0, msg1);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.PackDirectoryExistenceError = PackDirectoryExistenceError;
|
|
54
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/component/resource/azureAppService/errors.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,yCAAsC;AAEtC,MAAa,iBAAkB,SAAQ,uBAAS;IAC9C,YAAY,MAAc,EAAE,QAA0B,EAAE,WAAqB;QAC3E,KAAK,CACH,MAAM,EACN,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,GAAG,QAAQ,CAAC,CAAC,CAAC,kBAAkB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EACvD,GAAG,QAAQ,CAAC,CAAC,CAAC,kBAAkB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACxD,CAAC;IACJ,CAAC;CACF;AATD,8CASC;AAED,MAAa,wBAAyB,SAAQ,uBAAS;IACrD,YAAY,MAAc;QACxB,KAAK,CACH,MAAM,EACN,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,2EAA2E;YACzE,mBAAQ,CAAC,yBAAyB;YAClC,mBAAQ,CAAC,mBAAmB;SAC7B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACd,CAAC;IACJ,CAAC;CACF;AAXD,4DAWC;AAED,MAAa,UAAW,SAAQ,uBAAS;IACvC,YAAY,MAAc,EAAE,IAAa;QACvC,KAAK,CACH,MAAM,EACN,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,6DAA6D;YAC3D,mBAAQ,CAAC,yBAAyB;YAClC,mBAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/B,mBAAQ,CAAC,mBAAmB;SAC7B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACd,CAAC;IACJ,CAAC;CACF;AAZD,gCAYC;AAED,SAAgB,0BAA0B,CACxC,MAAc,EACd,IAAY,EACZ,KAAoB;IAEpB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,iBAAiB,CAAC,MAAM,EAAE,mBAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YACrE,mBAAQ,CAAC,mBAAmB;SAC7B,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAXD,gEAWC;AAED,MAAa,2BAA4B,SAAQ,uBAAS;IACxD,YAAY,MAAc;QACxB,MAAM,IAAI,GAAG,GAAG,mBAAQ,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,iBAAiB;YACnF,mBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,GAAG,mBAAQ,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,iBAAiB;YACnF,mBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACd,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAVD,kEAUC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare class Messages {
|
|
2
|
+
static readonly SomethingIsMissing: (something: string) => [string, string];
|
|
3
|
+
static readonly SomethingIsNotExisting: (something: string) => [string, string];
|
|
4
|
+
static readonly WorkingDirIsMissing: [string, string];
|
|
5
|
+
static readonly RetryTheCurrentStep: string;
|
|
6
|
+
static readonly RecreateTheProject: [string, string];
|
|
7
|
+
static readonly CheckOutputLogAndTryToFix: string;
|
|
8
|
+
static readonly ReopenWorkingDir: (path?: string) => string;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/component/resource/azureAppService/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,QAAQ;IACnB,gBAAuB,kBAAkB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAG/E;IACF,gBAAuB,sBAAsB,cAAe,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGnF;IACF,gBAAuB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAG1D;IAGF,gBAAuB,mBAAmB,SAExC;IACF,gBAAuB,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAGzD;IACF,gBAAuB,yBAAyB,SAE9C;IACF,gBAAuB,gBAAgB,qBAAgB,MAAM,CACE;CAChE"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.Messages = void 0;
|
|
6
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
7
|
+
class Messages {
|
|
8
|
+
}
|
|
9
|
+
exports.Messages = Messages;
|
|
10
|
+
Messages.SomethingIsMissing = (something) => [
|
|
11
|
+
localizeUtils_1.getDefaultString("plugins.bot.SomethingIsMissing", something),
|
|
12
|
+
localizeUtils_1.getLocalizedString("plugins.bot.SomethingIsMissing", something),
|
|
13
|
+
];
|
|
14
|
+
Messages.SomethingIsNotExisting = (something) => [
|
|
15
|
+
localizeUtils_1.getDefaultString("plugins.bot.SomethingNotExisting", something),
|
|
16
|
+
localizeUtils_1.getLocalizedString("plugins.bot.SomethingNotExisting", something),
|
|
17
|
+
];
|
|
18
|
+
Messages.WorkingDirIsMissing = [
|
|
19
|
+
localizeUtils_1.getDefaultString("plugins.bot.WorkingDirMissing"),
|
|
20
|
+
localizeUtils_1.getLocalizedString("plugins.bot.WorkingDirMissing"),
|
|
21
|
+
];
|
|
22
|
+
// Suggestions
|
|
23
|
+
Messages.RetryTheCurrentStep = localizeUtils_1.getLocalizedString("suggestions.retryTheCurrentStep");
|
|
24
|
+
Messages.RecreateTheProject = [
|
|
25
|
+
localizeUtils_1.getDefaultString("plugins.bot.RecreateProject"),
|
|
26
|
+
localizeUtils_1.getLocalizedString("plugins.bot.RecreateProject"),
|
|
27
|
+
];
|
|
28
|
+
Messages.CheckOutputLogAndTryToFix = localizeUtils_1.getLocalizedString("plugins.bot.CheckLogAndFix");
|
|
29
|
+
Messages.ReopenWorkingDir = (path = "") => localizeUtils_1.getLocalizedString("plugins.bot.CheckPathWriteAccess", path);
|
|
30
|
+
//# sourceMappingURL=messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../../src/component/resource/azureAppService/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iEAAqF;AAErF,MAAa,QAAQ;;AAArB,4BA2BC;AA1BwB,2BAAkB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CAAC;IACnF,gCAAgB,CAAC,gCAAgC,EAAE,SAAS,CAAC;IAC7D,kCAAkB,CAAC,gCAAgC,EAAE,SAAS,CAAC;CAChE,CAAC;AACqB,+BAAsB,GAAG,CAAC,SAAiB,EAAoB,EAAE,CAAC;IACvF,gCAAgB,CAAC,kCAAkC,EAAE,SAAS,CAAC;IAC/D,kCAAkB,CAAC,kCAAkC,EAAE,SAAS,CAAC;CAClE,CAAC;AACqB,4BAAmB,GAAqB;IAC7D,gCAAgB,CAAC,+BAA+B,CAAC;IACjD,kCAAkB,CAAC,+BAA+B,CAAC;CACpD,CAAC;AAEF,cAAc;AACS,4BAAmB,GAAG,kCAAkB,CAC7D,iCAAiC,CAClC,CAAC;AACqB,2BAAkB,GAAqB;IAC5D,gCAAgB,CAAC,6BAA6B,CAAC;IAC/C,kCAAkB,CAAC,6BAA6B,CAAC;CAClD,CAAC;AACqB,kCAAyB,GAAG,kCAAkB,CACnE,4BAA4B,CAC7B,CAAC;AACqB,yBAAgB,GAAG,CAAC,IAAI,GAAG,EAAE,EAAU,EAAE,CAC9D,kCAAkB,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureResource.d.ts","sourceRoot":"","sources":["../../../src/component/resource/azureResource.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,EAEN,aAAa,EACb,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,kBAAkB,CAAC;AAI1B,8BAAsB,aAAc,YAAW,aAAa;IAC1D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC1C,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,qBAAqB,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEhG,aAAa,CACX,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"azureResource.d.ts","sourceRoot":"","sources":["../../../src/component/resource/azureResource.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,EAEN,aAAa,EACb,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,kBAAkB,CAAC;AAI1B,8BAAsB,aAAc,YAAW,aAAa;IAC1D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC1C,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,qBAAqB,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEhG,aAAa,CACX,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CA0DrD"}
|
|
@@ -30,22 +30,27 @@ class AzureResource {
|
|
|
30
30
|
return teamsfx_api_1.ok([bicep]);
|
|
31
31
|
},
|
|
32
32
|
execute: async (context, inputs) => {
|
|
33
|
+
var _a;
|
|
33
34
|
const pmPath = path.join(folder_1.getTemplatesFolder(), "bicep", `${this.bicepModuleName}.provision.module.bicep`);
|
|
34
35
|
const poPath = path.join(folder_1.getTemplatesFolder(), "bicep", `${this.bicepModuleName}.provision.orchestration.bicep`);
|
|
35
|
-
let module = await fs_extra_1.default.readFile(pmPath, "utf-8");
|
|
36
36
|
if (this.getTemplateContext) {
|
|
37
37
|
try {
|
|
38
38
|
this.templateContext = this.getTemplateContext(context, inputs);
|
|
39
39
|
}
|
|
40
|
-
catch (
|
|
40
|
+
catch (_b) { }
|
|
41
41
|
}
|
|
42
|
+
const moduleName = (_a = this.bicepModuleName + inputs.componentName) !== null && _a !== void 0 ? _a : "";
|
|
43
|
+
this.templateContext.componentId = inputs.componentId;
|
|
44
|
+
this.templateContext.componentName = inputs.componentName;
|
|
45
|
+
let module = await fs_extra_1.default.readFile(pmPath, "utf-8");
|
|
46
|
+
let orchestration = await fs_extra_1.default.readFile(poPath, "utf-8");
|
|
42
47
|
module = tools_1.compileHandlebarsTemplateString(module, this.templateContext);
|
|
43
|
-
|
|
48
|
+
orchestration = tools_1.compileHandlebarsTemplateString(orchestration, this.templateContext);
|
|
44
49
|
const parametersPath = path.join(folder_1.getTemplatesFolder(), "bicep", `${this.bicepModuleName}.parameters.json`);
|
|
45
50
|
const bicep = {
|
|
46
51
|
type: "bicep",
|
|
47
52
|
Provision: {
|
|
48
|
-
Modules: { [
|
|
53
|
+
Modules: { [moduleName]: module },
|
|
49
54
|
Orchestration: orchestration,
|
|
50
55
|
},
|
|
51
56
|
Parameters: (await fs_extra_1.default.pathExists(parametersPath))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureResource.js","sourceRoot":"","sources":["../../../src/component/resource/azureResource.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAWgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,4BAA0B;AAC1B,8CAAqE;AACrE,yCAAkD;AAElD,MAAsB,aAAa;IAAnC;QAKE,oBAAe,GAAwB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"azureResource.js","sourceRoot":"","sources":["../../../src/component/resource/azureResource.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAWgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,4BAA0B;AAC1B,8CAAqE;AACrE,yCAAkD;AAElD,MAAsB,aAAa;IAAnC;QAKE,oBAAe,GAAwB,EAAE,CAAC;IAgE5C,CAAC;IA7DC,aAAa,CACX,OAAkB,EAClB,MAA6B;QAE7B,MAAM,MAAM,GAAW;YACrB,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,gBAAgB;YAClC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,CAAC,OAAkB,EAAE,MAA6B,EAAE,EAAE;gBAC1D,MAAM,KAAK,GAAU;oBACnB,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE;wBACT,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE;wBACxC,aAAa,EAAE,GAAG;qBACnB;oBACD,UAAU,EAAE,EAAE;iBACf,CAAC;gBACF,OAAO,gBAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YACrB,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,OAAkB,EAAE,MAA6B,EAAE,EAAE;;gBACnE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,2BAAkB,EAAE,EACpB,OAAO,EACP,GAAG,IAAI,CAAC,eAAe,yBAAyB,CACjD,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,2BAAkB,EAAE,EACpB,OAAO,EACP,GAAG,IAAI,CAAC,eAAe,gCAAgC,CACxD,CAAC;gBACF,IAAI,IAAI,CAAC,kBAAkB,EAAE;oBAC3B,IAAI;wBACF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;qBACjE;oBAAC,WAAM,GAAE;iBACX;gBACD,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,aAAa,mCAAI,EAAE,CAAC;gBACrE,IAAI,CAAC,eAAe,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBACtD,IAAI,CAAC,eAAe,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;gBAC1D,IAAI,MAAM,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAChD,IAAI,aAAa,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM,GAAG,uCAA+B,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;gBACvE,aAAa,GAAG,uCAA+B,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;gBACrF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAC9B,2BAAkB,EAAE,EACpB,OAAO,EACP,GAAG,IAAI,CAAC,eAAe,kBAAkB,CAC1C,CAAC;gBACF,MAAM,KAAK,GAAU;oBACnB,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE;wBACT,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE;wBACjC,aAAa,EAAE,aAAa;qBAC7B;oBACD,UAAU,EAAE,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;wBAC/C,CAAC,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,cAAc,CAAC;wBACnC,CAAC,CAAC,SAAS;iBACd,CAAC;gBACF,OAAO,gBAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YACrB,CAAC;SACF,CAAC;QACF,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;CACF;AArED,sCAqEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/configure.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EACT,qBAAqB,EAErB,cAAc,EACd,kBAAkB,EAClB,EAAE,EACF,oBAAoB,EACpB,WAAW,EACX,MAAM,EACN,OAAO,EACP,MAAM,EACN,SAAS,EACV,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/configure.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EACT,qBAAqB,EAErB,cAAc,EACd,kBAAkB,EAClB,EAAE,EACF,oBAAoB,EACpB,WAAW,EACX,MAAM,EACN,OAAO,EACP,MAAM,EACN,SAAS,EACV,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAM3C,OAAO,EAAc,SAAS,EAAY,MAAM,iBAAiB,CAAC;AAClE,qBAAa,wBAAwB;IACnC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAS;IAC/B,MAAM,CAAC,QAAQ,CAAC,KAAK,oBAAoB;IACzC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,2BAA2B;IACjE,MAAM,CAAC,QAAQ,CAAC,aAAa,qBAAqB;IAClD,MAAM,CAAC,QAAQ,CAAC,eAAe;;;MAG7B;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY,qBAAqB;IACjD,MAAM,CAAC,QAAQ,CAAC,YAAY,YAAa,MAAM,YACS;WAiB3C,OAAO,CAClB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAwErC,MAAM,CAAC,GAAG,IAAI,cAAc;CAU7B;AAED,qBAAa,aAAa;WACX,mBAAmB,CAC9B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;WAQN,eAAe,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;WAgB/E,iBAAiB,CAC5B,MAAM,EAAE,EAAE,CAAC,mBAAmB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,OAAO,CAAC;IASnB,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM;WAatC,eAAe,CAC1B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC;IAgChB,MAAM,CAAC,iBAAiB;CASzB"}
|
|
@@ -26,7 +26,7 @@ class ConfigureActionImplement {
|
|
|
26
26
|
const ctx = context;
|
|
27
27
|
const actionContext = context;
|
|
28
28
|
const solutionConfig = ctx.envInfo.state.solution;
|
|
29
|
-
const state = ctx.envInfo.state[constants_1.ComponentNames.AzureSQL];
|
|
29
|
+
const state = ctx.envInfo.state[constants_1.ComponentStateKeys[constants_1.ComponentNames.AzureSQL]];
|
|
30
30
|
const sqlMgrConfig = config_1.LoadManagementConfig(state);
|
|
31
31
|
const sqlMgrClient = await management_1.ManagementClient.create(ctx.tokenProvider.azureAccountProvider, sqlMgrConfig);
|
|
32
32
|
(_a = actionContext.logger) === null || _a === void 0 ? void 0 : _a.info(constants_2.Message.addFirewall);
|
|
@@ -53,7 +53,7 @@ class ConfigureActionImplement {
|
|
|
53
53
|
if (adminInfo.userType === common_1.UserType.User) {
|
|
54
54
|
(_g = actionContext.progressBar) === null || _g === void 0 ? void 0 : _g.next(ConfigureActionImplement.progressMessage.addUser);
|
|
55
55
|
const sqlClient = await sql_1.SqlClient.create(ctx.tokenProvider.azureAccountProvider, sqlConfig);
|
|
56
|
-
(_h =
|
|
56
|
+
(_h = actionContext.logger) === null || _h === void 0 ? void 0 : _h.info(constants_2.Message.addDatabaseUser(identity));
|
|
57
57
|
await UtilFunctions.addDatabaseUser(ctx.logProvider, sqlClient, sqlMgrClient);
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
@@ -130,7 +130,7 @@ class UtilFunctions {
|
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
static getIdentity(ctx) {
|
|
133
|
-
const config = ctx.envInfo.state[constants_1.ComponentNames.Identity];
|
|
133
|
+
const config = ctx.envInfo.state[constants_1.ComponentStateKeys[constants_1.ComponentNames.Identity]];
|
|
134
134
|
const identity = config[constants_2.Constants.identityName];
|
|
135
135
|
if (!identity) {
|
|
136
136
|
const error = results_1.SqlResultFactory.SystemError(errors_1.ErrorMessage.SqlGetConfigError.name, errors_1.ErrorMessage.SqlGetConfigError.message(constants_2.Constants.identityPlugin, constants_2.Constants.identityName));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/configure.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAagC;AAChC,4DAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/configure.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAagC;AAChC,4DAA+B;AAC/B,kDAM4B;AAC5B,uDAAoE;AACpE,iEAAgE;AAChE,6EAAgG;AAChG,6DAAsF;AAEtF,sDAAyD;AACzD,wCAA2C;AAC3C,sCAA+E;AAC/E,4CAAwE;AACxE,sCAAyC;AACzC,4CAAiG;AACjG,wCAA8C;AAC9C,4CAAkE;AAClE,MAAa,wBAAwB;IA4BnC,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,OAAkB,EAClB,MAA6B;;QAE7B,MAAM,GAAG,GAAG,OAA6B,CAAC;QAC1C,MAAM,aAAa,GAAG,OAAwB,CAAC;QAC/C,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAkC,CAAC;QAC5E,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,8BAAkB,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,6BAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,MAAM,6BAAgB,CAAC,MAAM,CAChD,GAAG,CAAC,aAAa,CAAC,oBAAoB,EACtC,YAAY,CACb,CAAC;QAEF,MAAA,aAAa,CAAC,MAAM,0CAAE,IAAI,CAAC,mBAAO,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;QAE1C,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;QAC9F,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,mBAAmB,CACxD,YAAY,EACZ,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,QAAQ,EAClB,cAAc,CAAC,QAAQ,CACxB,CAAC;QACF,IAAI,UAAU,EAAE;YACd,MAAA,aAAa,CAAC,MAAM,0CAAE,IAAI,CAAC,mBAAO,CAAC,eAAe,CAAC,CAAC;SACrD;aAAM;YACL,MAAA,aAAa,CAAC,MAAM,0CAAE,IAAI,CAAC,mBAAO,CAAC,cAAc,CAAC,CAAC;SACpD;QAED,oBAAoB;QACpB,MAAM,SAAS,GAAG,sBAAa,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,gBAAS,CAAC,GAAG,CAAC,0BAAc,CAAC,QAAQ,CAAQ,CAAC;QAC/D,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzD,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,sBAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAC1D,cAAc,EACd,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC,CAAC;QACF,MAAA,aAAa,CAAC,SAAS,0CAAE,WAAW,CAClC,qBAAS,CAAC,UAAU,CAAC,cAAc,EACnC,cAAc,CAAC,CAAC,CAAC,8BAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,8BAAkB,CAAC,MAAM,CAAC,EAAE,CAC9E,CAAC;QACF,MAAA,aAAa,CAAC,SAAS,0CAAE,WAAW,CAClC,qBAAS,CAAC,UAAU,CAAC,OAAO,EAC5B,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CACtC,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE;YACnB,IAAI,SAAS,CAAC,QAAQ,KAAK,iBAAQ,CAAC,IAAI,EAAE;gBACxC,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAClF,MAAM,SAAS,GAAG,MAAM,eAAS,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;gBAC5F,MAAA,aAAa,CAAC,MAAM,0CAAE,IAAI,CAAC,mBAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9D,MAAM,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;aAC/E;iBAAM;gBACL,MAAM,OAAO,GAAG,qBAAY,CAAC,uBAAuB,CAClD,QAAQ,EACR,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAC9B,CAAC;gBACF,MAAA,aAAa,CAAC,MAAM,0CAAE,OAAO,CAC3B,GAAG,OAAO,oBAAoB,qBAAS,CAAC,OAAO,yBAAyB,QAAQ,EAAE,CACnF,CAAC;aACH;SACF;aAAM;YACL,MAAA,aAAa,CAAC,MAAM,0CAAE,OAAO,CAC3B,6CAA6C,qBAAS,CAAC,OAAO,yBAAyB,QAAQ,EAAE,CAClG,CAAC;SACH;QACD,MAAM,YAAY,CAAC,uBAAuB,EAAE,CAAC;QAC7C,OAAO,gBAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO;YACL,IAAI,EAAE,GAAG,0BAAc,CAAC,QAAQ,IAAI,uBAAW,CAAC,SAAS,EAAE;YAC3D,IAAI,EAAE,8BAAkB;YACxB,IAAI,EAAE,CAAC,OAAkB,EAAE,MAA6B,EAAE,EAAE;gBAC1D,OAAO,gBAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;YAClF,CAAC;YACD,OAAO,EAAE,wBAAwB,CAAC,OAAO;SAC1C,CAAC;IACJ,CAAC;;AA/Ge,+BAAM,GAAG,KAAK,CAAC;AACf,8BAAK,GAAG,gBAAgB,CAAC;AACzB,+CAAsB,GAAG,uBAAuB,CAAC;AACjD,sCAAa,GAAG,iBAAiB,CAAC;AAClC,wCAAe,GAAG;IAChC,SAAS,EAAE,6BAA6B;IACxC,OAAO,EAAE,yBAAyB;CACnC,CAAC;AACc,qCAAY,GAAG,iBAAiB,CAAC;AACjC,qCAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CACjD,GAAG,wBAAwB,CAAC,YAAY,IAAI,OAAO,EAAE,CAAC;AAiBxD;IAfC,WAAK,CAAC;QACL,uBAAW,CACT,oCAAwB,CAAC,IAAI,CAC3B,IAAI,EACJ,wBAAwB,CAAC,KAAK,EAC9B,wBAAwB,CAAC,sBAAsB,CAChD,CACF;QACD,uCAAmB,CAAC,wBAAwB,CAAC,MAAM,EAAE,sCAAkB,CAAC;QACxE,2BAAa,CACX,wBAAwB,CAAC,aAAa,EACtC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC,MAAM,CAC7D;QACD,iBAAQ,CAAC,qBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,wBAAwB,CAAC,YAAY,CAAC,CAAC;KACzE,CAAC;;;;6CA0ED;AArGH,4DAiHC;AAED,MAAa,aAAa;IACxB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAC9B,MAAwB,EACxB,QAAgB,EAChB,QAAgB,EAChB,QAAgB;QAEhB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACxD;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,oBAA0C;QACrE,8CAA8C;QAC9C,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,yBAAyB,EAAE,CAAC;YAC1E,MAAM,KAAK,GAAG,MAAM,UAAW,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,OAAO,mBAAU,CAAC,WAAW,CAAC,CAAC;SAChC;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,0BAAgB,CAAC,WAAW,CAChC,qBAAY,CAAC,gBAAgB,CAAC,IAAI,EAClC,qBAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,EACvC,KAAK,CACN,CAAC;SACH;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC5B,MAA8B,EAC9B,oBAA0C;QAE1C,MAAM,cAAc,GAAG,MAAM,CAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,cAAc,KAAK,SAAS,EAAE;YAChC,OAAO,CAAC,MAAM,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,0BAA0B,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;SAClF;aAAM;YACL,OAAO,cAAyB,CAAC;SAClC;IACH,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAuB;QACxC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,8BAAkB,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,CAAC,qBAAS,CAAC,YAAY,CAAW,CAAC;QAC1D,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,KAAK,GAAG,0BAAgB,CAAC,WAAW,CACxC,qBAAY,CAAC,iBAAiB,CAAC,IAAI,EACnC,qBAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,qBAAS,CAAC,cAAc,EAAE,qBAAS,CAAC,YAAY,CAAC,CACzF,CAAC;YACF,MAAM,KAAK,CAAC;SACb;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAC1B,WAAwB,EACxB,SAAoB,EACpB,gBAAkC;QAElC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,gBAAgB,GAA+B,EAAE,CAAC;QACxD,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7C,gBAAgB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE;YACX,IAAI;gBACF,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;oBACvC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;wBAC/B,MAAM,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;wBAC1C,gBAAgB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;qBACnC;iBACF;gBACD,OAAO;aACR;YAAC,OAAO,KAAK,EAAE;gBACd,IACE,CAAC,eAAS,CAAC,eAAe,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAC;oBAC7C,UAAU,IAAI,qBAAS,CAAC,aAAa,EACrC;oBACA,MAAM,KAAK,CAAC;iBACb;qBAAM;oBACL,UAAU,EAAE,CAAC;oBACb,WAAW,CAAC,OAAO,CACjB,IAAI,qBAAS,CAAC,UAAU,iJAAiJ,UAAU,GAAG,CACvL,CAAC;oBACF,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;iBAC/C;aACF;SACF;IACH,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC;YAC5B,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAiB,CAAC,CAAC,CAAC;QACnD,OAAO,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,iCAAqB,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,mCAAuB,CAAC,CAAC,CAAC;QACzD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AApGD,sCAoGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EACT,qBAAqB,EAErB,cAAc,EAEd,MAAM,EACN,OAAO,EACP,MAAM,EAEP,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EACT,qBAAqB,EAErB,cAAc,EAEd,MAAM,EACN,OAAO,EACP,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAiBhC,qBAAa,wBAAwB;IACnC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAS;IAC/B,MAAM,CAAC,QAAQ,CAAC,KAAK,mBAAmB;IACxC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,2BAA2B;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,qBAAqB;IACjD,MAAM,CAAC,QAAQ,CAAC,YAAY,YAAa,MAAM,YACS;WAa3C,OAAO,CAClB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAgCrC,MAAM,CAAC,GAAG,IAAI,cAAc;CAa7B"}
|
|
@@ -21,7 +21,7 @@ class ProvisionActionImplement {
|
|
|
21
21
|
var _a;
|
|
22
22
|
var _b, _c;
|
|
23
23
|
const ctx = context;
|
|
24
|
-
const state = ((_a = (_b = ctx.envInfo.state)[_c = constants_1.ComponentNames.AzureSQL]) !== null && _a !== void 0 ? _a : (_b[_c] = {}));
|
|
24
|
+
const state = ((_a = (_b = ctx.envInfo.state)[_c = constants_1.ComponentStateKeys[constants_1.ComponentNames.AzureSQL]]) !== null && _a !== void 0 ? _a : (_b[_c] = {}));
|
|
25
25
|
config_1.removeDatabases(state);
|
|
26
26
|
let shouldAsk;
|
|
27
27
|
if (state.sqlResourceId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/provision.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAUgC;AAChC,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/component/resource/azureSql/actions/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorage.d.ts","sourceRoot":"","sources":["../../../src/component/resource/azureStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAEN,SAAS,EAET,OAAO,EACP,qBAAqB,EACrB,YAAY,EAGZ,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"azureStorage.d.ts","sourceRoot":"","sources":["../../../src/component/resource/azureStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAEN,SAAS,EAET,OAAO,EACP,qBAAqB,EACrB,YAAY,EAGZ,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAY1B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBACa,oBAAqB,SAAQ,aAAa;IACrD,QAAQ,CAAC,IAAI,mBAAmB;IAChC,QAAQ,CAAC,eAAe,kBAAkB;IAC1C,QAAQ,CAAC,OAAO;;;;;;;;;;;;;;;;;MAiBd;IACF,QAAQ,CAAC,eAAe,WAAqD;IAC7E,SAAS,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAwCpD,MAAM,CACJ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CA4CrD"}
|
|
@@ -9,12 +9,12 @@ require("reflect-metadata");
|
|
|
9
9
|
const typedi_1 = require("typedi");
|
|
10
10
|
const path = tslib_1.__importStar(require("path"));
|
|
11
11
|
const configs_1 = require("../../plugins/resource/frontend/configs");
|
|
12
|
-
const constants_1 = require("../constants");
|
|
13
12
|
const tools_1 = require("../../common/tools");
|
|
14
13
|
const error_1 = require("../../plugins/resource/frontend/v3/error");
|
|
15
14
|
const clients_1 = require("../../plugins/resource/frontend/clients");
|
|
16
15
|
const deploy_1 = require("../../plugins/resource/frontend/ops/deploy");
|
|
17
16
|
const azureResource_1 = require("./azureResource");
|
|
17
|
+
const workflow_1 = require("../workflow");
|
|
18
18
|
let AzureStorageResource = class AzureStorageResource extends azureResource_1.AzureResource {
|
|
19
19
|
constructor() {
|
|
20
20
|
super(...arguments);
|
|
@@ -23,22 +23,22 @@ let AzureStorageResource = class AzureStorageResource extends azureResource_1.Az
|
|
|
23
23
|
this.outputs = {
|
|
24
24
|
endpoint: {
|
|
25
25
|
key: "endpoint",
|
|
26
|
-
bicepVariable: "provisionOutputs.
|
|
26
|
+
bicepVariable: "provisionOutputs.azureStorage{{componentName}}Output.value.endpoint",
|
|
27
27
|
},
|
|
28
28
|
resourceId: {
|
|
29
29
|
key: "resourceId",
|
|
30
|
-
bicepVariable: "provisionOutputs.
|
|
30
|
+
bicepVariable: "provisionOutputs.azureStorage{{componentName}}Output.value.resourceId",
|
|
31
31
|
},
|
|
32
32
|
domain: {
|
|
33
|
-
key: "
|
|
34
|
-
bicepVariable: "provisionOutputs.
|
|
33
|
+
key: "domain",
|
|
34
|
+
bicepVariable: "provisionOutputs.azureStorage{{componentName}}Output.value.domain",
|
|
35
35
|
},
|
|
36
|
-
|
|
36
|
+
indexPath: {
|
|
37
37
|
key: "indexPath",
|
|
38
|
-
bicepVariable: "provisionOutputs.
|
|
38
|
+
bicepVariable: "provisionOutputs.azureStorage{{componentName}}Output.value.indexPath",
|
|
39
39
|
},
|
|
40
40
|
};
|
|
41
|
-
this.finalOutputKeys = ["endpoint"];
|
|
41
|
+
this.finalOutputKeys = ["domain", "endpoint", "resourceId", "indexPath"];
|
|
42
42
|
}
|
|
43
43
|
configure(context, inputs) {
|
|
44
44
|
const action = {
|
|
@@ -54,6 +54,17 @@ let AzureStorageResource = class AzureStorageResource extends azureResource_1.Az
|
|
|
54
54
|
]);
|
|
55
55
|
},
|
|
56
56
|
execute: async (context, inputs) => {
|
|
57
|
+
const ctx = context;
|
|
58
|
+
const parent = workflow_1.getHostingParentComponent(ctx.projectSetting, this.name);
|
|
59
|
+
if (!parent) {
|
|
60
|
+
throw new Error("Hosting component no parent");
|
|
61
|
+
}
|
|
62
|
+
const frontendConfigRes = await buildFrontendConfig(ctx.envInfo, parent.name, ctx.tokenProvider.azureAccountProvider);
|
|
63
|
+
if (frontendConfigRes.isErr()) {
|
|
64
|
+
return teamsfx_api_1.err(frontendConfigRes.error);
|
|
65
|
+
}
|
|
66
|
+
const client = new clients_1.AzureStorageClient(frontendConfigRes.value);
|
|
67
|
+
await client.enableStaticWebsite();
|
|
57
68
|
return teamsfx_api_1.ok([
|
|
58
69
|
{
|
|
59
70
|
type: "service",
|
|
@@ -70,7 +81,9 @@ let AzureStorageResource = class AzureStorageResource extends azureResource_1.Az
|
|
|
70
81
|
name: "azure-storage.deploy",
|
|
71
82
|
type: "function",
|
|
72
83
|
plan: (context, inputs) => {
|
|
73
|
-
|
|
84
|
+
var _a;
|
|
85
|
+
const parent = workflow_1.getHostingParentComponent(context.projectSetting, this.name);
|
|
86
|
+
const deployDir = path.resolve(inputs.projectPath, (_a = parent === null || parent === void 0 ? void 0 : parent.folder) !== null && _a !== void 0 ? _a : "");
|
|
74
87
|
return teamsfx_api_1.ok([
|
|
75
88
|
{
|
|
76
89
|
type: "service",
|
|
@@ -81,8 +94,12 @@ let AzureStorageResource = class AzureStorageResource extends azureResource_1.Az
|
|
|
81
94
|
},
|
|
82
95
|
execute: async (context, inputs) => {
|
|
83
96
|
const ctx = context;
|
|
84
|
-
const
|
|
85
|
-
|
|
97
|
+
const parent = workflow_1.getHostingParentComponent(ctx.projectSetting, this.name);
|
|
98
|
+
if (!(parent === null || parent === void 0 ? void 0 : parent.folder)) {
|
|
99
|
+
throw new Error("");
|
|
100
|
+
}
|
|
101
|
+
const deployDir = path.resolve(inputs.projectPath, parent.folder);
|
|
102
|
+
const frontendConfigRes = await buildFrontendConfig(ctx.envInfo, parent.name, ctx.tokenProvider.azureAccountProvider);
|
|
86
103
|
if (frontendConfigRes.isErr()) {
|
|
87
104
|
return teamsfx_api_1.err(frontendConfigRes.error);
|
|
88
105
|
}
|
|
@@ -105,12 +122,12 @@ AzureStorageResource = tslib_1.__decorate([
|
|
|
105
122
|
typedi_1.Service("azure-storage")
|
|
106
123
|
], AzureStorageResource);
|
|
107
124
|
exports.AzureStorageResource = AzureStorageResource;
|
|
108
|
-
async function buildFrontendConfig(envInfo, tokenProvider) {
|
|
125
|
+
async function buildFrontendConfig(envInfo, componentName, tokenProvider) {
|
|
109
126
|
const credentials = await tokenProvider.getAccountCredentialAsync();
|
|
110
127
|
if (!credentials) {
|
|
111
128
|
return teamsfx_api_1.err(new error_1.UnauthenticatedError());
|
|
112
129
|
}
|
|
113
|
-
const storage = envInfo.state[
|
|
130
|
+
const storage = envInfo.state[componentName];
|
|
114
131
|
const resourceId = storage === null || storage === void 0 ? void 0 : storage.resourceId;
|
|
115
132
|
if (!resourceId) {
|
|
116
133
|
return teamsfx_api_1.err(new teamsfx_api_1.UserError({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureStorage.js","sourceRoot":"","sources":["../../../src/component/resource/azureStorage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAagC;AAChC,4BAA0B;AAC1B,mCAAiC;AACjC,mDAA6B;AAC7B,qEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"azureStorage.js","sourceRoot":"","sources":["../../../src/component/resource/azureStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { FxError, Result, Action, ContextV3, MaybePromise, InputsWithProjectPath, ProvisionContextV3,
|
|
1
|
+
import { FxError, Result, Action, ContextV3, MaybePromise, InputsWithProjectPath, ProvisionContextV3, AzureAccountProvider } from "@microsoft/teamsfx-api";
|
|
2
2
|
import "reflect-metadata";
|
|
3
3
|
import { TokenCredentialsBase } from "@azure/ms-rest-nodeauth";
|
|
4
|
-
|
|
4
|
+
import { AzureResource } from "./azureResource";
|
|
5
|
+
export declare class BotService extends AzureResource {
|
|
5
6
|
outputs: {
|
|
6
7
|
botId: {
|
|
7
8
|
key: string;
|
|
@@ -13,6 +14,7 @@ export declare class BotService implements CloudResource {
|
|
|
13
14
|
finalOutputKeys: string[];
|
|
14
15
|
secretFields: string[];
|
|
15
16
|
readonly name = "bot-service";
|
|
17
|
+
readonly bicepModuleName = "botService";
|
|
16
18
|
generateBicep(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
|
|
17
19
|
provision(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
|
|
18
20
|
configure(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botService.d.ts","sourceRoot":"","sources":["../../../src/component/resource/botService.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,
|
|
1
|
+
{"version":3,"file":"botService.d.ts","sourceRoot":"","sources":["../../../src/component/resource/botService.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,EACN,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAGlB,oBAAoB,EAErB,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAgB1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAK/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,qBACa,UAAW,SAAQ,aAAa;IAC3C,OAAO;;;;;;;MAOL;IACF,eAAe,WAA4B;IAC3C,YAAY,WAAmB;IAC/B,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,eAAe,gBAAgB;IACxC,aAAa,CACX,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAYpD,SAAS,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAoFpD,SAAS,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAmDrD;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAgCzF;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,GAAG,EACd,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBrC;AAED,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,oBAAoB,CAAC,CAM/B"}
|
|
@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.getAzureAccountCredential = exports.createBotRegInAppStudio = exports.createBotAAD = exports.BotService = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
-
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
|
-
const path = tslib_1.__importStar(require("path"));
|
|
10
8
|
require("reflect-metadata");
|
|
11
9
|
const typedi_1 = require("typedi");
|
|
12
10
|
const tools_1 = require("../../common/tools");
|
|
13
|
-
const folder_1 = require("../../folder");
|
|
14
11
|
const strings_1 = require("../../plugins/resource/bot/resources/strings");
|
|
15
12
|
const error_1 = require("../../plugins/resource/bot/v3/error");
|
|
16
13
|
const uuid = tslib_1.__importStar(require("uuid"));
|
|
@@ -23,8 +20,10 @@ const constants_2 = require("../constants");
|
|
|
23
20
|
const utils_1 = require("../utils");
|
|
24
21
|
const workflow_1 = require("../workflow");
|
|
25
22
|
const clientFactory = tslib_1.__importStar(require("../../plugins/resource/bot/clientFactory"));
|
|
26
|
-
|
|
23
|
+
const azureResource_1 = require("./azureResource");
|
|
24
|
+
let BotService = class BotService extends azureResource_1.AzureResource {
|
|
27
25
|
constructor() {
|
|
26
|
+
super(...arguments);
|
|
28
27
|
this.outputs = {
|
|
29
28
|
botId: {
|
|
30
29
|
key: "botId",
|
|
@@ -36,41 +35,18 @@ let BotService = class BotService {
|
|
|
36
35
|
this.finalOutputKeys = ["botId", "botPassword"];
|
|
37
36
|
this.secretFields = ["botPassword"];
|
|
38
37
|
this.name = "bot-service";
|
|
38
|
+
this.bicepModuleName = "botService";
|
|
39
39
|
}
|
|
40
40
|
generateBicep(context, inputs) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
},
|
|
51
|
-
};
|
|
52
|
-
return teamsfx_api_1.ok([bicep]);
|
|
53
|
-
},
|
|
54
|
-
execute: async (context, inputs) => {
|
|
55
|
-
const mPath = path.join(folder_1.getTemplatesFolder(), "bicep", "botService.config.module.bicep");
|
|
56
|
-
const oPath = path.join(folder_1.getTemplatesFolder(), "bicep", "botService.config.orchestration.bicep");
|
|
57
|
-
let module = await fs_extra_1.default.readFile(mPath, "utf-8");
|
|
58
|
-
const templateContext = {};
|
|
59
|
-
try {
|
|
60
|
-
const resource = typedi_1.Container.get(inputs.hosting);
|
|
61
|
-
templateContext.endpointVarName = resource.outputs.endpoint.bicepVariable;
|
|
62
|
-
}
|
|
63
|
-
catch (_a) { }
|
|
64
|
-
module = tools_1.compileHandlebarsTemplateString(module, templateContext);
|
|
65
|
-
const orch = await fs_extra_1.default.readFile(oPath, "utf-8");
|
|
66
|
-
const bicep = {
|
|
67
|
-
type: "bicep",
|
|
68
|
-
Configuration: { Modules: { botService: module }, Orchestration: orch },
|
|
69
|
-
};
|
|
70
|
-
return teamsfx_api_1.ok([bicep]);
|
|
71
|
-
},
|
|
72
|
-
};
|
|
73
|
-
return teamsfx_api_1.ok(action);
|
|
41
|
+
var _a;
|
|
42
|
+
try {
|
|
43
|
+
const resource = typedi_1.Container.get(inputs.hosting);
|
|
44
|
+
this.templateContext.endpointVarName = tools_1.compileHandlebarsTemplateString((_a = resource.outputs.endpoint.bicepVariable) !== null && _a !== void 0 ? _a : "", inputs);
|
|
45
|
+
}
|
|
46
|
+
catch (_b) { }
|
|
47
|
+
// Bot service's component must be Bot, omit it.
|
|
48
|
+
inputs.componentName = "";
|
|
49
|
+
return super.generateBicep(context, inputs);
|
|
74
50
|
}
|
|
75
51
|
provision(context, inputs) {
|
|
76
52
|
const action = {
|
|
@@ -182,7 +158,6 @@ let BotService = class BotService {
|
|
|
182
158
|
name: "graph.microsoft.com",
|
|
183
159
|
remarks: "update message endpoint in AppStudio",
|
|
184
160
|
});
|
|
185
|
-
const botServiceState = ctx.envInfo.state[constants_2.ComponentNames.BotService];
|
|
186
161
|
const teamsBotState = ctx.envInfo.state[constants_2.ComponentNames.TeamsBot];
|
|
187
162
|
const appStudioTokenRes = await ctx.tokenProvider.m365TokenProvider.getAccessToken({
|
|
188
163
|
scopes: tools_1.AppStudioScopes,
|
|
@@ -190,9 +165,9 @@ let BotService = class BotService {
|
|
|
190
165
|
const appStudioToken = appStudioTokenRes.isOk() ? appStudioTokenRes.value : undefined;
|
|
191
166
|
error_1.CheckThrowSomethingMissing(strings_1.ConfigNames.LOCAL_ENDPOINT, teamsBotState.endpoint);
|
|
192
167
|
error_1.CheckThrowSomethingMissing(strings_1.ConfigNames.APPSTUDIO_TOKEN, appStudioToken);
|
|
193
|
-
error_1.CheckThrowSomethingMissing(strings_1.ConfigNames.LOCAL_BOT_ID,
|
|
168
|
+
error_1.CheckThrowSomethingMissing(strings_1.ConfigNames.LOCAL_BOT_ID, teamsBotState.botId);
|
|
194
169
|
const botReg = {
|
|
195
|
-
botId:
|
|
170
|
+
botId: teamsBotState.botId,
|
|
196
171
|
name: utils_1.normalizeName(ctx.projectSetting.appName) + strings_1.PluginLocalDebug.LOCAL_DEBUG_SUFFIX,
|
|
197
172
|
description: "",
|
|
198
173
|
iconUrl: "",
|
|
@@ -218,8 +193,8 @@ async function createBotAAD(ctx) {
|
|
|
218
193
|
const graphToken = graphTokenRes.isOk() ? graphTokenRes.value : undefined;
|
|
219
194
|
error_1.CheckThrowSomethingMissing(strings_1.ConfigNames.GRAPH_TOKEN, graphToken);
|
|
220
195
|
error_1.CheckThrowSomethingMissing(strings_1.CommonStrings.SHORT_APP_NAME, ctx.projectSetting.appName);
|
|
221
|
-
ctx.envInfo.state[constants_2.ComponentNames.
|
|
222
|
-
const botConfig = ctx.envInfo.state[constants_2.ComponentNames.
|
|
196
|
+
ctx.envInfo.state[constants_2.ComponentNames.TeamsBot] = ctx.envInfo.state[constants_2.ComponentNames.TeamsBot] || {};
|
|
197
|
+
const botConfig = ctx.envInfo.state[constants_2.ComponentNames.TeamsBot];
|
|
223
198
|
const botAADCreated = (botConfig === null || botConfig === void 0 ? void 0 : botConfig.botId) !== undefined && (botConfig === null || botConfig === void 0 ? void 0 : botConfig.botPassword) !== undefined;
|
|
224
199
|
if (!botAADCreated) {
|
|
225
200
|
const solutionConfig = ctx.envInfo.state.solution;
|