@microsoft/teamsfx-core 1.15.2-alpha.ba6ffae53.0 → 1.15.2-alpha.efe3d972e.0

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"githubProvider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/githubProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,MAAM,CAAC,WAAW;CAcnB"}
+{"version":3,"file":"githubProvider.d.ts","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/githubProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,MAAM,CAAC,WAAW;CAcnB"}

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/githubProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"githubProvider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/githubProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yCAA0C;AAC1C,mCAAuC;AAEvC,MAAa,cAAe,SAAQ,uBAAY;IAE9C,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC5B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;YAC/C,cAAc,CAAC,QAAQ,CAAC,UAAU,GAAG,mBAAmB,CAAC;YACzD,cAAc,CAAC,QAAQ,CAAC,YAAY,GAAG,oBAAY,CAAC,MAAM,CAAC;YAC3D,cAAc,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE;gBACpE,OAAO,GAAG,YAAY,MAAM,CAAC;YAC/B,CAAC,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE;gBACrF,OAAO,GAAG,YAAY,IAAI,OAAO,MAAM,CAAC;YAC1C,CAAC,CAAC;SACH;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF;AAhBD,wCAgBC"}
+{"version":3,"file":"githubProvider.js","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/githubProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yCAA0C;AAC1C,mCAAuC;AAEvC,MAAa,cAAe,SAAQ,uBAAY;IAE9C,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC5B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;YAC/C,cAAc,CAAC,QAAQ,CAAC,UAAU,GAAG,mBAAmB,CAAC;YACzD,cAAc,CAAC,QAAQ,CAAC,YAAY,GAAG,oBAAY,CAAC,MAAM,CAAC;YAC3D,cAAc,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE;gBACpE,OAAO,GAAG,YAAY,MAAM,CAAC;YAC/B,CAAC,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE;gBACrF,OAAO,GAAG,YAAY,IAAI,OAAO,MAAM,CAAC;YAC1C,CAAC,CAAC;SACH;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF;AAhBD,wCAgBC"}

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jenkinsProvider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/jenkinsProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAkB;IACzC,MAAM,CAAC,WAAW;CAcnB"}
+{"version":3,"file":"jenkinsProvider.d.ts","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/jenkinsProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAkB;IACzC,MAAM,CAAC,WAAW;CAcnB"}

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/jenkinsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"jenkinsProvider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/jenkinsProvider.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAuC;AACvC,yCAA0C;AAE1C,MAAa,eAAgB,SAAQ,uBAAY;IAE/C,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC7B,eAAe,CAAC,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACjD,eAAe,CAAC,QAAQ,CAAC,UAAU,GAAG,oBAAoB,CAAC;YAC3D,eAAe,CAAC,QAAQ,CAAC,YAAY,GAAG,oBAAY,CAAC,OAAO,CAAC;YAC7D,eAAe,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE;gBACrE,OAAO,eAAe,YAAY,EAAE,CAAC;YACvC,CAAC,CAAC;YACF,eAAe,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE;gBACtF,OAAO,eAAe,YAAY,IAAI,OAAO,EAAE,CAAC;YAClD,CAAC,CAAC;SACH;QACD,OAAO,eAAe,CAAC,QAAQ,CAAC;IAClC,CAAC;CACF;AAhBD,0CAgBC"}
+{"version":3,"file":"jenkinsProvider.js","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/jenkinsProvider.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAuC;AACvC,yCAA0C;AAE1C,MAAa,eAAgB,SAAQ,uBAAY;IAE/C,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC7B,eAAe,CAAC,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACjD,eAAe,CAAC,QAAQ,CAAC,UAAU,GAAG,oBAAoB,CAAC;YAC3D,eAAe,CAAC,QAAQ,CAAC,YAAY,GAAG,oBAAY,CAAC,OAAO,CAAC;YAC7D,eAAe,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,EAAE;gBACrE,OAAO,eAAe,YAAY,EAAE,CAAC;YACvC,CAAC,CAAC;YACF,eAAe,CAAC,QAAQ,CAAC,kBAAkB,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAE,EAAE;gBACtF,OAAO,eAAe,YAAY,IAAI,OAAO,EAAE,CAAC;YAClD,CAAC,CAAC;SACH;QACD,OAAO,eAAe,CAAC,QAAQ,CAAC;IAClC,CAAC;CACF;AAhBD,0CAgBC"}

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/provider.d.ts

@@ -1,11 +1,11 @@
-import { v2 } from "@microsoft/teamsfx-api";
+import { ContextV3 } from "@microsoft/teamsfx-api";
 import { FxResult } from "../result";
 export declare class CICDProvider {
     scaffoldTo: string;
     providerName: string;
     sourceTemplateName?: (templateName: string) => string;
     targetTemplateName?: (templateName: string, envName: string) => string;
-    scaffold(projectPath: string, templateName: string, envName: string, context: v2.Context): Promise<FxResult>;
+    scaffold(projectPath: string, templateName: string, envName: string, context: ContextV3): Promise<FxResult>;
     readLocalFile(localPath: string): Promise<string>;
 }
 //# sourceMappingURL=provider.d.ts.map

package/build/component/feature/cicd/provider/provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAyB,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAerC,qBAAa,YAAY;IAChB,UAAU,SAAM;IAChB,YAAY,SAAM;IAClB,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACjE,QAAQ,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,QAAQ,CAAC;IAiGP,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB/D"}

