@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.389dbb3f.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.
Files changed (191) hide show
  1. package/build/common/armInterface.d.ts +6 -11
  2. package/build/common/armInterface.d.ts.map +1 -1
  3. package/build/common/tools.d.ts +2 -2
  4. package/build/common/tools.d.ts.map +1 -1
  5. package/build/common/tools.js +1 -5
  6. package/build/common/tools.js.map +1 -1
  7. package/build/core/error.d.ts +1 -0
  8. package/build/core/error.d.ts.map +1 -1
  9. package/build/core/error.js +5 -1
  10. package/build/core/error.js.map +1 -1
  11. package/build/core/index.d.ts +1 -0
  12. package/build/core/index.d.ts.map +1 -1
  13. package/build/core/index.js +46 -4
  14. package/build/core/index.js.map +1 -1
  15. package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
  16. package/build/core/middleware/envInfoLoader.js +23 -2
  17. package/build/core/middleware/envInfoLoader.js.map +1 -1
  18. package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
  19. package/build/core/middleware/envInfoWriter.js +2 -0
  20. package/build/core/middleware/envInfoWriter.js.map +1 -1
  21. package/build/core/middleware/projectMigrator.js +1 -1
  22. package/build/core/middleware/projectMigrator.js.map +1 -1
  23. package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
  24. package/build/core/middleware/projectSettingsLoader.js +1 -0
  25. package/build/core/middleware/projectSettingsLoader.js.map +1 -1
  26. package/build/plugins/resource/aad/index.d.ts +2 -3
  27. package/build/plugins/resource/aad/index.d.ts.map +1 -1
  28. package/build/plugins/resource/aad/index.js.map +1 -1
  29. package/build/plugins/resource/aad/v2/index.d.ts +3 -0
  30. package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
  31. package/build/plugins/resource/aad/v2/index.js +9 -0
  32. package/build/plugins/resource/aad/v2/index.js.map +1 -1
  33. package/build/plugins/resource/apim/index.d.ts.map +1 -1
  34. package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
  35. package/build/plugins/resource/appstudio/index.js +16 -6
  36. package/build/plugins/resource/appstudio/index.js.map +1 -1
  37. package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts +6 -2
  38. package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts.map +1 -1
  39. package/build/plugins/resource/appstudio/plugin.d.ts +1 -1
  40. package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
  41. package/build/plugins/resource/appstudio/plugin.js +123 -36
  42. package/build/plugins/resource/appstudio/plugin.js.map +1 -1
  43. package/build/plugins/resource/appstudio/utils/telemetry.d.ts +1 -0
  44. package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
  45. package/build/plugins/resource/appstudio/utils/telemetry.js +1 -0
  46. package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
  47. package/build/plugins/resource/appstudio/v2/index.d.ts +4 -2
  48. package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
  49. package/build/plugins/resource/appstudio/v2/index.js +9 -3
  50. package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
  51. package/build/plugins/resource/frontend/index.d.ts +1 -2
  52. package/build/plugins/resource/frontend/index.d.ts.map +1 -1
  53. package/build/plugins/resource/frontend/index.js.map +1 -1
  54. package/build/plugins/resource/function/enums.d.ts +1 -0
  55. package/build/plugins/resource/function/enums.d.ts.map +1 -1
  56. package/build/plugins/resource/function/enums.js +1 -0
  57. package/build/plugins/resource/function/enums.js.map +1 -1
  58. package/build/plugins/resource/function/index.d.ts +1 -0
  59. package/build/plugins/resource/function/index.d.ts.map +1 -1
  60. package/build/plugins/resource/function/index.js +5 -0
  61. package/build/plugins/resource/function/index.js.map +1 -1
  62. package/build/plugins/resource/function/plugin.d.ts +1 -0
  63. package/build/plugins/resource/function/plugin.d.ts.map +1 -1
  64. package/build/plugins/resource/function/plugin.js +20 -2
  65. package/build/plugins/resource/function/plugin.js.map +1 -1
  66. package/build/plugins/resource/identity/v2/index.d.ts +2 -1
  67. package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
  68. package/build/plugins/resource/identity/v2/index.js +3 -0
  69. package/build/plugins/resource/identity/v2/index.js.map +1 -1
  70. package/build/plugins/resource/index.d.ts +1 -0
  71. package/build/plugins/resource/index.d.ts.map +1 -1
  72. package/build/plugins/resource/index.js +1 -0
  73. package/build/plugins/resource/index.js.map +1 -1
  74. package/build/plugins/resource/keyvault/constants.d.ts +35 -0
  75. package/build/plugins/resource/keyvault/constants.d.ts.map +1 -0
  76. package/build/plugins/resource/keyvault/constants.js +42 -0
  77. package/build/plugins/resource/keyvault/constants.js.map +1 -0
  78. package/build/plugins/resource/keyvault/index.d.ts +14 -0
  79. package/build/plugins/resource/keyvault/index.d.ts.map +1 -0
  80. package/build/plugins/resource/keyvault/index.js +60 -0
  81. package/build/plugins/resource/keyvault/index.js.map +1 -0
  82. package/build/plugins/resource/keyvault/plugin.d.ts +6 -0
  83. package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -0
  84. package/build/plugins/resource/keyvault/plugin.js +31 -0
  85. package/build/plugins/resource/keyvault/plugin.js.map +1 -0
  86. package/build/plugins/resource/keyvault/result.d.ts +9 -0
  87. package/build/plugins/resource/keyvault/result.d.ts.map +1 -0
  88. package/build/plugins/resource/keyvault/result.js +21 -0
  89. package/build/plugins/resource/keyvault/result.js.map +1 -0
  90. package/build/plugins/resource/keyvault/utils/telemetry.d.ts +17 -0
  91. package/build/plugins/resource/keyvault/utils/telemetry.d.ts.map +1 -0
  92. package/build/plugins/resource/keyvault/utils/telemetry.js +45 -0
  93. package/build/plugins/resource/keyvault/utils/telemetry.js.map +1 -0
  94. package/build/plugins/resource/localdebug/localEnvMulti.d.ts +0 -2
  95. package/build/plugins/resource/localdebug/localEnvMulti.d.ts.map +1 -1
  96. package/build/plugins/resource/localdebug/localEnvMulti.js +0 -4
  97. package/build/plugins/resource/localdebug/localEnvMulti.js.map +1 -1
  98. package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
  99. package/build/plugins/resource/simpleauth/plugin.js +2 -2
  100. package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
  101. package/build/plugins/resource/simpleauth/v2/index.d.ts +7 -6
  102. package/build/plugins/resource/simpleauth/v2/index.d.ts.map +1 -1
  103. package/build/plugins/resource/simpleauth/v2/index.js +12 -6
  104. package/build/plugins/resource/simpleauth/v2/index.js.map +1 -1
  105. package/build/plugins/resource/utils4v2.d.ts +8 -8
  106. package/build/plugins/resource/utils4v2.d.ts.map +1 -1
  107. package/build/plugins/resource/utils4v2.js +26 -1
  108. package/build/plugins/resource/utils4v2.js.map +1 -1
  109. package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +1 -0
  110. package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
  111. package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +1 -0
  112. package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
  113. package/build/plugins/solution/fx-solution/arm.d.ts +5 -3
  114. package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
  115. package/build/plugins/solution/fx-solution/arm.js +72 -32
  116. package/build/plugins/solution/fx-solution/arm.js.map +1 -1
  117. package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
  118. package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
  119. package/build/plugins/solution/fx-solution/constants.d.ts +1 -1
  120. package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
  121. package/build/plugins/solution/fx-solution/constants.js +2 -2
  122. package/build/plugins/solution/fx-solution/constants.js.map +1 -1
  123. package/build/plugins/solution/fx-solution/question.d.ts +2 -1
  124. package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
  125. package/build/plugins/solution/fx-solution/question.js +10 -3
  126. package/build/plugins/solution/fx-solution/question.js.map +1 -1
  127. package/build/plugins/solution/fx-solution/solution.d.ts +2 -4
  128. package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
  129. package/build/plugins/solution/fx-solution/solution.js +60 -565
  130. package/build/plugins/solution/fx-solution/solution.js.map +1 -1
  131. package/build/plugins/solution/fx-solution/v2/adaptor.d.ts +11 -1
  132. package/build/plugins/solution/fx-solution/v2/adaptor.d.ts.map +1 -1
  133. package/build/plugins/solution/fx-solution/v2/adaptor.js +82 -9
  134. package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
  135. package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts +5 -0
  136. package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -0
  137. package/build/plugins/solution/fx-solution/v2/checkPermission.js +185 -0
  138. package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -0
  139. package/build/plugins/solution/fx-solution/v2/collaborationUtil.d.ts +24 -0
  140. package/build/plugins/solution/fx-solution/v2/collaborationUtil.d.ts.map +1 -0
  141. package/build/plugins/solution/fx-solution/v2/collaborationUtil.js +110 -0
  142. package/build/plugins/solution/fx-solution/v2/collaborationUtil.js.map +1 -0
  143. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
  144. package/build/plugins/solution/fx-solution/v2/executeUserTask.js +14 -10
  145. package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
  146. package/build/plugins/solution/fx-solution/v2/executor.d.ts +1 -0
  147. package/build/plugins/solution/fx-solution/v2/executor.d.ts.map +1 -1
  148. package/build/plugins/solution/fx-solution/v2/executor.js +17 -1
  149. package/build/plugins/solution/fx-solution/v2/executor.js.map +1 -1
  150. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts +1 -0
  151. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
  152. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +12 -1
  153. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
  154. package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
  155. package/build/plugins/solution/fx-solution/v2/getQuestions.js +5 -8
  156. package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
  157. package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts +5 -0
  158. package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts.map +1 -0
  159. package/build/plugins/solution/fx-solution/v2/grantPermission.js +205 -0
  160. package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -0
  161. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts +5 -0
  162. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts.map +1 -0
  163. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js +118 -0
  164. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +1 -0
  165. package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts +8 -0
  166. package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -0
  167. package/build/plugins/solution/fx-solution/v2/listCollaborator.js +202 -0
  168. package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -0
  169. package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
  170. package/build/plugins/solution/fx-solution/v2/provision.js +38 -9
  171. package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
  172. package/build/plugins/solution/fx-solution/v2/solution.d.ts +4 -0
  173. package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
  174. package/build/plugins/solution/fx-solution/v2/solution.js +8 -0
  175. package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
  176. package/build/plugins/solution/fx-solution/v2/utils.d.ts +3 -1
  177. package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
  178. package/build/plugins/solution/fx-solution/v2/utils.js +6 -1
  179. package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
  180. package/package.json +5 -3
  181. package/resource/strings.json +1 -0
  182. package/templates/azure/config.bicep +1 -13
  183. package/templates/azure/provision.bicep +8 -36
  184. package/templates/azure/teamsFx/bot.bicep +34 -0
  185. package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +10 -0
  186. package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +5 -0
  187. package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep +54 -0
  188. package/templates/plugins/resource/keyvault/bicep/provision.template.bicep +13 -0
  189. package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep +5 -0
  190. package/templates/azure/provision/function.bicep +0 -79
  191. package/templates/azure/provision/identity.bicep +0 -14
