@microsoft/teamsfx-core 0.7.0 → 0.7.1-alpha.5e8f6dea.0

package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts

@@ -1,5 +1,5 @@
-import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, AppStudioTokenProvider, SolutionSettings } from "@microsoft/teamsfx-api";
-export declare function executeUserTask(ctx: v2.Context, func: Func, inputs: Inputs, tokenProvider: AppStudioTokenProvider): Promise<Result<unknown, FxError>>;
+import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider } from "@microsoft/teamsfx-api";
+export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
 export declare function canAddCapability(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
 export declare function canAddResource(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
 export declare function addCapability(ctx: v2.Context, inputs: Inputs): Promise<Result<{

package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map

@@ -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,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AA4BhC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA2DnC;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,GACb,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,CAgHA;AAED,wBAAsB,4BAA4B,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAQzF;AAkBD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA6HnC;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"}
+{"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,EAEf,gBAAgB,EAChB,aAAa,EACd,MAAM,wBAAwB,CAAC;AA4BhC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA8EnC;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,GACb,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,CAgHA;AAED,wBAAsB,4BAA4B,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAQzF;AAkBD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA6HnC;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"}

package/build/plugins/solution/fx-solution/v2/executeUserTask.js

@@ -14,7 +14,11 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const typedi_1 = require("typedi");
 const scaffolding_1 = require("./scaffolding");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
-async function executeUserTask(ctx, func, inputs, tokenProvider) {
+async function executeUserTask(ctx, inputs, func, envInfo, tokenProvider) {
+    const blockResult = utils_1.blockV1Project(ctx.projectSetting.solutionSettings);
+    if (blockResult.isErr()) {
+        return teamsfx_api_1.err(blockResult.error);
+    }
     const namespace = func.namespace;
     const method = func.method;
     const array = namespace.split("/");
@@ -38,13 +42,25 @@ async function executeUserTask(ctx, func, inputs, tokenProvider) {
             }
             const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
             if (appStudioPlugin.publishApplication) {
-                return appStudioPlugin.publishApplication(ctx, inputs, {}, tokenProvider);
+                return appStudioPlugin.publishApplication(ctx, inputs, envInfo, tokenProvider.appStudioToken);
+            }
+        }
+        else if (method === "validateManifest") {
+            const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
+            if (appStudioPlugin.executeUserTask) {
+                return await appStudioPlugin.executeUserTask(ctx, inputs, func, envInfo, tokenProvider);
+            }
+        }
+        else if (method === "buildPackage") {
+            const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
+            if (appStudioPlugin.executeUserTask) {
+                return await appStudioPlugin.executeUserTask(ctx, inputs, func, envInfo, tokenProvider);
             }
         }
         else if (method === "validateManifest") {
             const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
             if (appStudioPlugin.executeUserTask) {
-                return appStudioPlugin.executeUserTask(ctx, func, inputs);
+                return appStudioPlugin.executeUserTask(ctx, inputs, func, envInfo, tokenProvider);
             }
         }
         else if (array.length == 2) {
@@ -52,7 +68,7 @@ async function executeUserTask(ctx, func, inputs, tokenProvider) {
             const pluginMap = ResourcePluginContainer_1.getAllV2ResourcePluginMap();
             const plugin = pluginMap.get(pluginName);
             if (plugin && plugin.executeUserTask) {
-                return plugin.executeUserTask(ctx, func, inputs);
+                return plugin.executeUserTask(ctx, inputs, func, envInfo, tokenProvider);
             }
         }
     }

package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/executor.d.ts

@@ -1,11 +1,11 @@
-import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
+import { FxError, LogProvider, Result, v2 } from "@microsoft/teamsfx-api";
 export declare type Thunk<R> = () => Promise<Result<R, FxError>>;
 export declare type NamedThunk<R> = {
     pluginName: string;
     taskName: string;
     thunk: Thunk<R>;
 };
-export declare function executeConcurrently<R>(namedThunks: NamedThunk<R>[], logger: LogProvider): Promise<Result<{
+export declare function executeConcurrently<R>(namedThunks: NamedThunk<R>[], logger: LogProvider): Promise<v2.FxResult<{
     name: string;
     result: R;
 }[], FxError>>;

package/build/plugins/solution/fx-solution/v2/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAA8B,MAAM,wBAAwB,CAAC;AAIlG,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,MAAM,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CA+CzD"}
+{"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,EAIN,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"}

package/build/plugins/solution/fx-solution/v2/executor.js

@@ -7,7 +7,15 @@ const constants_2 = require("../constants");
 async function executeConcurrently(namedThunks, logger) {
     const results = await Promise.all(namedThunks.map(async (namedThunk) => {
         logger.info(`Running ${namedThunk.pluginName} concurrently`);
-        return namedThunk.thunk();
+        try {
+            return namedThunk.thunk();
+        }
+        catch (e) {
+            if (e instanceof teamsfx_api_1.UserError || e instanceof teamsfx_api_1.SystemError) {
+                return teamsfx_api_1.err(e);
+            }
+            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)}`, "Solution"));
+        }
     }));
     if (logger) {
         logger.info(`${`[${constants_1.PluginDisplayName.Solution}] Execute Task summary`.padEnd(64, "-")}`);
@@ -30,9 +38,25 @@ async function executeConcurrently(namedThunks, logger) {
     if (logger)
         logger === null || logger === void 0 ? void 0 : logger.info(`${`[${constants_1.PluginDisplayName.Solution}] Task overall result`.padEnd(60, ".")}${failed ? "[failed]" : "[ok]"}`);
     if (failed) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`Failed to run tasks concurrently due to ${JSON.stringify(errors.map((e) => `${e.name}:${e.message}`))}`), "Solution", constants_2.SolutionError.InternelError));
+        const errMsg = JSON.stringify(errors.map((e) => `${e.name}:${e.message}`));
+        return ret.length === 0
+            ? new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error(`Failed to run tasks concurrently due to ${errMsg}`), "Solution", constants_2.SolutionError.InternelError))
+            : new teamsfx_api_1.v2.FxPartialSuccess(ret, mergeFxErrors(errors));
     }
-    return teamsfx_api_1.ok(ret);
+    return new teamsfx_api_1.v2.FxSuccess(ret);
 }
 exports.executeConcurrently = executeConcurrently;
+function mergeFxErrors(errors) {
+    let hasSystemError = false;
+    const errMsgs = [];
+    for (const err of errors) {
+        if (err instanceof teamsfx_api_1.SystemError) {
+            hasSystemError = true;
+        }
+        errMsgs.push(`${err.name}:${err.message}`);
+    }
+    return hasSystemError
+        ? teamsfx_api_1.returnSystemError(new Error(errMsgs.join(";")), "Solution", constants_2.SolutionError.FailedToExecuteTasks)
+        : teamsfx_api_1.returnUserError(new Error(errMsgs.join(";")), "Solution", constants_2.SolutionError.FailedToExecuteTasks);
+}
 //# sourceMappingURL=executor.js.map

package/build/plugins/solution/fx-solution/v2/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":";;;AAAA,wDAAkG;AAClG,4DAAiE;AACjE,4CAA6C;AAMtC,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,OAAO,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,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,GAAG,EAAE,CAAC;IACf,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,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,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1C;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,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CACP,2CAA2C,IAAI,CAAC,SAAS,CACvD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAC5C,EAAE,CACJ,EACD,UAAU,EACV,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;AACjB,CAAC;AAlDD,kDAkDC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executor.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts

@@ -1,3 +1,3 @@
-import { v2, Inputs, FxError, Result } from "@microsoft/teamsfx-api";
-export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<unknown, FxError>>;
+import { v2, Inputs, FxError, Result, Json } from "@microsoft/teamsfx-api";
+export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<Json, FxError>>;
 //# sourceMappingURL=generateResourceTemplate.d.ts.map

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAKP,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAcnC"}
+{"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAEL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAehC"}

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js

@@ -4,11 +4,17 @@ exports.generateResourceTemplate = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const tools_1 = require("../../../../common/tools");
 const arm_1 = require("../arm");
-const constants_1 = require("../constants");
 const adaptor_1 = require("./adaptor");
 async function generateResourceTemplate(ctx, inputs) {
     if (!tools_1.isArmSupportEnabled()) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Feature not supported"), "Solution", constants_1.SolutionError.FeatureNotSupported));
+        return teamsfx_api_1.ok({});
+        // return err(
+        //   returnSystemError(
+        //     new Error("Feature not supported"),
+        //     "Solution",
+        //     SolutionError.FeatureNotSupported
+        //   )
+        // );
     }
     const legacyContext = new adaptor_1.ScaffoldingContextAdapter([ctx, inputs]);
     // todo(yefuwang): replace generateArmTemplate when v2 implementation is ready.

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;AAAA,wDASgC;AAChC,oDAA+D;AAC/D,gCAA6C;AAC7C,4CAA6C;AAC7C,uCAAsD;AAE/C,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAClC,UAAU,EACV,yBAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;KACH;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;AAjBD,4DAiBC"}
+{"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;AAAA,wDASgC;AAChC,oDAA+D;AAC/D,gCAA6C;AAE7C,uCAAsD;AAE/C,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;QACd,cAAc;QACd,uBAAuB;QACvB,0CAA0C;QAC1C,kBAAkB;QAClB,wCAAwC;QACxC,MAAM;QACN,KAAK;KACN;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;AAlBD,4DAkBC"}

package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts

@@ -0,0 +1,8 @@
+import { Func, FxError, Inputs, QTreeNode, Result, TokenProvider, v2 } from "@microsoft/teamsfx-api";
+export declare function getQuestionsForScaffolding(ctx: v2.Context, inputs: Inputs): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getTabScaffoldQuestionsV2(ctx: v2.Context, inputs: Inputs, addAzureResource: boolean): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestions(ctx: v2.Context, inputs: Inputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsForUserTask(ctx: v2.Context, inputs: Inputs, func: Func, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsForAddCapability(ctx: v2.Context, inputs: Inputs): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsForAddResource(ctx: v2.Context, inputs: Inputs, func: Func, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
+//# sourceMappingURL=getQuestions.d.ts.map

package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getQuestions.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAKN,SAAS,EACT,MAAM,EAIN,aAAa,EAEb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAqChC,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAwDjD;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+CjD;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA4JjD;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAkBjD;AAED,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+CjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAwHjD"}