package/build/{plugins/resource/cicd/providers → component/feature/cicd/provider}/provider.js

@@ -13,7 +13,6 @@ const mustache_1 = tslib_1.__importDefault(require("mustache"));
 const folder_1 = require("../../../../folder");
 const buildScripts_1 = require("../utils/buildScripts");
 const utils_1 = require("../../../../common/utils");
-const globalVars_1 = require("../../../../core/globalVars");
 const projectSettingsHelperV3_1 = require("../../../../common/projectSettingsHelperV3");
 class CICDProvider {
     constructor() {
@@ -21,7 +20,6 @@ class CICDProvider {
         this.providerName = "";
     }
     async scaffold(projectPath, templateName, envName, context) {
-        var _a, _b, _c, _d, _e;
         // 0. Preconditions check.
         if (!(await fs.pathExists(projectPath))) {
             throw new errors_1.NoProjectOpenedError();
@@ -58,31 +56,16 @@ class CICDProvider {
             }
         }
         // 3. Generate template file.
-        let replacements;
-        if (!globalVars_1.isV3()) {
-            const hostType = (_a = context.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType;
-            replacements = {
-                env_name: envName,
-                build_script: buildScripts_1.generateBuildScript(context.projectSetting),
-                hosting_type_contains_spfx: hostType === "SPFx",
-                hosting_type_contains_azure: hostType === "Azure",
-                cloud_resources_contains_sql: (_c = (_b = context.projectSetting.solutionSettings) === null || _b === void 0 ? void 0 : _b["azureResources"].includes("sql")) !== null && _c !== void 0 ? _c : false,
-                api_prefix: utils_1.convertToAlphanumericOnly(context.projectSetting.appName),
-                cloud_resources_contains_apim: (_e = (_d = context.projectSetting.solutionSettings) === null || _d === void 0 ? void 0 : _d["azureResources"].includes("apim")) !== null && _e !== void 0 ? _e : false,
-            };
-        }
-        else {
-            const projectSettingsV3 = context.projectSetting;
-            replacements = {
-                env_name: envName,
-                build_script: buildScripts_1.generateBuildScript(context.projectSetting),
-                hosting_type_contains_spfx: projectSettingsHelperV3_1.hasSPFxTab(projectSettingsV3),
-                hosting_type_contains_azure: projectSettingsHelperV3_1.hasAzureResourceV3(projectSettingsV3),
-                cloud_resources_contains_sql: projectSettingsHelperV3_1.hasSQL(projectSettingsV3),
-                api_prefix: utils_1.convertToAlphanumericOnly(context.projectSetting.appName),
-                cloud_resources_contains_apim: projectSettingsHelperV3_1.hasAPIM(projectSettingsV3),
-            };
-        }
+        const projectSettingsV3 = context.projectSetting;
+        const replacements = {
+            env_name: envName,
+            build_script: buildScripts_1.generateBuildScript(context.projectSetting),
+            hosting_type_contains_spfx: projectSettingsHelperV3_1.hasSPFxTab(projectSettingsV3),
+            hosting_type_contains_azure: projectSettingsHelperV3_1.hasAzureResourceV3(projectSettingsV3),
+            cloud_resources_contains_sql: projectSettingsHelperV3_1.hasSQL(projectSettingsV3),
+            api_prefix: utils_1.convertToAlphanumericOnly(context.projectSetting.appName),
+            cloud_resources_contains_apim: projectSettingsHelperV3_1.hasAPIM(projectSettingsV3),
+        };
         const targetTemplatePath = path_1.default.join(targetPath, this.targetTemplateName(templateName, envName));
         if (!(await fs.pathExists(targetTemplatePath))) {
             const localTemplatePath = path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "resource", "cicd", this.providerName, this.sourceTemplateName(templateName));

package/build/component/feature/cicd/provider/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/provider/provider.ts"],"names":[],"mappings":"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"}

package/build/component/feature/cicd/questions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/component/feature/cicd/questions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,eAAO,MAAM,YAAY,EAAE,UAI1B,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,UAIxB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAAU,EAA8C,CAAC;AAEvF,eAAO,MAAM,QAAQ,EAAE,UAItB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,UAItB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAAU,EAAyD,CAAC;AAelG,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,oBAAY,aAAa;IACvB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,WAAW,eAAe;CAC3B"}

package/build/component/feature/cicd/questions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../../../src/component/feature/cicd/questions.ts"],"names":[],"mappings":";;;AAGA,iEAAmE;AAEtD,QAAA,YAAY,GAAe;IACtC,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,EAAE;CACX,CAAC;AAEW,QAAA,UAAU,GAAe;IACpC,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,cAAc;IACrB,MAAM,EAAE,EAAE;CACX,CAAC;AAEW,QAAA,aAAa,GAAe;IACvC,EAAE,EAAE,SAAS;IACb,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,EAAE;CACX,CAAC;AAEW,QAAA,eAAe,GAAiB,CAAC,oBAAY,EAAE,kBAAU,EAAE,qBAAa,CAAC,CAAC;AAE1E,QAAA,QAAQ,GAAe;IAClC,EAAE,EAAE,IAAI;IACR,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,kCAAkB,CAAC,8BAA8B,CAAC;CAC3D,CAAC;AAEW,QAAA,QAAQ,GAAe;IAClC,EAAE,EAAE,IAAI;IACR,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,kCAAkB,CAAC,8BAA8B,CAAC;CAC3D,CAAC;AAEW,QAAA,eAAe,GAAe;IACzC,EAAE,EAAE,WAAW;IACf,KAAK,EAAE,WAAW;IAClB,MAAM,EAAE,kCAAkB,CAAC,qCAAqC,CAAC;CAClE,CAAC;AAEW,QAAA,aAAa,GAAe;IACvC,EAAE,EAAE,SAAS;IACb,KAAK,EAAE,kBAAkB;IACzB,MAAM,EAAE,kCAAkB,CAAC,mCAAmC,CAAC;CAChE,CAAC;AAEW,QAAA,eAAe,GAAiB,CAAC,gBAAQ,EAAE,uBAAe,EAAE,gBAAQ,EAAE,qBAAa,CAAC,CAAC;AAElG,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAiB;IACjD,CAAC,gBAAQ,CAAC,EAAE,EAAE,gBAAQ,CAAC,KAAK,CAAC;IAC7B,CAAC,gBAAQ,CAAC,EAAE,EAAE,gBAAQ,CAAC,KAAK,CAAC;IAC7B,CAAC,uBAAe,CAAC,EAAE,EAAE,uBAAe,CAAC,KAAK,CAAC;IAC3C,CAAC,qBAAa,CAAC,EAAE,EAAE,qBAAa,CAAC,KAAK,CAAC;CACxC,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAiB;IACjD,CAAC,oBAAY,CAAC,EAAE,EAAE,oBAAY,CAAC,KAAK,CAAC;IACrC,CAAC,kBAAU,CAAC,EAAE,EAAE,kBAAU,CAAC,KAAK,CAAC;IACjC,CAAC,qBAAa,CAAC,EAAE,EAAE,qBAAa,CAAC,KAAK,CAAC;CACxC,CAAC,CAAC;AAEH,SAAgB,iBAAiB,CAAC,UAAkB;;IAClD,OAAO,MAAA,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,UAAU,CAAC;AAC1D,CAAC;AAFD,8CAEC;AAED,SAAgB,iBAAiB,CAAC,UAAkB;;IAClD,OAAO,MAAA,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,UAAU,CAAC;AAC1D,CAAC;AAFD,8CAEC;AAED,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;IACrB,2CAA0B,CAAA;AAC5B,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB"}

package/build/component/feature/cicd/result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../../src/component/feature/cicd/result.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAmC,MAAM,wBAAwB,CAAC;AAI1F,oBAAY,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAE5C,qBAAa,yBAAyB;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA2B;IACzD,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAM;IAC7C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAM;WAEhC,SAAS,CACrB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,YAAY,EAAE,OAAO,EACrB,UAAU,CAAC,EAAE,GAAG,GACf,QAAQ;WAaG,WAAW,CACvB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,UAAU,CAAC,EAAE,GAAG,GACf,QAAQ;WAaG,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,QAAQ;CAG9C"}

package/build/component/feature/cicd/result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../../src/component/feature/cicd/result.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAA0F;AAE1F,2CAAoC;AAIpC,MAAa,yBAAyB;IAK7B,MAAM,CAAC,SAAS,CACrB,SAAiB,EACjB,YAA8B,EAC9B,YAAqB,EACrB,UAAgB;QAEhB,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC;YACZ,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;YACxB,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,yBAAyB,CAAC,MAAM;YACxC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC9E,KAAK,EAAE,UAAU;SAClB,CAAC,CACH,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,SAAiB,EACjB,YAA8B,EAC9B,UAAgB;QAEhB,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC;YACd,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;YACxB,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,yBAAyB,CAAC,MAAM;YACxC,SAAS,EAAE,yBAAyB,CAAC,gBAAgB;YACrD,KAAK,EAAE,UAAU;SAClB,CAAC,CACH,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,MAAY;QAChC,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;;AA1CH,8DA2CC;AA1CiB,gCAAM,GAAW,iBAAK,CAAC,iBAAiB,CAAC;AACzC,yCAAe,GAAW,EAAE,CAAC;AAC7B,0CAAgB,GAAW,EAAE,CAAC"}

package/build/component/feature/cicd/utils/buildScripts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildScripts.d.ts","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/utils/buildScripts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAqB,MAAM,wBAAwB,CAAC;AAS5E,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,CAoB5E"}

package/build/component/feature/cicd/utils/buildScripts.js

@@ -0,0 +1,29 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateBuildScript = void 0;
+const projectSettingsHelperV3_1 = require("../../../../common/projectSettingsHelperV3");
+// TODO: add support for VS/.Net Projects.
+function generateBuildScript(projectSettings) {
+    const parts = [];
+    const settingsV3 = projectSettings;
+    if (projectSettingsHelperV3_1.hasAzureTab(settingsV3))
+        parts.push("cd tabs; npm ci; npm run build; cd -;");
+    if (projectSettingsHelperV3_1.hasSPFxTab(settingsV3))
+        parts.push("cd SPFx; npm ci; npm run build; cd -;");
+    if (projectSettingsHelperV3_1.hasBot(settingsV3)) {
+        if (projectSettings.programmingLanguage === "typescript") {
+            parts.push("cd bot; npm ci; npm run build; cd -;");
+        }
+        else {
+            parts.push("cd bot; npm ci; cd -;");
+        }
+    }
+    if (projectSettingsHelperV3_1.hasApi(settingsV3) && projectSettings.programmingLanguage === "typescript") {
+        parts.push("cd api; npm ci; npm run build; cd -;");
+    }
+    return parts.join("");
+}
+exports.generateBuildScript = generateBuildScript;
+//# sourceMappingURL=buildScripts.js.map

package/build/component/feature/cicd/utils/buildScripts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildScripts.js","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/utils/buildScripts.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wFAKoD;AAEpD,0CAA0C;AAC1C,SAAgB,mBAAmB,CAAC,eAAgC;IAClE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,MAAM,UAAU,GAAG,eAAoC,CAAC;IACxD,IAAI,qCAAW,CAAC,UAAU,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IACjF,IAAI,oCAAU,CAAC,UAAU,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IAEhF,IAAI,gCAAM,CAAC,UAAU,CAAC,EAAE;QACtB,IAAI,eAAe,CAAC,mBAAmB,KAAK,YAAY,EAAE;YACxD,KAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;SACpD;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;SACrC;KACF;IAED,IAAI,gCAAM,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,mBAAmB,KAAK,YAAY,EAAE;QAC9E,KAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;KACpD;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AApBD,kDAoBC"}

package/build/component/feature/cicd/utils/telemetry-helper.d.ts

@@ -0,0 +1,29 @@
+import { FxResult } from "../result";
+import { ContextV3, SystemError, UserError } from "@microsoft/teamsfx-api";
+import { EnvInfoV3 } from "@microsoft/teamsfx-api/build/v3";
+export declare class telemetryHelper {
+    static fillCommonProperty(ctx: ContextV3, envInfo: EnvInfoV3 | undefined, properties: {
+        [key: string]: string;
+    }): void;
+    static sendStartEvent(ctx: ContextV3, envInfo: EnvInfoV3 | undefined, eventName: string, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }): void;
+    static sendSuccessEvent(ctx: ContextV3, envInfo: EnvInfoV3 | undefined, eventName: string, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }): void;
+    static sendErrorEvent(ctx: ContextV3, envInfo: EnvInfoV3 | undefined, eventName: string, e: SystemError | UserError, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }): void;
+    static sendResultEvent(ctx: ContextV3, envInfo: EnvInfoV3 | undefined, eventName: string, result: FxResult, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }): void;
+}
+//# sourceMappingURL=telemetry-helper.d.ts.map