@@ -0,0 +1,185 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.checkPermission = void 0;
4
+ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
5
+ const common_1 = require("../../../../common");
6
+ const constants_1 = require("../constants");
7
+ const util_1 = require("../utils/util");
8
+ const executor_1 = require("../executor");
9
+ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
10
+ const utils4v2_1 = require("../../../resource/utils4v2");
11
+ const executor_2 = require("./executor");
12
+ const collaborationUtil_1 = require("./collaborationUtil");
13
+ const utils_1 = require("./utils");
14
+ async function executeCheckPermissionV1(ctx, userInfo) {
15
+ var _a;
16
+ const plugins = ResourcePluginContainer_1.getActivatedResourcePlugins((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
17
+ const pluginsWithCtx = utils_1.getPluginAndContextArray(ctx, plugins);
18
+ const checkPermissionWithCtx = pluginsWithCtx.map(([plugin, context]) => {
19
+ return [
20
+ (plugin === null || plugin === void 0 ? void 0 : plugin.checkPermission)
21
+ ? (ctx) => plugin.checkPermission.bind(plugin)(ctx, userInfo)
22
+ : undefined,
23
+ context,
24
+ plugin.name,
25
+ ];
26
+ });
27
+ const results = await executor_1.executeConcurrently("", checkPermissionWithCtx);
28
+ const permissions = [];
29
+ const errors = [];
30
+ for (const result of results) {
31
+ if (result.isErr()) {
32
+ errors.push(result);
33
+ continue;
34
+ }
35
+ if (result && result.value) {
36
+ for (const res of result.value) {
37
+ permissions.push(res);
38
+ }
39
+ }
40
+ }
41
+ return [permissions, errors];
42
+ }
43
+ async function executeCheckPermissionV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
44
+ var _a;
45
+ const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins((_a = ctx.projectSetting) === null || _a === void 0 ? void 0 : _a.solutionSettings);
46
+ const thunks = plugins
47
+ .filter((plugin) => !!plugin.checkPermission)
48
+ .map((plugin) => {
49
+ return {
50
+ pluginName: `${plugin.name}`,
51
+ taskName: "checkPermission",
52
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
53
+ thunk: () => plugin.checkPermission(ctx, inputs, envInfo, tokenProvider, userInfo),
54
+ };
55
+ });
56
+ const result = await executor_2.executeConcurrently(thunks, ctx.logProvider);
57
+ let permissions;
58
+ let errors;
59
+ if (result.kind === "success") {
60
+ permissions = result.output.map((entry) => entry.result);
61
+ errors = [];
62
+ }
63
+ else if (result.kind === "partialSuccess") {
64
+ permissions = result.output.map((entry) => entry.result);
65
+ errors = [teamsfx_api_1.err(result.error)];
66
+ }
67
+ else {
68
+ permissions = [];
69
+ errors = [teamsfx_api_1.err(result.error)];
70
+ }
71
+ return [permissions, errors];
72
+ }
73
+ async function checkPermissionImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform) {
74
+ var _a, _b;
75
+ telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CheckPermissionStart, {
76
+ [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
77
+ });
78
+ const result = await collaborationUtil_1.CollaborationUtil.getCurrentUserInfo(graphTokenProvider);
79
+ if (result.isErr()) {
80
+ return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, result.error, telemetryReporter));
81
+ }
82
+ const stateResult = collaborationUtil_1.CollaborationUtil.getCurrentCollaborationState(envState, result.value);
83
+ if (stateResult.state != common_1.CollaborationState.OK) {
84
+ if (platform === teamsfx_api_1.Platform.CLI) {
85
+ ui === null || ui === void 0 ? void 0 : ui.showMessage("warn", stateResult.message, false);
86
+ }
87
+ return teamsfx_api_1.ok({
88
+ state: stateResult.state,
89
+ message: stateResult.message,
90
+ });
91
+ }
92
+ const userInfo = result.value;
93
+ if (platform === teamsfx_api_1.Platform.CLI) {
94
+ const aadAppTenantId = (_a = envState.get(constants_1.PluginNames.SOLUTION)) === null || _a === void 0 ? void 0 : _a.get(constants_1.REMOTE_TEAMS_APP_TENANT_ID);
95
+ if (!envName) {
96
+ return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
97
+ }
98
+ const message = [
99
+ { content: `Account used to check: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
100
+ { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
101
+ {
102
+ content: `Starting check permission for environment: `,
103
+ color: teamsfx_api_1.Colors.BRIGHT_WHITE,
104
+ },
105
+ { content: `${envName}\n`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
106
+ { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
107
+ { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
108
+ ];
109
+ ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
110
+ }
111
+ const [permissions, errors] = param.apiVersion === 1
112
+ ? await executeCheckPermissionV1(param.ctx, userInfo)
113
+ : await executeCheckPermissionV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
114
+ let errorMsg = "";
115
+ if (errors.length > 0) {
116
+ errorMsg += `Failed to check permission for the below resources.\n Resource details: \n`;
117
+ for (const fxError of errors) {
118
+ errorMsg += fxError.error.message + "\n";
119
+ }
120
+ }
121
+ if (platform === teamsfx_api_1.Platform.CLI) {
122
+ for (const permission of permissions) {
123
+ const message = [
124
+ { content: `Resource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
125
+ { content: (_b = permission.resourceId) !== null && _b !== void 0 ? _b : "undefined", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
126
+ { content: `, Resource Name: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
127
+ { content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
128
+ { content: `, Permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
129
+ {
130
+ content: permission.roles ? permission.roles.toString() : "undefined" + "\n",
131
+ color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
132
+ },
133
+ ];
134
+ ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
135
+ }
136
+ }
137
+ if (errorMsg) {
138
+ return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_1.SolutionSource, constants_1.SolutionError.FailedToCheckPermission), telemetryReporter));
139
+ }
140
+ const aadPermission = permissions.find((permission) => permission.name === "Azure AD App");
141
+ const teamsAppPermission = permissions.find((permission) => permission.name === "Teams App");
142
+ telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CheckPermission, {
143
+ [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
144
+ [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
145
+ [constants_1.SolutionTelemetryProperty.AadPermission]: (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
146
+ ? aadPermission.roles.join(";")
147
+ : "undefined",
148
+ [constants_1.SolutionTelemetryProperty.TeamsAppPermission]: (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
149
+ ? teamsAppPermission.roles.join(";")
150
+ : "undefined",
151
+ });
152
+ return teamsfx_api_1.ok({
153
+ state: common_1.CollaborationState.OK,
154
+ permissions,
155
+ });
156
+ }
157
+ async function checkPermission(param) {
158
+ var _a, _b;
159
+ if (param.apiVersion === 1) {
160
+ const envState = param.ctx.envInfo.state;
161
+ const envName = param.ctx.envInfo.envName;
162
+ const telemetryReporter = param.ctx.telemetryReporter;
163
+ const ui = param.ctx.ui;
164
+ const graphTokenProvider = param.ctx.graphTokenProvider;
165
+ const logProvider = param.ctx.logProvider;
166
+ const platform = (_a = param.ctx.answers) === null || _a === void 0 ? void 0 : _a.platform;
167
+ return checkPermissionImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform);
168
+ }
169
+ else {
170
+ const configMap = teamsfx_api_1.ConfigMap.fromJSON(param.envInfo.state);
171
+ if (!configMap) {
172
+ return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`failed to convert profile ${JSON.stringify(param.envInfo.state)}`), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
173
+ }
174
+ const envState = utils4v2_1.flattenConfigMap(configMap);
175
+ const envName = param.envInfo.envName;
176
+ const telemetryReporter = param.ctx.telemetryReporter;
177
+ const ui = param.ctx.userInteraction;
178
+ const graphTokenProvider = param.tokenProvider.graphTokenProvider;
179
+ const logProvider = param.ctx.logProvider;
180
+ const platform = (_b = param.inputs) === null || _b === void 0 ? void 0 : _b.platform;
181
+ return checkPermissionImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform);
182
+ }
183
+ }
184
+ exports.checkPermission = checkPermission;
185
+ //# sourceMappingURL=checkPermission.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"checkPermission.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/checkPermission.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,24 @@
1
+ import { SolutionContext, v2, TokenProvider, GraphTokenProvider, Result, FxError, SolutionConfig } from "@microsoft/teamsfx-api";
2
+ import { Context } from "@microsoft/teamsfx-api/build/v2/types";
3
+ import { CollaborationStateResult } from "../../../../common";
4
+ import { IUserList } from "../../../resource/appstudio/interfaces/IAppDefinition";
5
+ export declare type CollabApiParam = {
6
+ apiVersion: 1;
7
+ ctx: SolutionContext;
8
+ } | {
9
+ apiVersion: 2;
10
+ ctx: v2.Context;
11
+ inputs: v2.InputsWithProjectPath;
12
+ envInfo: v2.DeepReadonly<v2.EnvInfoV2>;
13
+ tokenProvider: TokenProvider;
14
+ };
15
+ export declare class CollaborationUtil {
16
+ static getCurrentUserInfo(graphTokenProvider?: GraphTokenProvider): Promise<Result<IUserList, FxError>>;
17
+ static getUserInfo(graphTokenProvider?: GraphTokenProvider, email?: string): Promise<IUserList | undefined>;
18
+ static checkWetherProvisionSucceeded(solutionConfig: SolutionConfig): boolean;
19
+ static getCurrentCollaborationState(envState: Map<string, any>, user: IUserList): CollaborationStateResult;
20
+ private static getProjectSettings;
21
+ static isSpfxProject(ctx: SolutionContext | Context): boolean;
22
+ static AadResourcePluginsActivated(ctx: SolutionContext | Context): boolean;
23
+ }
24
+ //# sourceMappingURL=collaborationUtil.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collaborationUtil.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/collaborationUtil.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,EAAE,EACF,aAAa,EACb,kBAAkB,EAClB,MAAM,EACN,OAAO,EAIP,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAEhE,OAAO,EAAsB,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAUlF,oBAAY,cAAc,GACtB;IAAE,UAAU,EAAE,CAAC,CAAC;IAAC,GAAG,EAAE,eAAe,CAAA;CAAE,GACvC;IACE,UAAU,EAAE,CAAC,CAAC;IACd,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC;IAChB,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC;IACjC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEN,qBAAa,iBAAiB;WACf,kBAAkB,CAC7B,kBAAkB,CAAC,EAAE,kBAAkB,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAgBzB,WAAW,CACtB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkDjC,MAAM,CAAC,6BAA6B,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO;IAI7E,MAAM,CAAC,4BAA4B,CACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,IAAI,EAAE,SAAS,GACd,wBAAwB;IA0B3B,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAWjC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,GAAG,OAAO;IAS7D,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,GAAG,OAAO;CAQ5E"}
@@ -0,0 +1,110 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CollaborationUtil = void 0;
4
+ const tslib_1 = require("tslib");
5
+ // This file contains reusable pieces for collaboration apis
6
+ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
7
+ const axios_1 = tslib_1.__importDefault(require("axios"));
8
+ const common_1 = require("../../../../common");
9
+ const constants_1 = require("../constants");
10
+ class CollaborationUtil {
11
+ static async getCurrentUserInfo(graphTokenProvider) {
12
+ const user = await CollaborationUtil.getUserInfo(graphTokenProvider);
13
+ if (!user) {
14
+ return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to retrieve current user info from graph token."), constants_1.SolutionSource, constants_1.SolutionError.FailedToRetrieveUserInfo));
15
+ }
16
+ return teamsfx_api_1.ok(user);
17
+ }
18
+ static async getUserInfo(graphTokenProvider, email) {
19
+ const currentUser = await (graphTokenProvider === null || graphTokenProvider === void 0 ? void 0 : graphTokenProvider.getJsonObject());
20
+ if (!currentUser) {
21
+ return undefined;
22
+ }
23
+ const tenantId = currentUser["tid"];
24
+ let aadId = currentUser["oid"];
25
+ let userPrincipalName = currentUser["unique_name"];
26
+ let displayName = currentUser["name"];
27
+ const isAdministrator = true;
28
+ if (email) {
29
+ const graphToken = await (graphTokenProvider === null || graphTokenProvider === void 0 ? void 0 : graphTokenProvider.getAccessToken());
30
+ const instance = axios_1.default.create({
31
+ baseURL: "https://graph.microsoft.com/v1.0",
32
+ });
33
+ instance.defaults.headers.common["Authorization"] = `Bearer ${graphToken}`;
34
+ const res = await instance.get(`/users?$filter=startsWith(mail,'${email}') or startsWith(userPrincipalName, '${email}')`);
35
+ if (!res || !res.data || !res.data.value) {
36
+ return undefined;
37
+ }
38
+ const collaborator = res.data.value.find((user) => user.mail.toLowerCase() === email.toLowerCase() ||
39
+ user.userPrincipalName.toLowerCase() === email.toLowerCase());
40
+ if (!collaborator) {
41
+ return undefined;
42
+ }
43
+ aadId = collaborator.id;
44
+ userPrincipalName = collaborator.userPrincipalName;
45
+ displayName = collaborator.displayName;
46
+ }
47
+ return {
48
+ tenantId,
49
+ aadId,
50
+ userPrincipalName,
51
+ displayName,
52
+ isAdministrator,
53
+ };
54
+ }
55
+ static checkWetherProvisionSucceeded(solutionConfig) {
56
+ var _a;
57
+ return !!((_a = solutionConfig.get(constants_1.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.getBoolean(constants_1.SOLUTION_PROVISION_SUCCEEDED));
58
+ }
59
+ static getCurrentCollaborationState(envState, user) {
60
+ var _a;
61
+ const provisioned = CollaborationUtil.checkWetherProvisionSucceeded(envState);
62
+ if (!provisioned) {
63
+ const warningMsg = "The resources have not been provisioned yet. Please provision the resources first.";
64
+ return {
65
+ state: common_1.CollaborationState.NotProvisioned,
66
+ message: warningMsg,
67
+ };
68
+ }
69
+ const aadAppTenantId = (_a = envState.get(constants_1.PluginNames.SOLUTION)) === null || _a === void 0 ? void 0 : _a.get(constants_1.REMOTE_TEAMS_APP_TENANT_ID);
70
+ if (!aadAppTenantId || user.tenantId != aadAppTenantId) {
71
+ const warningMsg = "Tenant id of your account and the provisioned Azure AD app does not match. Please check whether you logined with wrong account.";
72
+ return {
73
+ state: common_1.CollaborationState.M365TenantNotMatch,
74
+ message: warningMsg,
75
+ };
76
+ }
77
+ return {
78
+ state: common_1.CollaborationState.OK,
79
+ };
80
+ }
81
+ static getProjectSettings(ctx) {
82
+ var _a;
83
+ let solutionSettings;
84
+ if ("projectSettings" in ctx) {
85
+ solutionSettings = (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
86
+ }
87
+ else {
88
+ solutionSettings = ctx.projectSetting.solutionSettings;
89
+ }
90
+ return solutionSettings;
91
+ }
92
+ static isSpfxProject(ctx) {
93
+ const solutionSettings = this.getProjectSettings(ctx);
94
+ if (solutionSettings) {
95
+ const selectedPlugins = solutionSettings.activeResourcePlugins;
96
+ return selectedPlugins && selectedPlugins.indexOf("fx-resource-spfx") !== -1;
97
+ }
98
+ return false;
99
+ }
100
+ static AadResourcePluginsActivated(ctx) {
101
+ const solutionSettings = this.getProjectSettings(ctx);
102
+ if (solutionSettings) {
103
+ const selectedPlugins = solutionSettings.activeResourcePlugins;
104
+ return selectedPlugins && selectedPlugins.indexOf("fx-resource-aad-app-for-teams") !== -1;
105
+ }
106
+ return false;
107
+ }
108
+ }
109
+ exports.CollaborationUtil = CollaborationUtil;
110
+ //# sourceMappingURL=collaborationUtil.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collaborationUtil.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/collaborationUtil.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AA6BhC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA4HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAmBD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAkJnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
1
+ {"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAgChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA4HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAwBD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAuJnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
@@ -188,15 +188,15 @@ function showUpdateArmTemplateNotice(ui) {
188
188
  ui === null || ui === void 0 ? void 0 : ui.showMessage("info", msg, false);
189
189
  }
190
190
  exports.showUpdateArmTemplateNotice = showUpdateArmTemplateNotice;
191
- async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, plugins, generateTemplate) {
192
- const result = await scaffolding_1.scaffoldByPlugins(ctx, inputs, localSettings, plugins);
191
+ async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, generateTemplate, pluginsToDoArm) {
192
+ const result = await scaffolding_1.scaffoldByPlugins(ctx, inputs, localSettings, pluginsToScaffold);
193
193
  if (result.isErr()) {
194
194
  return result;
195
195
  }
196
196
  if (!generateTemplate || !tools_1.isArmSupportEnabled()) {
197
197
  return result;
198
198
  }
199
- return generateResourceTemplate_1.generateResourceTemplate(ctx, inputs);
199
+ return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold);
200
200
  }
201
201
  async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvider) {
202
202
  var _a, _b, _c, _d, _e;
@@ -227,24 +227,27 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
227
227
  const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
228
228
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
229
229
  }
230
- let addNewResoruceToProvision = false;
230
+ let addNewResourceToProvision = false;
231
231
  const notifications = [];
232
232
  const pluginsToScaffold = [localDebugPlugin];
233
+ const pluginsToDoArm = [];
233
234
  const azureResource = Array.from(settings.azureResources || []);
234
235
  let scaffoldApim = false;
235
236
  if (addFunc || ((addSQL || addApim) && !alreadyHaveFunction)) {
236
237
  pluginsToScaffold.push(functionPlugin);
237
238
  if (!azureResource.includes(question_1.AzureResourceFunction.id)) {
238
239
  azureResource.push(question_1.AzureResourceFunction.id);
239
- addNewResoruceToProvision = true;
240
+ addNewResourceToProvision = true;
241
+ pluginsToDoArm.push(functionPlugin);
240
242
  }
241
243
  notifications.push(question_1.AzureResourceFunction.label);
242
244
  }
243
245
  if (addSQL && !alreadyHaveSql) {
244
246
  pluginsToScaffold.push(sqlPlugin);
247
+ pluginsToDoArm.push(sqlPlugin);
245
248
  azureResource.push(question_1.AzureResourceSQL.id);
246
249
  notifications.push(question_1.AzureResourceSQL.label);
247
- addNewResoruceToProvision = true;
250
+ addNewResourceToProvision = true;
248
251
  }
249
252
  if (addApim && !alreadyHaveApim) {
250
253
  // We don't add apimPlugin into pluginsToScaffold because
@@ -253,17 +256,18 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
253
256
  // The scaffolding will run later as a usertask as a work around.
254
257
  azureResource.push(question_1.AzureResourceApim.id);
255
258
  notifications.push(question_1.AzureResourceApim.label);
256
- addNewResoruceToProvision = true;
259
+ addNewResourceToProvision = true;
260
+ pluginsToDoArm.push(apimPlugin);
257
261
  scaffoldApim = true;
258
262
  }
259
263
  if (notifications.length > 0) {
260
- if (tools_1.isArmSupportEnabled() && addNewResoruceToProvision) {
264
+ if (tools_1.isArmSupportEnabled() && addNewResourceToProvision) {
261
265
  showUpdateArmTemplateNotice(ctx.userInteraction);
262
266
  }
263
267
  settings.azureResources = azureResource;
264
268
  utils_1.reloadV2Plugins(settings);
265
269
  (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`start scaffolding ${notifications.join(",")}.....`);
266
- let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, addNewResoruceToProvision);
270
+ let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, addNewResourceToProvision, pluginsToDoArm);
267
271
  if (scaffoldApim) {
268
272
  if (apimPlugin && apimPlugin.executeUserTask) {
269
273
  const result = await apimPlugin.executeUserTask(ctx, inputs, func, {}, envInfo, tokenProvider);
@@ -286,7 +290,7 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
286
290
  [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
287
291
  [constants_1.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
288
292
  });
289
- return teamsfx_api_1.ok(addNewResoruceToProvision
293
+ return teamsfx_api_1.ok(addNewResourceToProvision
290
294
  ? { solutionSettings: settings, solutionConfig: { provisionSucceeded: false } }
291
295
  : teamsfx_api_1.Void);
292
296
  }
@@ -1 +1 @@
1
- {"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":";;;;AAAA,wDAmBgC;AAChC,oDAA2E;AAC3E,mCAAoE;AACpE,4CAOsB;AACtB,mDAA6B;AAC7B,0CASqB;AACrB,mCAAmC;AACnC,wCAAkE;AAClE,wEAA0F;AAC1F,mCAAmC;AACnC,+CAAkD;AAClD,yEAGoC;AAE7B,KAAK,UAAU,eAAe,CACnC,GAAe,EACf,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;IAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,MAAM,KAAK,eAAe,EAAE;QAC9B,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;KAClD;IACD,IAAI,MAAM,KAAK,aAAa,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;KAC9E;IACD,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAClC,IAAI,MAAM,KAAK,wBAAwB,EAAE;YACvC,0BAA0B;YAC1B,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAC5B,0BAAc,EACd,yBAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;SACH;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE;YACjC,0FAA0F;YAC1F,4EAA4E;YAC5E,gEAAgE;YAChE,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC5B,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iDAAiD,MAAM,CAAC,QAAQ,EAAE,CAAC,EAC7E,0BAAc,EACd,yBAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;aACH;YACD,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,kBAAkB,EAAE;gBACtC,OAAO,eAAe,CAAC,kBAAkB,CACvC,GAAG,EACH,MAAM,EACN,OAAO,EACP,aAAa,CAAC,cAAc,CAC7B,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACxC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,MAAM,eAAe,CAAC,eAAe,CAC1C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YACpC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,MAAM,eAAe,CAAC,eAAe,CAC1C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACxC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,eAAe,CAAC,eAAe,CACpC,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,SAAS,GAAG,mDAAyB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,MAAM,IAAI,MAAM,CAAC,eAAe,EAAE;gBACpC,OAAO,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;aACzF;SACF;KACF;IAED,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAC/D,0BAAc,EACd,4BAA4B,CAC7B,CACF,CAAC;AACJ,CAAC;AAtGD,0CAsGC;AAED,SAAgB,gBAAgB,CAC9B,QAA+B,EAC/B,iBAAoC;IAEpC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE,CAAC,EAAE;QACnD,MAAM,CAAC,GAAG,6BAAe,CACvB,IAAI,KAAK,CAAC,kDAAkD,CAAC,EAC7D,0BAAc,EACd,yBAAa,CAAC,qBAAqB,CACpC,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAAC,kCAAsB,CAAC,aAAa,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9F,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,4CAeC;AAED,SAAgB,cAAc,CAC5B,QAA+B,EAC/B,iBAAoC;IAEpC,IACE,CAAC,CACC,QAAQ,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE;QAC5C,QAAQ,CAAC,YAAY;QACrB,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CACjD,EACD;QACA,MAAM,CAAC,GAAG,6BAAe,CACvB,IAAI,KAAK,CAAC,6DAA6D,CAAC,EACxE,0BAAc,EACd,yBAAa,CAAC,qBAAqB,CACpC,CAAC;QAEF,OAAO,iBAAG,CACR,wCAAiC,CAAC,kCAAsB,CAAC,WAAW,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC5F,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAtBD,wCAsBC;AAEM,KAAK,UAAU,aAAa,CACjC,GAAe,EACf,MAAc,EACd,aAAmB;;IAInB,GAAG,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,kCAAsB,CAAC,kBAAkB,EAAE;QAClF,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;KACtE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAA0B,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,kBAAS,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrE,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;QACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KAC9B;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;IACvF,IAAI,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1D,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,aAAa,EAAE;YAC9E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;YACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;YACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACvD,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IAED,MAAM,uBAAuB,GAC3B,CAAC,CAAA,MAAA,QAAQ,CAAC,YAAY,0CAAE,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;SAChD,MAAA,QAAQ,CAAC,YAAY,0CAAE,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAA,CAAC;QAC3D,CAAC,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAC5C,kBAAkB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,MAAM,uBAAuB,GAC3B,CAAA,MAAA,QAAQ,CAAC,YAAY,0CAAE,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;QACjD,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,uBAAuB,IAAI,uBAAuB,EAAE;QACtD,MAAM,CAAC,GAAG,6BAAe,CACvB,IAAI,KAAK,CAAC,mEAAmE,CAAC,EAC9E,0BAAc,EACd,yBAAa,CAAC,qBAAqB,CACpC,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,aAAa,EACpC,CAAC,EACD,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;IACD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,gBAAgB,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC9F,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;IAC5F,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,cAAc,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAwB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IACnF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvD,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE;QACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC/B,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,GAAG,IAAI,CAAC;YACd,IAAI,GAAG,KAAK,wBAAa,CAAC,EAAE,EAAE;gBAC5B,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACvC,iBAAiB,CAAC,IAAI,CACpB,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,gBAAgB,CAAC,CACrE,CAAC;aACH;iBAAM,IACL,CAAC,GAAG,KAAK,wBAAa,CAAC,EAAE,IAAI,GAAG,KAAK,+BAAoB,CAAC,EAAE,CAAC;gBAC7D,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EACtC;gBACA,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACnC;SACF;KACF;IAED,IAAI,MAAM,EAAE;QACV,IAAI,2BAAmB,EAAE,EAAE;YACzB,2BAA2B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SAClD;QACD,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;QACrC,uBAAe,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnE,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,WAAW,OAAO,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,MAAM,+BAA+B,CACvD,GAAG,EACH,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,IAAI,CACL,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACvB,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,WAAW,GAAG,CAAC,CAAC;YAC5D,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACvD,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,aAAa,EACpC,WAAW,CAAC,KAAK,EACjB,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;SACH;QACD,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,WAAW,GAAG,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;QAC/C,MAAM,QAAQ,GACZ,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG;YAC9B,CAAC,CAAC,MAAM;gBACN,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,yBAAyB;gBACjD,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,2BAA2B;YACrD,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,mBAAmB;gBAC3C,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC5C,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QAEpD,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,aAAa,EAAE;YAC9E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;YACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;YACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;SACvE,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;KAC1F;IACD,MAAM,mBAAmB,GAAG,aAAa,CAAC;IAC1C,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IACpE,GAAG,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,kCAAsB,CAAC,aAAa,EAAE;QAC7E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;QACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;QACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;KACvD,CAAC,CAAC;IACH,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;AAChB,CAAC;AAlID,sCAkIC;AAED,SAAgB,2BAA2B,CAAC,EAAoB;IAC9D,MAAM,GAAG,GAAW,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC/E,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC;AAHD,kEAGC;AAED,KAAK,UAAU,+BAA+B,CAC5C,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,iBAAsC,EACtC,gBAAyB,EACzB,cAAoC;IAEpC,MAAM,MAAM,GAAG,MAAM,+BAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACtF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAClB,OAAO,MAAM,CAAC;KACf;IACD,IAAI,CAAC,gBAAgB,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC/C,OAAO,MAAM,CAAC;KACf;IACD,OAAO,6DAAkC,CACvC,GAAG,EACH,MAAM,EACN,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CACpD,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,IAAU,EACV,OAAqB,EACrB,aAA4B;;IAE5B,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,gBAAgB,EAAE;QACjF,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;KACtE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAA0B,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnE,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;QACtB,OAAO,UAAU,CAAC;KACnB;IAED,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC;IACvD,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,cAAc,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,MAAM,mBAAmB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,cAAc,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,gBAAgB,CAAC,CAAC;IAE9F,MAAM,kBAAkB,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;IAEvF,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,aAAa,qCAA0B,CAAC,YAAY,YAAY,CAAC,EAC3E,0BAAc,EACd,yBAAa,CAAC,YAAY,CAC3B,CACF,CAAC;KACH;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,2BAAgB,CAAC,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,EAAE;QAC9D,MAAM,CAAC,GAAG,6BAAe,CACvB,IAAI,KAAK,CAAC,4BAA4B,CAAC,EACvC,0BAAc,EACd,yBAAa,CAAC,qBAAqB,CACpC,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,WAAW,EAClC,CAAC,EACD,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;IAED,IAAI,yBAAyB,GAAG,KAAK,CAAC;IACtC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,iBAAiB,GAAwB,CAAC,gBAAgB,CAAC,CAAC;IAClE,MAAM,cAAc,GAAwB,EAAE,CAAC;IAC/C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,OAAO,IAAI,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;QAC5D,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,EAAE;YACrD,aAAa,CAAC,IAAI,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;YAC7C,yBAAyB,GAAG,IAAI,CAAC;YACjC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACrC;QACD,aAAa,CAAC,IAAI,CAAC,gCAAqB,CAAC,KAAK,CAAC,CAAC;KACjD;IACD,IAAI,MAAM,IAAI,CAAC,cAAc,EAAE;QAC7B,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,aAAa,CAAC,IAAI,CAAC,2BAAgB,CAAC,EAAE,CAAC,CAAC;QACxC,aAAa,CAAC,IAAI,CAAC,2BAAgB,CAAC,KAAK,CAAC,CAAC;QAC3C,yBAAyB,GAAG,IAAI,CAAC;KAClC;IACD,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QAC/B,yDAAyD;QACzD,gEAAgE;QAChE,wDAAwD;QACxD,iEAAiE;QACjE,aAAa,CAAC,IAAI,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;QACzC,aAAa,CAAC,IAAI,CAAC,4BAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,yBAAyB,GAAG,IAAI,CAAC;QACjC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,YAAY,GAAG,IAAI,CAAC;KACrB;IAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,IAAI,2BAAmB,EAAE,IAAI,yBAAyB,EAAE;YACtD,2BAA2B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SAClD;QACD,QAAQ,CAAC,cAAc,GAAG,aAAa,CAAC;QACxC,uBAAe,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3E,IAAI,WAAW,GAAG,MAAM,+BAA+B,CACrD,GAAG,EACH,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,cAAc,CACf,CAAC;QAEF,IAAI,YAAY,EAAE;YAChB,IAAI,UAAU,IAAI,UAAU,CAAC,eAAe,EAAE;gBAC5C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,eAAe,CAC7C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,EAAE,EACF,OAAO,EACP,aAAa,CACd,CAAC;gBACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,WAAW,GAAG,qBAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;iBAC9C;aACF;SACF;QAED,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACvB,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACxE,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,WAAW,EAClC,WAAW,CAAC,KAAK,EACjB,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;SACH;QAED,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,IAAI,CAAC,MAAM,CACT,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG;YAC9B,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,uBAAuB;YAC/C,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAC3C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CACxB,EACD,KAAK,CACN,CAAC;KACH;IAED,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,WAAW,EAAE;QAC5E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;QACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;QACjE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;KACpE,CAAC,CAAC;IACH,OAAO,gBAAE,CACP,yBAAyB;QACvB,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE;QAC/E,CAAC,CAAC,kBAAI,CACT,CAAC;AACJ,CAAC;AA9JD,kCA8JC;AAED,SAAgB,qCAAqC,CACnD,OAAgB;IAEhB,IAAI,OAAO,IAAI,SAAS,EAAE;QACxB,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,oBAAoB,CAAC,EAC/B,0BAAc,EACd,yBAAa,CAAC,yCAAyC,CACxD,CACF,CAAC;KACH;IAED,MAAM,KAAK,GAAmC;QAC5C,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,IAAI,SAAS,EAAE;YACtB,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAC7B,0BAAc,EACd,yBAAa,CAAC,yCAAyC,CACxD,CACF,CAAC;SACH;QACA,KAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KAC7B;IAED,OAAO,gBAAE,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAlCD,sFAkCC"}
@@ -5,6 +5,7 @@ export declare type NamedThunk<R> = {
5
5
  taskName: string;
6
6
  thunk: Thunk<R>;
7
7
  };
8
+ export declare function executeThunks<R>(namedThunks: NamedThunk<R>[], logger: LogProvider): Promise<Result<R, FxError>[]>;
8
9
  export declare function executeConcurrently<R>(namedThunks: NamedThunk<R>[], logger: LogProvider): Promise<v2.FxResult<{
9
10
  name: string;
10
11
  result: R;
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,WAAW,EACX,MAAM,EAGN,EAAE,EAIH,MAAM,wBAAwB,CAAC;AAIhC,oBAAY,KAAK,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEzD,oBAAY,UAAU,CAAC,CAAC,IAAI;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;AAEtF,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,EAC5B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CA8D9D"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,WAAW,EACX,MAAM,EAGN,EAAE,EAIH,MAAM,wBAAwB,CAAC;AAIhC,oBAAY,KAAK,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEzD,oBAAY,UAAU,CAAC,CAAC,IAAI;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;AAEtF,wBAAsB,aAAa,CAAC,CAAC,EACnC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,EAC5B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAuB/B;AAED,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,EAC5B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CA8D9D"}
@@ -1,9 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.executeConcurrently = void 0;
3
+ exports.executeConcurrently = exports.executeThunks = void 0;
4
4
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
5
5
  const constants_1 = require("../../../../common/constants");
6
6
  const constants_2 = require("../constants");
7
+ async function executeThunks(namedThunks, logger) {
8
+ const result = Promise.all(namedThunks.map(async (namedThunk) => {
9
+ logger.info(`Running ${namedThunk.pluginName} concurrently`);
10
+ try {
11
+ return namedThunk.thunk();
12
+ }
13
+ catch (e) {
14
+ if (e instanceof teamsfx_api_1.UserError || e instanceof teamsfx_api_1.SystemError) {
15
+ return teamsfx_api_1.err(e);
16
+ }
17
+ return teamsfx_api_1.err(new teamsfx_api_1.SystemError("UnknownError", `[SolutionV2.executeConcurrently] unknown error, plugin: ${namedThunk.pluginName}, taskName: ${namedThunk.taskName}, error: ${JSON.stringify(e)}`, constants_2.SolutionSource));
18
+ }
19
+ }));
20
+ return result;
21
+ }
22
+ exports.executeThunks = executeThunks;
7
23
  async function executeConcurrently(namedThunks, logger) {
8
24
  const results = await Promise.all(namedThunks.map(async (namedThunk) => {
9
25
  logger.info(`Running ${namedThunk.pluginName} concurrently`);
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,4DAAiE;AACjE,4CAA6D;AAMtD,KAAK,UAAU,mBAAmB,CACvC,WAA4B,EAC5B,MAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACnC,MAAM,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,UAAU,eAAe,CAAC,CAAC;QAC7D,IAAI;YACF,OAAO,UAAU,CAAC,KAAK,EAAE,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,uBAAS,IAAI,CAAC,YAAY,yBAAW,EAAE;gBACtD,OAAO,iBAAG,CAAC,CAAC,CAAC,CAAC;aACf;YACD,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,cAAc,EACd,2DACE,UAAU,CAAC,UACb,eAAe,UAAU,CAAC,QAAQ,YAAY,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EACjE,0BAAc,CACf,CACF,CAAC;SACH;IACH,CAAC,CAAC,CACH,CAAC;IAEF,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,6BAAiB,CAAC,QAAQ,wBAAwB,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;KAC1F;IAED,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,GAAG,GAAkC,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACvC,MAAM,IAAI,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvE,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9E,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,MAAM,GAAG,IAAI,CAAC;YACd,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1E;KACF;IACD,IAAI,MAAM;QACR,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CACV,GAAG,IAAI,6BAAiB,CAAC,QAAQ,uBAAuB,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GACtE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MACxB,EAAE,CACH,CAAC;IAEJ,IAAI,MAAM,EAAE;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC3E,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC;YACrB,CAAC,CAAC,IAAI,gBAAE,CAAC,SAAS,CACd,+BAAiB,CACf,IAAI,KAAK,CAAC,2CAA2C,MAAM,EAAE,CAAC,EAC9D,0BAAc,EACd,yBAAa,CAAC,aAAa,CAC5B,CACF;YACH,CAAC,CAAC,IAAI,gBAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;KACzD;IAED,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAjED,kDAiEC;AAED,SAAS,aAAa,CAAC,MAAiB;IACtC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACxB,IAAI,GAAG,YAAY,yBAAW,EAAE;YAC9B,cAAc,GAAG,IAAI,CAAC;SACvB;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,cAAc;QACnB,CAAC,CAAC,+BAAiB,CACf,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC5B,0BAAc,EACd,yBAAa,CAAC,oBAAoB,CACnC;QACH,CAAC,CAAC,6BAAe,CACb,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC5B,0BAAc,EACd,yBAAa,CAAC,oBAAoB,CACnC,CAAC;AACR,CAAC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  import { v2, Inputs, FxError, Result, Json } from "@microsoft/teamsfx-api";
2
2
  export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<Json, FxError>>;
3
+ export declare function generateResourceTemplateForPlugins(ctx: v2.Context, inputs: Inputs, plugins: v2.ResourcePlugin[]): Promise<Result<Json, FxError>>;
3
4
  //# sourceMappingURL=generateResourceTemplate.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAM,MAAM,wBAAwB,CAAC;AAK/E,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAQhC"}
1
+ {"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAM,MAAM,wBAAwB,CAAC;AAK/E,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAQhC;AAED,wBAAsB,kCAAkC,CACtD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAWhC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.generateResourceTemplate = void 0;
3
+ exports.generateResourceTemplateForPlugins = exports.generateResourceTemplate = void 0;
4
4
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
5
5
  const tools_1 = require("../../../../common/tools");
6
6
  const arm_1 = require("../arm");
@@ -15,4 +15,15 @@ async function generateResourceTemplate(ctx, inputs) {
15
15
  return armResult;
16
16
  }
17
17
  exports.generateResourceTemplate = generateResourceTemplate;
18
+ async function generateResourceTemplateForPlugins(ctx, inputs, plugins) {
19
+ if (!tools_1.isArmSupportEnabled()) {
20
+ return teamsfx_api_1.ok({});
21
+ }
22
+ const legacyContext = new adaptor_1.ScaffoldingContextAdapter([ctx, inputs]);
23
+ // todo(yefuwang): replace generateArmTemplate when v2 implementation is ready.
24
+ const namedArmResourcePlugins = plugins.map((plugin) => new adaptor_1.NamedArmResourcePluginAdaptor(plugin));
25
+ const armResult = await arm_1.generateArmTemplate(legacyContext, namedArmResourcePlugins);
26
+ return armResult;
27
+ }
28
+ exports.generateResourceTemplateForPlugins = generateResourceTemplateForPlugins;
18
29
  //# sourceMappingURL=generateResourceTemplate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;AAAA,wDAA+E;AAC/E,oDAA+D;AAC/D,gCAA6C;AAC7C,uCAAsD;AAE/C,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IACD,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,+EAA+E;IAC/E,MAAM,SAAS,GAAG,MAAM,yBAAmB,CAAC,aAAa,CAAC,CAAC;IAC3D,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,4DAWC"}
1
+ {"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;AAAA,wDAA+E;AAC/E,oDAA+D;AAC/D,gCAA6C;AAC7C,uCAAqF;AAE9E,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IACD,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,+EAA+E;IAC/E,MAAM,SAAS,GAAG,MAAM,yBAAmB,CAAC,aAAa,CAAC,CAAC;IAC3D,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,4DAWC;AAEM,KAAK,UAAU,kCAAkC,CACtD,GAAe,EACf,MAAc,EACd,OAA4B;IAE5B,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IACD,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,+EAA+E;IAC/E,MAAM,uBAAuB,GAAG,OAAO,CAAC,GAAG,CACzC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,MAAM,CAAC,CACtD,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,yBAAmB,CAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC;IACpF,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,gFAeC"}