package/build/component/feature/cicd/utils/telemetry-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry-helper.d.ts","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/utils/telemetry-helper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAE3E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,qBAAa,eAAe;IAC1B,MAAM,CAAC,kBAAkB,CACvB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,GAAG,SAAS,EAC9B,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACpC,IAAI;IAQP,MAAM,CAAC,cAAc,CACnB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,GAAG,SAAS,EAC9B,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC1C,YAAY,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAC3C,IAAI;IAOP,MAAM,CAAC,gBAAgB,CACrB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,GAAG,SAAS,EAC9B,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC1C,YAAY,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAC3C,IAAI;IAOP,MAAM,CAAC,cAAc,CACnB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,GAAG,SAAS,EAC9B,SAAS,EAAE,MAAM,EACjB,CAAC,EAAE,WAAW,GAAG,SAAS,EAC1B,UAAU,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC1C,YAAY,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAC3C,IAAI;IAeP,MAAM,CAAC,eAAe,CACpB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,SAAS,GAAG,SAAS,EAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,QAAQ,EAChB,UAAU,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC1C,YAAY,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAC3C,IAAI;CAOR"}

package/build/{plugins/resource → component/feature}/cicd/utils/telemetry-helper.js

@@ -10,7 +10,7 @@ class telemetryHelper {
         var _a, _b;
         properties[constants_1.TelemetryKeys.Component] = constants_1.PluginCICD.PLUGIN_NAME;
         properties[constants_1.TelemetryKeys.AppId] =
-            ((_b = (_a = envInfo.state) === null || _a === void 0 ? void 0 : _a[constants_1.PluginSolution.PLUGIN_NAME]) === null || _b === void 0 ? void 0 : _b[constants_1.PluginSolution.REMOTE_TEAMS_APPID]) || "";
+            ((_b = (_a = envInfo === null || envInfo === void 0 ? void 0 : envInfo.state) === null || _a === void 0 ? void 0 : _a[constants_1.PluginSolution.PLUGIN_NAME]) === null || _b === void 0 ? void 0 : _b[constants_1.PluginSolution.REMOTE_TEAMS_APPID]) || "";
     }
     static sendStartEvent(ctx, envInfo, eventName, properties = {}, measurements = {}) {
         var _a;

package/build/component/feature/cicd/utils/telemetry-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry-helper.js","sourceRoot":"","sources":["../../../../../src/component/feature/cicd/utils/telemetry-helper.ts"],"names":[],"mappings":"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"}

package/build/component/feature/spfx.d.ts

@@ -5,4 +5,5 @@ export declare class SPFxTab {
     add(context: ContextV3, inputs: InputsWithProjectPath): Promise<Result<undefined, FxError>>;
 }
 export declare function getSPFxScaffoldQuestion(): QTreeNode;
+export declare function getAddSPFxQuestionNode(projectPath: string | undefined): Promise<Result<QTreeNode | undefined, FxError>>;
 //# sourceMappingURL=spfx.d.ts.map

package/build/component/feature/spfx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spfx.d.ts","sourceRoot":"","sources":["../../../src/component/feature/spfx.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,OAAO,EACP,qBAAqB,EAGrB,SAAS,EACT,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAe1B,qBACa,OAAO;IAClB,IAAI,SAA0B;IAQxB,GAAG,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAiCvC;AAED,wBAAgB,uBAAuB,IAAI,SAAS,CAWnD"}
+{"version":3,"file":"spfx.d.ts","sourceRoot":"","sources":["../../../src/component/feature/spfx.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,SAAS,EAET,OAAO,EACP,qBAAqB,EAGrB,SAAS,EACT,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAgB1B,qBACa,OAAO;IAClB,IAAI,SAA0B;IAQxB,GAAG,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAiCvC;AAED,wBAAgB,uBAAuB,IAAI,SAAS,CAWnD;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA2BjD"}

package/build/component/feature/spfx.js

@@ -2,13 +2,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSPFxScaffoldQuestion = exports.SPFxTab = void 0;
+exports.getAddSPFxQuestionNode = exports.getSPFxScaffoldQuestion = exports.SPFxTab = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 require("reflect-metadata");
 const typedi_1 = require("typedi");
 const globalVars_1 = require("../../core/globalVars");
 const question_1 = require("../../core/question");
+const plugins_1 = require("../../plugins");
 const questions_1 = require("../../plugins/resource/spfx/utils/questions");
 const constants_1 = require("../constants");
 const debug_1 = require("../debug");
@@ -77,4 +80,32 @@ function getSPFxScaffoldQuestion() {
     return spfx_frontend_host;
 }
 exports.getSPFxScaffoldQuestion = getSPFxScaffoldQuestion;
+async function getAddSPFxQuestionNode(projectPath) {
+    var _a;
+    const spfx_add_feature = new teamsfx_api_1.QTreeNode({
+        type: "group",
+    });
+    spfx_add_feature.condition = { equals: plugins_1.TabSPFxNewUIItem.id };
+    const spfx_version_check = new teamsfx_api_1.QTreeNode(questions_1.versionCheckQuestion);
+    spfx_add_feature.addChild(spfx_version_check);
+    if (projectPath) {
+        const yorcPath = path.join(projectPath, "SPFx", ".yo-rc.json");
+        if (await fs_extra_1.default.pathExists(yorcPath)) {
+            const yorc = await fs_extra_1.default.readJson(yorcPath);
+            const template = (_a = yorc["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.template;
+            if (template === undefined || template === "") {
+                const spfx_framework_type = new teamsfx_api_1.QTreeNode(questions_1.frameworkQuestion);
+                spfx_version_check.addChild(spfx_framework_type);
+            }
+        }
+        else {
+            const spfx_framework_type = new teamsfx_api_1.QTreeNode(questions_1.frameworkQuestion);
+            spfx_version_check.addChild(spfx_framework_type);
+        }
+    }
+    const spfx_webpart_name = new teamsfx_api_1.QTreeNode(questions_1.webpartNameQuestion);
+    spfx_version_check.addChild(spfx_webpart_name);
+    return teamsfx_api_1.ok(spfx_add_feature);
+}
+exports.getAddSPFxQuestionNode = getAddSPFxQuestionNode;
 //# sourceMappingURL=spfx.js.map

package/build/component/feature/spfx.js.map

@@ -1 +1 @@
-{"version":3,"file":"spfx.js","sourceRoot":"","sources":["../../../src/component/feature/spfx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spfx.js","sourceRoot":"","sources":["../../../src/component/feature/spfx.ts"],"names":[],"mappings":"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"}

package/build/component/feature/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../src/component/feature/sql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAO,OAAO,EAAE,qBAAqB,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,kBAAkB,CAAC;AAG1B,OAAO,iCAAiC,CAAC;AACzC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,sBAAsB,CAAC;AAU9B,qBACa,GAAG;IACd,IAAI,SAAS;IAEP,GAAG,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAmDvC"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../src/component/feature/sql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAO,OAAO,EAAE,qBAAqB,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,kBAAkB,CAAC;AAG1B,OAAO,iCAAiC,CAAC;AACzC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,sBAAsB,CAAC;AAU9B,qBACa,GAAG;IACd,IAAI,SAAS;IAEP,GAAG,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAsDvC"}

package/build/component/feature/sql.js

@@ -32,11 +32,14 @@ let Sql = class Sql {
             addedResources.push(plugins_1.AzureResourceFunction.id);
         }
         const projectSettings = context.projectSetting;
-        const remarks = ["config 'azure-sql' in projectSettings"];
-        projectSettings.components.push({
-            name: "azure-sql",
-            provision: true,
-        });
+        const remarks = [];
+        if (!sqlComponent) {
+            remarks.push("config 'azure-sql' in projectSettings");
+            projectSettings.components.push({
+                name: "azure-sql",
+                provision: true,
+            });
+        }
         // generate bicep
         // bicep.init
         {

package/build/component/feature/sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/component/feature/sql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/component/feature/sql.ts"],"names":[],"mappings":"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"}

package/build/component/provisionUtils.d.ts

@@ -1,4 +1,5 @@
 import { AzureAccountProvider, ContextV3, FxError, InputsWithProjectPath, Json, M365TokenProvider, Result, SubscriptionInfo, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
+import { CustomizeSubscriptionType } from "../common/telemetry";
 import { FillInAzureConfigsResult, ProvisionSubscriptionCheckResult } from "../plugins/solution/fx-solution/constants";
 interface M365TenantRes {
     tenantIdInToken: string;
@@ -10,9 +11,9 @@ export declare class ProvisionUtils {
      * make sure subscription is correct before provision
      *
      */
-    checkProvisionSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider, targetSubscriptionIdFromCLI: string | undefined): Promise<Result<ProvisionSubscriptionCheckResult, FxError>>;
+    checkProvisionSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider, targetSubscriptionIdFromCLI: string | undefined, envName: string | undefined): Promise<Result<ProvisionSubscriptionCheckResult, FxError>>;
     updateEnvInfoSubscription(envInfo: v3.EnvInfoV3, subscriptionInfo: SubscriptionInfo): void;
-    compareWithStateSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, targetSubscriptionInfo: SubscriptionInfo, subscriptionInStateId: string | undefined): Promise<Result<ProvisionSubscriptionCheckResult, FxError>>;
+    compareWithStateSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, targetSubscriptionInfo: SubscriptionInfo, subscriptionInStateId: string | undefined, envName: string | undefined, customizeSubscriptionType: CustomizeSubscriptionType): Promise<Result<ProvisionSubscriptionCheckResult, FxError>>;
     clearEnvInfoStateResource(envInfo: v3.EnvInfoV3): void;
     /**
      * Asks common questions and puts the answers in the global namespace of SolutionConfig

package/build/component/provisionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EACpB,SAAS,EAIT,OAAO,EACP,qBAAqB,EACrB,IAAI,EACJ,iBAAiB,EAIjB,MAAM,EACN,gBAAgB,EAEhB,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EACL,wBAAwB,EAExB,gCAAgC,EAMjC,MAAM,2CAA2C,CAAC;AAenD,UAAU,aAAa;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,cAAc;IACnB,YAAY,CAChB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAkItC;;;OAGG;IACG,0BAA0B,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,EAC1C,2BAA2B,EAAE,MAAM,GAAG,SAAS,GAC9C,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAyG7D,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,gBAAgB;IAM7E,4BAA4B,CAChC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,sBAAsB,EAAE,gBAAgB,EACxC,qBAAqB,EAAE,MAAM,GAAG,SAAS,GACxC,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAiB7D,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI;IAiCtD;;;OAGG;IACG,kBAAkB,CACtB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAiL/C,eAAe,CACnB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAuCpC,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,qBAAqB,EAAE,OAAO,EAC9B,uBAAuB,EAAE,OAAO,EAChC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,OAAO,EACzB,oBAAoB,EAAE,MAAM,EAC5B,sBAAsB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAwGlC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,CAKrD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,CAKvD;AAED,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,gBAAgB,EAAE,GAChC,gBAAgB,GAAG,SAAS,CAE9B;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EACpB,SAAS,EAIT,OAAO,EACP,qBAAqB,EACrB,IAAI,EACJ,iBAAiB,EAIjB,MAAM,EACN,gBAAgB,EAEhB,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAEL,yBAAyB,EAG1B,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EACL,wBAAwB,EAExB,gCAAgC,EAMjC,MAAM,2CAA2C,CAAC;AAenD,UAAU,aAAa;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,cAAc;IACnB,YAAY,CAChB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAkItC;;;OAGG;IACG,0BAA0B,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,EAC1C,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IA6H7D,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,gBAAgB;IAM7E,4BAA4B,CAChC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,sBAAsB,EAAE,gBAAgB,EACxC,qBAAqB,EAAE,MAAM,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IA0B7D,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI;IAiCtD;;;OAGG;IACG,kBAAkB,CACtB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAsL/C,eAAe,CACnB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAuCpC,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,qBAAqB,EAAE,OAAO,EAC9B,uBAAuB,EAAE,OAAO,EAChC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,OAAO,EACzB,oBAAoB,EAAE,MAAM,EAC5B,sBAAsB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAwGlC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,CAKrD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,CAKvD;AAED,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,gBAAgB,EAAE,GAChC,gBAAgB,GAAG,SAAS,CAE9B;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/build/component/provisionUtils.js

@@ -98,12 +98,13 @@ class ProvisionUtils {
      * make sure subscription is correct before provision
      *
      */
-    async checkProvisionSubscription(ctx, envInfo, azureAccountProvider, targetSubscriptionIdFromCLI) {
-        var _a, _b;
+    async checkProvisionSubscription(ctx, envInfo, azureAccountProvider, targetSubscriptionIdFromCLI, envName) {
+        var _a, _b, _c, _d;
         const subscriptionIdInConfig = (_a = envInfo.config.azure) === null || _a === void 0 ? void 0 : _a.subscriptionId;
         const subscriptionNameInConfig = ((_b = envInfo.config.azure) === null || _b === void 0 ? void 0 : _b.subscriptionName) || subscriptionIdInConfig;
         const subscriptionIdInState = envInfo.state.solution.subscriptionId;
         const subscriptionNameInState = envInfo.state.solution.subscriptionName || subscriptionIdInState;
+        (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscriptionStart, envName ? { [telemetry_1.TelemetryProperty.Env]: tools_1.getHashedEnv(envName) } : {});
         if (!subscriptionIdInState && !subscriptionIdInConfig && !targetSubscriptionIdFromCLI) {
             const subscriptionInAccount = await azureAccountProvider.getSelectedSubscription(true);
             if (!subscriptionInAccount) {
@@ -112,6 +113,11 @@ class ProvisionUtils {
             else {
                 this.updateEnvInfoSubscription(envInfo, subscriptionInAccount);
                 ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
+                (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscription, {
+                    [telemetry_1.TelemetryProperty.Env]: !envName ? "" : tools_1.getHashedEnv(envName),
+                    [telemetry_1.TelemetryProperty.HasSwitchedSubscription]: "false",
+                    [telemetry_1.TelemetryProperty.CustomizeSubscriptionType]: telemetry_1.CustomizeSubscriptionType.Default,
+                });
                 return teamsfx_api_1.ok({ hasSwitchedSubscription: false });
             }
         }
@@ -127,7 +133,7 @@ class ProvisionUtils {
             else {
                 this.updateEnvInfoSubscription(envInfo, targetSubscriptionInfo);
                 ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
-                return teamsfx_api_1.ok({ hasSwitchedSubscription: false });
+                return this.compareWithStateSubscription(ctx, envInfo, targetSubscriptionInfo, subscriptionIdInState, envName, telemetry_1.CustomizeSubscriptionType.CommandLine);
             }
         }
         if (subscriptionIdInConfig) {
@@ -136,7 +142,7 @@ class ProvisionUtils {
                 return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.SubscriptionNotFound, `The subscription '${subscriptionIdInConfig}'(${subscriptionNameInConfig}) for '${envInfo.envName}' environment is not found in the current account, please use the right Azure account or check the '${teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, envInfo.envName)}' file.`));
             }
             else {
-                return this.compareWithStateSubscription(ctx, envInfo, targetConfigSubInfo, subscriptionIdInState);
+                return this.compareWithStateSubscription(ctx, envInfo, targetConfigSubInfo, subscriptionIdInState, envName, telemetry_1.CustomizeSubscriptionType.EnvConfig);
             }
         }
         else {
@@ -153,7 +159,7 @@ class ProvisionUtils {
                 }
             }
             else {
-                return this.compareWithStateSubscription(ctx, envInfo, subscriptionInAccount, subscriptionIdInState);
+                return this.compareWithStateSubscription(ctx, envInfo, subscriptionInAccount, subscriptionIdInState, envName, telemetry_1.CustomizeSubscriptionType.EnvState);
             }
         }
     }
@@ -162,17 +168,28 @@ class ProvisionUtils {
         envInfo.state.solution.subscriptionName = subscriptionInfo.subscriptionName;
         envInfo.state.solution.tenantId = subscriptionInfo.tenantId;
     }
-    async compareWithStateSubscription(ctx, envInfo, targetSubscriptionInfo, subscriptionInStateId) {
+    async compareWithStateSubscription(ctx, envInfo, targetSubscriptionInfo, subscriptionInStateId, envName, customizeSubscriptionType) {
+        var _a, _b;
         const hasSwitchedSubscription = !!subscriptionInStateId && targetSubscriptionInfo.subscriptionId !== subscriptionInStateId;
         if (hasSwitchedSubscription) {
             this.updateEnvInfoSubscription(envInfo, targetSubscriptionInfo);
             this.clearEnvInfoStateResource(envInfo);
             ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
+            (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscription, {
+                [telemetry_1.TelemetryProperty.Env]: !envName ? "" : tools_1.getHashedEnv(envName),
+                [telemetry_1.TelemetryProperty.HasSwitchedSubscription]: "true",
+                [telemetry_1.TelemetryProperty.CustomizeSubscriptionType]: customizeSubscriptionType,
+            });
             return teamsfx_api_1.ok({ hasSwitchedSubscription: true });
         }
         else {
             this.updateEnvInfoSubscription(envInfo, targetSubscriptionInfo);
             ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscription, {
+                [telemetry_1.TelemetryProperty.Env]: !envName ? "" : tools_1.getHashedEnv(envName),
+                [telemetry_1.TelemetryProperty.HasSwitchedSubscription]: "false",
+                [telemetry_1.TelemetryProperty.CustomizeSubscriptionType]: customizeSubscriptionType,
+            });
             return teamsfx_api_1.ok({ hasSwitchedSubscription: false });
         }
     }
@@ -211,18 +228,13 @@ class ProvisionUtils {
      *
      */
     async fillInAzureConfigs(ctx, inputs, envInfo, tokenProvider) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         //1. check subscriptionId
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscriptionStart, inputs.env ? { [telemetry_1.TelemetryProperty.Env]: tools_1.getHashedEnv(inputs.env) } : {});
-        const targetSubscriptionId = inputs.targetSubscriptionId;
-        const subscriptionResult = await this.checkProvisionSubscription(ctx, envInfo, tokenProvider.azureAccountProvider, targetSubscriptionId);
+        const targetSubscriptionIdFromCLI = inputs.targetSubscriptionId;
+        const subscriptionResult = await this.checkProvisionSubscription(ctx, envInfo, tokenProvider.azureAccountProvider, targetSubscriptionIdFromCLI, inputs.env);
         if (subscriptionResult.isErr()) {
             return teamsfx_api_1.err(subscriptionResult.error);
         }
-        (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckSubscription, {
-            [telemetry_1.TelemetryProperty.Env]: !inputs.env ? "" : tools_1.getHashedEnv(inputs.env),
-            [telemetry_1.TelemetryProperty.HasSwitchedSubscription]: subscriptionResult.value.hasSwitchedSubscription.toString(),
-        });
         // Note setSubscription here will change the token returned by getAccountCredentialAsync according to the subscription selected.
         // So getting azureToken needs to precede setSubscription.
         const azureToken = await tokenProvider.azureAccountProvider.getAccountCredentialAsync();
@@ -230,7 +242,7 @@ class ProvisionUtils {
             return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.NotLoginToAzure, "Login to Azure using the Azure Account extension"));
         }
         //2. check resource group
-        (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroupStart, inputs.env ? { [telemetry_1.TelemetryProperty.Env]: tools_1.getHashedEnv(inputs.env) } : {});
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroupStart, inputs.env ? { [telemetry_1.TelemetryProperty.Env]: tools_1.getHashedEnv(inputs.env) } : {});
         const rmClient = new arm_resources_1.ResourceManagementClient(azureToken, envInfo.state.solution.subscriptionId);
         // Resource group info precedence are:
         //   0. ctx.answers, for VS targetResourceGroupName and targetResourceLocationName to create a new rg
@@ -238,7 +250,7 @@ class ProvisionUtils {
         //   2. env config (config.{envName}.json), for user customization, only support existing resource group
         //   3. states (state.{envName}.json), for re-provision
         //   4. asking user with a popup
-        const resourceGroupNameFromEnvConfig = (_d = envInfo.config.azure) === null || _d === void 0 ? void 0 : _d.resourceGroupName;
+        const resourceGroupNameFromEnvConfig = (_b = envInfo.config.azure) === null || _b === void 0 ? void 0 : _b.resourceGroupName;
         const resourceGroupNameFromState = envInfo.state.solution.resourceGroupName;
         const resourceGroupLocationFromState = envInfo.state.solution.location;
         const appName = utils_1.convertToAlphanumericOnly(ctx.projectSetting.appName);
@@ -272,21 +284,26 @@ class ProvisionUtils {
                 resourceGroupInfo = getRes.value;
             }
         }
-        else if (resourceGroupNameFromEnvConfig) {
+        else if (resourceGroupNameFromEnvConfig && !targetSubscriptionIdFromCLI) {
             const resourceGroupName = resourceGroupNameFromEnvConfig;
+            const envFile = teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, inputs.envName);
+            if (!((_c = envInfo.config.azure) === null || _c === void 0 ? void 0 : _c.subscriptionId)) {
+                return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.MissingSubscriptionIdInConfig, localizeUtils_1.getDefaultString("error.MissingSubscriptionInConfig", resourceGroupName, envFile), localizeUtils_1.getLocalizedString("error.MissingSubscriptionInConfig", resourceGroupName, envFile)));
+            }
             const getRes = await ResourceGroupHelper_1.resourceGroupHelper.getResourceGroupInfo(resourceGroupName, rmClient);
             if (getRes.isErr())
                 return teamsfx_api_1.err(getRes.error);
             if (!getRes.value) {
                 // Currently we do not support creating resource group by input config, so just throw an error.
-                const envFile = teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, inputs.envName);
                 return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.ResourceGroupNotFound, `Resource group '${resourceGroupName}' does not exist, please check your '${envFile}' file.`));
             }
             telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
                 telemetry_1.CustomizeResourceGroupType.EnvConfig;
             resourceGroupInfo = getRes.value;
         }
-        else if (resourceGroupNameFromState && resourceGroupLocationFromState) {
+        else if (resourceGroupNameFromState &&
+            resourceGroupLocationFromState &&
+            !targetSubscriptionIdFromCLI) {
             const checkRes = await ResourceGroupHelper_1.resourceGroupHelper.checkResourceGroupExistence(resourceGroupNameFromState, rmClient);
             if (checkRes.isErr()) {
                 return teamsfx_api_1.err(checkRes.error);
@@ -321,18 +338,18 @@ class ProvisionUtils {
                     telemetry_1.CustomizeResourceGroupType.InteractiveUseExisting;
             }
         }
-        (_e = ctx.telemetryReporter) === null || _e === void 0 ? void 0 : _e.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroup, telemetryProperties);
+        (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroup, telemetryProperties);
         envInfo.state.solution.needCreateResourceGroup = resourceGroupInfo.createNewResourceGroup;
         envInfo.state.solution.resourceGroupName = resourceGroupInfo.name;
         envInfo.state.solution.location = resourceGroupInfo.location;
-        (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`[${constants_1.PluginDisplayName.Solution}] check resource group pass!`);
-        (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`[${constants_1.PluginDisplayName.Solution}] check teamsAppTenantId pass!`);
+        (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(`[${constants_1.PluginDisplayName.Solution}] check resource group pass!`);
+        (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`[${constants_1.PluginDisplayName.Solution}] check teamsAppTenantId pass!`);
         //resourceNameSuffix
-        const resourceNameSuffix = ((_h = envInfo.config.azure) === null || _h === void 0 ? void 0 : _h.resourceNameSuffix) ||
+        const resourceNameSuffix = ((_g = envInfo.config.azure) === null || _g === void 0 ? void 0 : _g.resourceNameSuffix) ||
             envInfo.state.solution.resourceNameSuffix ||
             uuid_1.v4().substr(0, 6);
         envInfo.state.solution.resourceNameSuffix = resourceNameSuffix;
-        (_j = ctx.logProvider) === null || _j === void 0 ? void 0 : _j.info(`[${constants_1.PluginDisplayName.Solution}] check resourceNameSuffix pass!`);
+        (_h = ctx.logProvider) === null || _h === void 0 ? void 0 : _h.info(`[${constants_1.PluginDisplayName.Solution}] check resourceNameSuffix pass!`);
         return teamsfx_api_1.ok({ hasSwitchedSubscription: subscriptionResult.value.hasSwitchedSubscription });
     }
     async getM365TenantId(m365TokenProvider) {