npm - @microsoft/teamsfx-core - Versions diffs - 1.0.1-alpha.d18908a8.0 → 1.0.1-alpha.f7bb20aa.0 - Mend

@microsoft/teamsfx-core 1.0.1-alpha.d18908a8.0 → 1.0.1-alpha.f7bb20aa.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 (38) hide show

package/build/common/armInterface.d.ts CHANGED Viewed

@@ -1,3 +1,8 @@
+import { Plugin } from "@microsoft/teamsfx-api";
+export declare type ArmResourcePlugin = Pick<Plugin, "generateArmTemplates" | "updateArmTemplates">;
+export declare type NamedArmResourcePlugin = {
+    name: string;
+} & ArmResourcePlugin;
 export interface BicepOrchestrationTemplate {
     Content: string;
 }

package/build/common/armInterface.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"armInterface.d.ts","sourceRoot":"","sources":["../../src/common/armInterface.ts"],"names":[],"mappings":"~~AAKA~~,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mCAAoC,SAAQ,0BAA0B;IACrF,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,gCAAiC,SAAQ,0BAA0B;IAClF,OAAO,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,EAAE,mCAAmC,CAAC;IACxD,gBAAgB,CAAC,EAAE,0BAA0B,CAAC;IAC9C,cAAc,CAAC,EAAE,gCAAgC,CAAC;IAClD,cAAc,CAAC,EAAE,0BAA0B,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC;IAC7D,SAAS,CAAC,EAAE;QACV,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,CAAC,EAAE;YAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;KAChD,CAAC;IACF,aAAa,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAC3F,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC"}
1	+ {"version":3,"file":"armInterface.d.ts","sourceRoot":"","sources":["../../src/common/armInterface.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,oBAAY,iBAAiB,GAAG,IAAI,CAAC,MAAM,EAAE,sBAAsB,GAAG,oBAAoB,CAAC,CAAC;AAE5F,oBAAY,sBAAsB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAAC;AAE1E,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mCAAoC,SAAQ,0BAA0B;IACrF,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,gCAAiC,SAAQ,0BAA0B;IAClF,OAAO,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,EAAE,mCAAmC,CAAC;IACxD,gBAAgB,CAAC,EAAE,0BAA0B,CAAC;IAC9C,cAAc,CAAC,EAAE,gCAAgC,CAAC;IAClD,cAAc,CAAC,EAAE,0BAA0B,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC;IAC7D,SAAS,CAAC,EAAE;QACV,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,CAAC,EAAE;YAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;KAChD,CAAC;IACF,aAAa,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAC3F,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC"}

package/build/plugins/resource/appstudio/v2/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { AppStudioTokenProvider, AzureSolutionSettings, Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
-import { Context, DeepReadonly, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput, ResourceTemplate } from "@microsoft/teamsfx-api/build/v2";
+import { Context, DeepReadonly, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput } from "@microsoft/teamsfx-api/build/v2";
 import { AppStudioPlugin } from "..";
 export declare class AppStudioPluginV2 implements ResourcePlugin {
     name: string;
@@ -7,7 +7,6 @@ export declare class AppStudioPluginV2 implements ResourcePlugin {
     plugin: AppStudioPlugin;
     activate(solutionSettings: AzureSolutionSettings): boolean;
     scaffoldSourceCode(ctx: Context, inputs: Inputs): Promise<Result<Void, FxError>>;
-    generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<ResourceTemplate, FxError>>;
     provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
     configureResource(ctx: Context, inputs: Readonly<ProvisionInputs>, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
     configureLocalResource(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;

package/build/plugins/resource/appstudio/v2/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EAGrB,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,EACd,uBAAuB,~~EACvB~~,~~gBAAgB,EACjB,~~MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;~~AAkBrC~~,qBACa,iBAAkB,YAAW,cAAc;IACtD,IAAI,SAA2B;IAC/B,WAAW,SAAgB;IAE3B,MAAM,EAAG,eAAe,CAAC;IAEzB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAIpD,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAIhF,~~wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAIvC,~~iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,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;IAY9B,YAAY,CAChB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAI5C,kBAAkB,CACtB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IA8B3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAY3B,gBAAgB,CACpB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAWlC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/v2/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/appstudio/v2/index.js CHANGED Viewed

@@ -21,9 +21,6 @@ let AppStudioPluginV2 = class AppStudioPluginV2 {
     async scaffoldSourceCode(ctx, inputs) {
         return await utils4v2_1.scaffoldSourceCodeAdapter(ctx, inputs, this.plugin);
     }
-    async generateResourceTemplate(ctx, inputs) {
-        return await utils4v2_1.generateResourceTemplateAdapter(ctx, inputs, this.plugin);
-    }
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {
         return await utils4v2_1.provisionResourceAdapter(ctx, inputs, envInfo, tokenProvider, this.plugin);
     }

package/build/plugins/resource/appstudio/v2/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAgBgC;AAShC,mCAAyC;AACzC,0BAAqC;AACrC,mCAAyC;AACzC,mGAG+D;AAC/D,~~6CAUwB~~;AAGxB,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,uBAAuB,CAAC;QAC/B,gBAAW,GAAG,YAAY,CAAC;~~IAwK7B~~,CAAC;~~IApKC~~,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAY,EAAE,MAAc;QACnD,OAAO,MAAM,oCAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,~~wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,MAAM,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,~~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~~AAtKC~~;IADC,eAAM,CAAC,yCAAe,CAAC,eAAe,CAAC;sCAC/B,mBAAe;iDAAC;AAJd,iBAAiB;IAD7B,gBAAO,CAAC,2CAAiB,CAAC,eAAe,CAAC;GAC9B,iBAAiB,~~CA0K7B~~;~~AA1KY~~,8CAAiB"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/v2/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/identity/v2/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AzureSolutionSettings, FxError, Result, TokenProvider, v2 } from "@microsoft/teamsfx-api";
+import { AzureSolutionSettings, FxError, Inputs, Result, TokenProvider, v2 } from "@microsoft/teamsfx-api";
 import { Context, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput } from "@microsoft/teamsfx-api/build/v2";
 import { IdentityPlugin } from "..";
 export declare class IdentityPluginV2 implements ResourcePlugin {
@@ -7,5 +7,6 @@ export declare class IdentityPluginV2 implements ResourcePlugin {
     plugin: IdentityPlugin;
     activate(solutionSettings: AzureSolutionSettings): boolean;
     provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
+    generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
 }
 //# sourceMappingURL=index.d.ts.map

package/build/plugins/resource/identity/v2/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EACrB,OAAO,~~EAEP~~,MAAM,EACN,aAAa,EACb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,eAAe,EACf,cAAc,EACd,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAOpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA0B;IAC9B,WAAW,SAAwB;IAEnC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAGpD,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;~~CAGrD~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EACrB,OAAO,EACP,MAAM,EAEN,MAAM,EACN,aAAa,EACb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,eAAe,EACf,cAAc,EACd,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAOpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA0B;IAC9B,WAAW,SAAwB;IAEnC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAGpD,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}

package/build/plugins/resource/identity/v2/index.js CHANGED Viewed

@@ -19,6 +19,9 @@ let IdentityPluginV2 = class IdentityPluginV2 {
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {
         return await utils4v2_1.provisionResourceAdapter(ctx, inputs, envInfo, tokenProvider, this.plugin);
     }
+    async generateResourceTemplate(ctx, inputs) {
+        return utils4v2_1.generateResourceTemplateAdapter(ctx, inputs, this.plugin);
+    }
 };
 tslib_1.__decorate([
     typedi_1.Inject(ResourcePluginContainer_1.ResourcePlugins.IdentityPlugin),

package/build/plugins/resource/identity/v2/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;~~AAgBlC~~,mCAAyC;AACzC,0BAAoC;AACpC,mGAG+D;AAC/D,~~6CAA0D~~;~~AAG1D~~,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,sBAAsB,CAAC;QAC9B,gBAAW,GAAG,oBAAoB,CAAC;~~IAerC~~,CAAC;~~IAXC~~,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAA+B,EAC/B,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;CACF,CAAA;~~AAbC~~;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,~~CAiB5B~~;~~AAjBY~~,4CAAgB"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAiBlC,mCAAyC;AACzC,0BAAoC;AACpC,mGAG+D;AAC/D,6CAA2F;AAG3F,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,sBAAsB,CAAC;QAC9B,gBAAW,GAAG,oBAAoB,CAAC;IAsBrC,CAAC;IAlBC,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAA+B,EAC/B,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;CACF,CAAA;AApBC;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,CAwB5B;AAxBY,4CAAgB"}

package/build/plugins/resource/localdebug/localEnvMulti.d.ts CHANGED Viewed

@@ -24,7 +24,6 @@ export declare const EnvKeysBackend: Readonly<{
     TenantId: string;
     ClientId: string;
     ClientSecret: string;
-    IdentityId: string;
     ApiEndpoint: string;
     ApplicationIdUri: string;
     AllowedAppIds: string;
@@ -43,7 +42,6 @@ export declare const EnvKeysBot: Readonly<{
     TenantID: string;
     OauthAuthority: string;
     LoginEndpoint: string;
-    IdentityId: string;
     ApiEndpoint: string;
     ApplicationIdUri: string;
 }>;

package/build/plugins/resource/localdebug/localEnvMulti.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localEnvMulti.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/localEnvMulti.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,mBAAmB,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjD;AAED,eAAO,MAAM,eAAe;;;;;;;;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc~~;;;;;;;;;;;EAWzB~~,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;EAK/B,CAAC;AAEH,eAAO,MAAM,UAAU~~;;;;;;;;;;;EAWrB~~,CAAC;AAEH,eAAO,MAAM,YAAY;;;EAGvB,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;EAK3B,CAAC;AAGH,qBAAa,qBAAqB;IAChC,gBAAuB,gBAAgB,EAAE,MAAM,CAAwB;IAEvE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,eAAe,EAAE,MAAM;IAItB,qBAAqB,CAChC,cAAc,EAAE,OAAO,EACvB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,SAAS,CAAC;IAaR,oBAAoB,IAAI,OAAO,CAAC,SAAS,CAAC;IAa1C,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAS9D,aAAa,CACxB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,WAAW,EAAE,SAAS,GAAG,SAAS,EAClC,OAAO,EAAE,SAAS,GAAG,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAoBT,qBAAqB,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,GAAG,SAAS;IAuB/E,oBAAoB,IAAI,SAAS;~~IAyBjC~~,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS;~~YA8B9C~~,gBAAgB;YAyBhB,gBAAgB;CAoB/B"}
1	+ {"version":3,"file":"localEnvMulti.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/localEnvMulti.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,mBAAmB,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjD;AAED,eAAO,MAAM,eAAe;;;;;;;;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;EAUzB,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;EAK/B,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;EAUrB,CAAC;AAEH,eAAO,MAAM,YAAY;;;EAGvB,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;EAK3B,CAAC;AAGH,qBAAa,qBAAqB;IAChC,gBAAuB,gBAAgB,EAAE,MAAM,CAAwB;IAEvE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,eAAe,EAAE,MAAM;IAItB,qBAAqB,CAChC,cAAc,EAAE,OAAO,EACvB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,SAAS,CAAC;IAaR,oBAAoB,IAAI,OAAO,CAAC,SAAS,CAAC;IAa1C,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAS9D,aAAa,CACxB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,WAAW,EAAE,SAAS,GAAG,SAAS,EAClC,OAAO,EAAE,SAAS,GAAG,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAoBT,qBAAqB,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,GAAG,SAAS;IAuB/E,oBAAoB,IAAI,SAAS;IAwBjC,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS;YA6B9C,gBAAgB;YAyBhB,gBAAgB;CAoB/B"}

package/build/plugins/resource/localdebug/localEnvMulti.js CHANGED Viewed

@@ -27,7 +27,6 @@ exports.EnvKeysBackend = Object.freeze({
     TenantId: "M365_TENANT_ID",
     ClientId: "M365_CLIENT_ID",
     ClientSecret: "M365_CLIENT_SECRET",
-    IdentityId: "IDENTITY_ID",
     ApiEndpoint: "API_ENDPOINT",
     ApplicationIdUri: "M365_APPLICATION_ID_URI",
     AllowedAppIds: "ALLOWED_APP_IDS",
@@ -46,7 +45,6 @@ exports.EnvKeysBot = Object.freeze({
     TenantID: "M365_TENANT_ID",
     OauthAuthority: "M365_AUTHORITY_HOST",
     LoginEndpoint: "INITIATE_LOGIN_ENDPOINT",
-    IdentityId: "IDENTITY_ID",
     ApiEndpoint: "API_ENDPOINT",
     ApplicationIdUri: "M365_APPLICATION_ID_URI",
 });
@@ -117,7 +115,6 @@ class LocalEnvMultiProvider {
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.TenantId] = "";
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.ClientId] = "";
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.ClientSecret] = "";
-        result.teamsfxLocalEnvs[exports.EnvKeysBackend.IdentityId] = "";
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.ApiEndpoint] = "";
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.ApplicationIdUri] = "";
         result.teamsfxLocalEnvs[exports.EnvKeysBackend.AllowedAppIds] = "";
@@ -144,7 +141,6 @@ class LocalEnvMultiProvider {
             result.teamsfxLocalEnvs[exports.EnvKeysBot.TenantID] = "";
             result.teamsfxLocalEnvs[exports.EnvKeysBot.OauthAuthority] = "";
             result.teamsfxLocalEnvs[exports.EnvKeysBot.LoginEndpoint] = "";
-            result.teamsfxLocalEnvs[exports.EnvKeysBot.IdentityId] = "";
             result.teamsfxLocalEnvs[exports.EnvKeysBot.ApiEndpoint] = "";
             result.teamsfxLocalEnvs[exports.EnvKeysBot.ApplicationIdUri] = "";
             result.customizedLocalEnvs[exports.EnvKeysBotCustom.SqlEndpoint] = "";

package/build/plugins/resource/localdebug/localEnvMulti.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localEnvMulti.js","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/localEnvMulti.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,uDAAiC;AACjC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,2CAA+E;AAOlE,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,cAAc;IAC1B,UAAU,EAAE,cAAc;IAC1B,eAAe,EAAE,4BAA4B;IAC7C,QAAQ,EAAE,gCAAgC;IAC1C,YAAY,EAAE,yBAAyB;IACvC,QAAQ,EAAE,qBAAqB;IAC/B,QAAQ,EAAE,qBAAqB;CAChC,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,cAAc,EAAE,qBAAqB;IACrC,iBAAiB,EAAE,0BAA0B;IAC7C,aAAa,EAAE,qBAAqB;IACpC,QAAQ,EAAE,gBAAgB;IAC1B,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,~~UAAU,EAAE,aAAa;IACzB,~~WAAW,EAAE,cAAc;IAC3B,gBAAgB,EAAE,yBAAyB;IAC3C,aAAa,EAAE,iBAAiB;CACjC,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,mBAAmB;IAC9B,WAAW,EAAE,eAAe;IAC5B,WAAW,EAAE,cAAc;CAC5B,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,cAAc;IAC3B,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,QAAQ,EAAE,gBAAgB;IAC1B,cAAc,EAAE,qBAAqB;IACrC,aAAa,EAAE,yBAAyB;IACxC,~~UAAU,EAAE,aAAa;IACzB,~~WAAW,EAAE,cAAc;IAC3B,gBAAgB,EAAE,yBAAyB;CAC5C,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,mBAAmB;IAC9B,WAAW,EAAE,eAAe;IAC5B,WAAW,EAAE,cAAc;CAC5B,CAAC,CAAC;AAEH,wFAAwF;AACxF,MAAa,qBAAqB;IAKhC,YAAY,eAAuB;QACjC,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,cAAuB,EACvB,WAAoB;QAEpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACtC,IAAI,CAAC,IAAI,CACP,IAAI,CAAC,WAAW,EAChB,iCAAqB,CAAC,UAAU,EAChC,qBAAqB,CAAC,gBAAgB,CACvC,EACD,MAAM,CAAC,MAAM,CAAC,uBAAe,CAAC,CAC/B,CAAC;QAEF,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACtC,IAAI,CAAC,IAAI,CACP,IAAI,CAAC,WAAW,EAChB,0BAAc,CAAC,UAAU,EACzB,qBAAqB,CAAC,gBAAgB,CACvC,EACD,MAAM,CAAC,MAAM,CAAC,sBAAc,CAAC,CAC9B,CAAC;QAEF,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,eAAwB;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAS,CAAC,UAAU,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,EACzF,MAAM,CAAC,MAAM,CAAC,kBAAU,CAAC,CAC1B,CAAC;QAEF,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,YAAmC,EACnC,WAAkC,EAClC,OAA8B;QAE9B,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAqB,CAAC,UAAU,CAAC,EAC7D,YAAY,CACb,CAAC;SACH;QAED,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,0BAAc,CAAC,UAAU,CAAC,EACtD,WAAW,CACZ,CAAC;SACH;QAED,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAS,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;SACzF;IACH,CAAC;IAEM,qBAAqB,CAAC,cAAuB,EAAE,WAAoB;QACxE,MAAM,MAAM,GAAc;YACxB,gBAAgB,EAAE,EAAE;YACpB,mBAAmB,EAAE,EAAE;SACxB,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;QAC1D,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QAExD,IAAI,WAAW,EAAE;YACf,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;YAC9D,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACvD,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACxD;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAC3D,MAAM,CAAC,gBAAgB,CAAC,uBAAe,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SACxD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,oBAAoB;QACzB,MAAM,MAAM,GAAc;YACxB,gBAAgB,EAAE,EAAE;YACpB,mBAAmB,EAAE,EAAE;SACxB,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QAC5D,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;QACnE,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;QAC3D,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACtD,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACtD,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,~~UAAU,CAAC,GAAG,EAAE,CAAC;QACxD,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,~~WAAW,CAAC,GAAG,EAAE,CAAC;QACzD,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC;QAC9D,MAAM,CAAC,gBAAgB,CAAC,sBAAc,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;QAE3D,MAAM,CAAC,mBAAmB,CAAC,4BAAoB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAClE,MAAM,CAAC,mBAAmB,CAAC,4BAAoB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QAChE,MAAM,CAAC,mBAAmB,CAAC,4BAAoB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAClE,MAAM,CAAC,mBAAmB,CAAC,4BAAoB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAElE,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,eAAwB;QAC9C,MAAM,MAAM,GAAc;YACxB,gBAAgB,EAAE,EAAE;YACpB,mBAAmB,EAAE,EAAE;SACxB,CAAC;QAEF,IAAI,eAAe,EAAE;YACnB,MAAM,CAAC,gBAAgB,CAAC,oBAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACjD,MAAM,CAAC,gBAAgB,CAAC,oBAAY,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SACxD;aAAM;YACL,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC/C,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YACrD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAClD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YACtD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAClD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;YACxD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;YACvD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,~~UAAU,CAAC,GAAG,EAAE,CAAC;YACpD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,~~WAAW,CAAC,GAAG,EAAE,CAAC;YACrD,MAAM,CAAC,gBAAgB,CAAC,kBAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC;YAE1D,MAAM,CAAC,mBAAmB,CAAC,wBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YAC9D,MAAM,CAAC,mBAAmB,CAAC,wBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YAC5D,MAAM,CAAC,mBAAmB,CAAC,wBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YAC9D,MAAM,CAAC,mBAAmB,CAAC,wBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SAC/D;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,IAAY,EACZ,WAAqB;QAErB,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,MAAM,MAAM,GAAc;gBACxB,gBAAgB,EAAE,EAAE;gBACpB,mBAAmB,EAAE,EAAE;aACxB,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE;gBAClC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC7B,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACtC;qBAAM;oBACL,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACzC;aACF;YAED,OAAO,MAAM,CAAC;SACf;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,IAAe;QAC5D,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QAC1E,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE7B,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,iDAAiD,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACvF,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;YACzC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;SAC1D;QAED,MAAM,EAAE,CAAC,UAAU,CACjB,OAAO,EACP,GAAG,EAAE,CAAC,GAAG,mEAAmE,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,EAAE,CACvG,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,EAAE;YAC5C,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;SAC1D;IACH,CAAC;;~~AAjMH~~,~~sDAkMC~~;~~AAjMwB~~,sCAAgB,GAAW,oBAAoB,CAAC"}
1	+ {"version":3,"file":"localEnvMulti.js","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/localEnvMulti.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/arm.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { SolutionContext, Plugin, Result, FxError } from "@microsoft/teamsfx-api";
-import { ArmTemplateResult } from "../../../common/armInterface";
+import { SolutionContext, Result, FxError } from "@microsoft/teamsfx-api";
+import { ArmTemplateResult, NamedArmResourcePlugin } from "../../../common/armInterface";
 import { ResourceManagementClient } from "@azure/arm-resources";
 import { DeploymentOperation } from "@azure/arm-resources/esm/models";
-export declare function generateArmTemplate(ctx: SolutionContext, selectedPlugins?: Plugin[]): Promise<Result<any, FxError>>;
+export declare function generateArmTemplate(ctx: SolutionContext, selectedPlugins?: NamedArmResourcePlugin[]): Promise<Result<any, FxError>>;
 declare type DeployContext = {
     ctx: SolutionContext;
     finished: boolean;
@@ -13,6 +13,8 @@ declare type DeployContext = {
 };
 declare type OperationStatus = {
     resourceName: string;
+    resourceGroupName: string;
+    subscriptionId: string;
     status: string;
 };
 export declare function getRequiredOperation(operation: DeploymentOperation, deployCtx: DeployContext): OperationStatus | undefined;

package/build/plugins/solution/fx-solution/arm.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"arm.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/arm.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,~~EACf~~,MAAM,~~EACN,MAAM,~~EAGN,OAAO,EAMR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;~~AAsBjE~~,OAAO,EAAE,wBAAwB,EAA4B,MAAM,sBAAsB,CAAC;AAO1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;~~AAgBtE~~,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,eAAe,EACpB,eAAe,GAAE,~~MAAM~~,EAAO,~~GAC7B~~,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CA8B/B;AAED,aAAK,aAAa,GAAG;IACnB,GAAG,EAAE,eAAe,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,wBAAwB,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,aAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,SAAS,EAAE,aAAa,GACvB,eAAe,GAAG,SAAS,~~CAc7B~~;AAED,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,aAAa,~~iBAiElE~~;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA2H~~/F;AAgCD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkC7F;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,eAAe,EACpB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,iBA0BtB;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,eAAe,gBAwB1D;~~AAuRD~~,qBAAa,wBAAwB;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAC;gBAEvD,WAAW,EAAE,MAAM,EAAE;IAK1B,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB;CAqCxE;AAyED,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAC;IAC7D,aAAa,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAC;IACjE,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACxC;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;~~AAiKD~~,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,GAAG,GAAG,GAAG,CAoBlE"}
1	+ {"version":3,"file":"arm.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/arm.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,EAEf,MAAM,EAGN,OAAO,EAMR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AA8BzF,OAAO,EAAE,wBAAwB,EAA4B,MAAM,sBAAsB,CAAC;AAO1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAiBtE,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,eAAe,EACpB,eAAe,GAAE,sBAAsB,EAAO,GAC7C,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CA8B/B;AAED,aAAK,aAAa,GAAG;IACnB,GAAG,EAAE,eAAe,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,wBAAwB,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,aAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,SAAS,EAAE,aAAa,GACvB,eAAe,GAAG,SAAS,CA2B7B;AAED,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,aAAa,iBAwElE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6H/F;AAgCD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkC7F;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,eAAe,EACpB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,iBA0BtB;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,eAAe,gBAwB1D;AA2RD,qBAAa,wBAAwB;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAC;gBAEvD,WAAW,EAAE,MAAM,EAAE;IAK1B,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB;CAqCxE;AAyED,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAC;IAC7D,aAAa,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAC;IACjE,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACxC;AAED,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAqKD,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,GAAG,GAAG,GAAG,CAoBlE"}

package/build/plugins/solution/fx-solution/arm.js CHANGED Viewed

@@ -22,6 +22,7 @@ const bicepChecker_1 = require("./utils/depsChecker/bicepChecker");
 const cpUtils_1 = require("../../../common/cpUtils");
 const _1 = require(".");
 const os_1 = tslib_1.__importDefault(require("os"));
+const adaptor_1 = require("./v2/adaptor");
 const bicepOrchestrationFileName = "main.bicep";
 const bicepOrchestrationProvisionFileName = "provision.bicep";
 const bicepOrchestrationConfigFileName = "config.bicep";
@@ -60,15 +61,25 @@ async function generateArmTemplate(ctx, selectedPlugins = []) {
 }
 exports.generateArmTemplate = generateArmTemplate;
 function getRequiredOperation(operation, deployCtx) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (((_b = (_a = operation.properties) === null || _a === void 0 ? void 0 : _a.targetResource) === null || _b === void 0 ? void 0 : _b.resourceName) &&
+        ((_d = (_c = operation.properties) === null || _c === void 0 ? void 0 : _c.targetResource) === null || _d === void 0 ? void 0 : _d.id) &&
         operation.properties.provisioningState &&
-        ((_c = operation.properties) === null || _c === void 0 ? void 0 : _c.timestamp) &&
+        ((_e = operation.properties) === null || _e === void 0 ? void 0 : _e.timestamp) &&
         operation.properties.timestamp.getTime() > deployCtx.deploymentStartTime) {
-        return {
-            resourceName: (_e = (_d = operation.properties) === null || _d === void 0 ? void 0 : _d.targetResource) === null || _e === void 0 ? void 0 : _e.resourceName,
-            status: operation.properties.provisioningState,
-        };
+        try {
+            const resourceGroupName = tools_1.getResourceGroupNameFromResourceId(operation.properties.targetResource.id);
+            const subscriptionId = tools_1.getSubscriptionIdFromResourceId(operation.properties.targetResource.id);
+            return {
+                resourceName: (_g = (_f = operation.properties) === null || _f === void 0 ? void 0 : _f.targetResource) === null || _g === void 0 ? void 0 : _g.resourceName,
+                resourceGroupName: resourceGroupName,
+                subscriptionId: subscriptionId,
+                status: operation.properties.provisioningState,
+            };
+        }
+        catch (error) {
+            return undefined;
+        }
     }
     else {
         return undefined;
@@ -91,12 +102,18 @@ async function pollDeploymentStatus(deployCtx) {
             }
             const currentStatus = {};
             await Promise.all(operations.map(async (o) => {
+                var _a;
                 const operation = getRequiredOperation(o, deployCtx);
                 if (operation) {
                     currentStatus[operation.resourceName] = operation.status;
                     if (!polledOperations.includes(operation.resourceName)) {
                         polledOperations.push(operation.resourceName);
-                        const subOperations = await deployCtx.client.deploymentOperations.list(deployCtx.resourceGroupName, operation.resourceName);
+                        let client = deployCtx.client;
+                        if (operation.subscriptionId !== deployCtx.client.subscriptionId) {
+                            const azureToken = await ((_a = deployCtx.ctx.azureAccountProvider) === null || _a === void 0 ? void 0 : _a.getAccountCredentialAsync());
+                            client = new arm_resources_1.ResourceManagementClient(azureToken, operation.subscriptionId);
+                        }
+                        const subOperations = await client.deploymentOperations.list(operation.resourceGroupName, operation.resourceName);
                         subOperations.forEach((sub) => {
                             const subOperation = getRequiredOperation(sub, deployCtx);
                             if (subOperation) {
@@ -185,7 +202,7 @@ async function doDeployArmTemplates(ctx) {
             const deploymentError = result.value;
             // return thrown error if deploymentError is empty
             if (!deploymentError) {
-                teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToDeployArmTemplatesToAzure);
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToDeployArmTemplatesToAzure));
             }
             const deploymentErrorMessage = JSON.stringify(formattedDeploymentError(deploymentError), undefined, 2);
             const errorMessage = util_2.format(common_1.getStrings().solution.DeployArmTemplates.FailNotice, constants_1.PluginDisplayName.Solution, resourceGroupName, deploymentName);
@@ -322,7 +339,9 @@ async function doGenerateArmTemplate(ctx, selectedPlugins) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const azureSolutionSettings = (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
     const baseName = generateResourceBaseName(ctx.projectSettings.appName, ctx.envInfo.envName);
-    const plugins = ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
+    const plugins = __1.isV2()
+        ? ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p))
+        : ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
     const bicepOrchestrationTemplate = new BicepOrchestrationContent(plugins.map((p) => p.name), baseName);
     const moduleProvisionFiles = new Map();
     const moduleConfigFiles = new Map();
@@ -582,7 +601,9 @@ function generateBicepModuleConfigFilePath(moduleFileName) {
 function expandParameterPlaceholders(ctx, parameterContent) {
     var _a;
     const azureSolutionSettings = (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
-    const plugins = ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
+    const plugins = __1.isV2()
+        ? ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p))
+        : ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
     const stateVariables = {};
     const availableVariables = { state: stateVariables };
     // Add plugin contexts to available variables

package/build/plugins/solution/fx-solution/arm.js.map CHANGED Viewed

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

package/build/plugins/solution/fx-solution/v2/adaptor.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { v2, SolutionContext, Inputs, AppStudioTokenProvider, AzureAccountProvider, CryptoProvider, GraphTokenProvider, LocalSettings, LogProvider, ProjectSettings, TelemetryReporter, TreeProvider, UserInteraction, PermissionRequestProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, SolutionContext, Inputs, AppStudioTokenProvider, AzureAccountProvider, CryptoProvider, GraphTokenProvider, LocalSettings, LogProvider, ProjectSettings, TelemetryReporter, TreeProvider, UserInteraction, PermissionRequestProvider, Json, PluginContext, Result, FxError } from "@microsoft/teamsfx-api";
+import { ArmTemplateResult, NamedArmResourcePlugin } from "../../../../common/armInterface";
 declare class BaseSolutionContextAdaptor implements SolutionContext {
     envInfo: import("@microsoft/teamsfx-api").EnvInfo;
     root: string;
@@ -29,5 +30,11 @@ export declare class ProvisionContextAdapter extends BaseSolutionContextAdaptor
 export declare class CollaboratorContextAdapter extends BaseSolutionContextAdaptor {
     constructor(params: Parameters<NonNullable<v2.SolutionPlugin["grantPermission"]>>);
 }
+export declare class NamedArmResourcePluginAdaptor implements NamedArmResourcePlugin {
+    name: string;
+    generateArmTemplates?: (ctx: PluginContext) => Promise<Result<ArmTemplateResult, FxError>>;
+    constructor(v2Plugin: v2.ResourcePlugin);
+    _generateArmTemplates(fn: NonNullable<v2.ResourcePlugin["generateResourceTemplate"]>): (ctx: PluginContext) => Promise<Result<ArmTemplateResult, FxError>>;
+}
 export {};
 //# sourceMappingURL=adaptor.d.ts.map

package/build/plugins/solution/fx-solution/v2/adaptor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"adaptor.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAGf,yBAAyB,EACzB,IAAI,~~EACL~~,MAAM,wBAAwB,CAAC;~~AAOhC~~,cAAM,0BAA2B,YAAW,eAAe;IACzD,OAAO,2CAAgB;IACvB,IAAI,SAAM;IACV,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAClD,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACpD,cAAc,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAC9C,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,EAAE,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACjC,cAAc,EAAE,cAAc,CAAuB;IACrD,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;CACvD;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,0BAA0B;gBAC3D,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;~~CAmBrF~~;AAED,qBAAa,uBAAwB,SAAQ,0BAA0B;gBACzD,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAmCpF,eAAe,IAAI,IAAI;CAOxB;AAED,qBAAa,0BAA2B,SAAQ,0BAA0B;gBAC5D,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC;CAiClF"}
1	+ {"version":3,"file":"adaptor.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAGf,yBAAyB,EACzB,IAAI,EACJ,aAAa,EACb,MAAM,EACN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAM5F,cAAM,0BAA2B,YAAW,eAAe;IACzD,OAAO,2CAAgB;IACvB,IAAI,SAAM;IACV,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAClD,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACpD,cAAc,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAC9C,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,EAAE,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACjC,cAAc,EAAE,cAAc,CAAuB;IACrD,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;CACvD;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,0BAA0B;gBAC3D,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;CAsBrF;AAED,qBAAa,uBAAwB,SAAQ,0BAA0B;gBACzD,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAmCpF,eAAe,IAAI,IAAI;CAOxB;AAED,qBAAa,0BAA2B,SAAQ,0BAA0B;gBAC5D,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC;CAiClF;AAED,qBAAa,6BAA8B,YAAW,sBAAsB;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;gBAE/E,QAAQ,EAAE,EAAE,CAAC,cAAc;IAQvC,qBAAqB,CACnB,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,GAC7D,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;CA8BvE"}

package/build/plugins/solution/fx-solution/v2/adaptor.js CHANGED Viewed

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollaboratorContextAdapter = exports.ProvisionContextAdapter = exports.ScaffoldingContextAdapter = void 0;
+exports.NamedArmResourcePluginAdaptor = exports.CollaboratorContextAdapter = exports.ProvisionContextAdapter = exports.ScaffoldingContextAdapter = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const __1 = require("..");
 const crypto_1 = require("../../../../core/crypto");
 const tools_1 = require("../../../../core/tools");
 const utils4v2_1 = require("../../../resource/utils4v2");
@@ -18,11 +19,13 @@ class BaseSolutionContextAdaptor {
  */
 class ScaffoldingContextAdapter extends BaseSolutionContextAdaptor {
     constructor(params) {
-        var _a;
         super();
         const v2context = params[0];
         const inputs = params[1];
-        this.root = (_a = inputs.projectPath) !== null && _a !== void 0 ? _a : "";
+        if (!inputs.projectPath) {
+            throw new Error(`ivalid project path: ${inputs.projectPath}`);
+        }
+        this.root = inputs.projectPath;
         this.targetEnvName = inputs.targetEnvName;
         this.logProvider = v2context.logProvider;
         this.telemetryReporter = v2context.telemetryReporter;
@@ -116,4 +119,36 @@ class CollaboratorContextAdapter extends BaseSolutionContextAdaptor {
     }
 }
 exports.CollaboratorContextAdapter = CollaboratorContextAdapter;
+class NamedArmResourcePluginAdaptor {
+    constructor(v2Plugin) {
+        this.name = v2Plugin.name;
+        if (v2Plugin.generateResourceTemplate) {
+            const fn = v2Plugin.generateResourceTemplate.bind(v2Plugin);
+            this.generateArmTemplates = this._generateArmTemplates(fn);
+        }
+    }
+    _generateArmTemplates(fn) {
+        return async (ctx) => {
+            if (!ctx.ui ||
+                !ctx.logProvider ||
+                !ctx.telemetryReporter ||
+                !ctx.cryptoProvider ||
+                !ctx.projectSettings ||
+                !ctx.answers) {
+                return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`invalid plugin context`), __1.SolutionSource, __1.SolutionError.InternelError));
+            }
+            const v2ctx = {
+                userInteraction: ctx.ui,
+                logProvider: ctx.logProvider,
+                telemetryReporter: ctx.telemetryReporter,
+                cryptoProvider: ctx.cryptoProvider,
+                projectSetting: ctx.projectSettings,
+            };
+            ctx.answers.projectPath = ctx.root;
+            const result = await fn(v2ctx, ctx.answers);
+            return result.map((r) => r.template);
+        };
+    }
+}
+exports.NamedArmResourcePluginAdaptor = NamedArmResourcePluginAdaptor;
 //# sourceMappingURL=adaptor.js.map

package/build/plugins/solution/fx-solution/v2/adaptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":";;;AAAA,~~wDAkBgC~~;AAEhC,oDAAsD;AACtD,kDAAoD;AACpD,yDAAqF;AACrF,mCAAyC;AAEzC,MAAM,0BAA0B;IAAhC;QACE,YAAO,GAAG,kBAAU,EAAE,CAAC;QACvB,SAAI,GAAG,EAAE,CAAC;QAYV,mBAAc,GAAmB,IAAI,oBAAW,CAAC,EAAE,CAAC,CAAC;IAEvD,CAAC;CAAA;AAED;;GAEG;AACH,MAAa,yBAA0B,SAAQ,0BAA0B;IACvE,YAAY,MAAwE;;QAClF,KAAK,EAAE,CAAC;QACR,MAAM,SAAS,GAAe,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,MAAM,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,~~GAAG~~,~~MAAA~~,MAAM,CAAC,WAAW,~~mCAAI,~~EAAE,CAAC;~~QACrC~~,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC,iBAAiB,CAAC;QACrD,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QACtC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,kBAAU,EAAE,CAAC,CAAC,MAAM;IACrC,CAAC;CACF;~~AApBD~~,~~8DAoBC~~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"}
1	+ {"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":"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"}

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

	@@ -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;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"}

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

@@ -196,7 +196,7 @@ async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, plugi
     if (!generateTemplate || !tools_1.isArmSupportEnabled()) {
         return result;
     }
-    return generateResourceTemplate_1.generateResourceTemplate(ctx, inputs);
+    return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, plugins);
 }
 async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvider) {
     var _a, _b, _c, _d, _e;

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

	@@ -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":"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"}

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

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

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

	@@ -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"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateResourceTemplate = void 0;
+exports.generateResourceTemplateForPlugins = exports.generateResourceTemplate = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const tools_1 = require("../../../../common/tools");
 const arm_1 = require("../arm");
@@ -15,4 +15,15 @@ async function generateResourceTemplate(ctx, inputs) {
     return armResult;
 }
 exports.generateResourceTemplate = generateResourceTemplate;
+async function generateResourceTemplateForPlugins(ctx, inputs, plugins) {
+    if (!tools_1.isArmSupportEnabled()) {
+        return teamsfx_api_1.ok({});
+    }
+    const legacyContext = new adaptor_1.ScaffoldingContextAdapter([ctx, inputs]);
+    // todo(yefuwang): replace generateArmTemplate when v2 implementation is ready.
+    const namedArmResourcePlugins = plugins.map((plugin) => new adaptor_1.NamedArmResourcePluginAdaptor(plugin));
+    const armResult = await arm_1.generateArmTemplate(legacyContext, namedArmResourcePlugins);
+    return armResult;
+}
+exports.generateResourceTemplateForPlugins = generateResourceTemplateForPlugins;
 //# sourceMappingURL=generateResourceTemplate.js.map

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

	@@ -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"}

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

	@@ -1 +1 @@
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;~~AAiChC~~,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,~~CA4DjD~~;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,CAmIjD;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,CA4CjD;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,CAqHjD"}
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;AAkChC,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAuDjD;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,CAmIjD;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,CA4CjD;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,CAqHjD"}

package/build/plugins/solution/fx-solution/v2/getQuestions.js CHANGED Viewed

@@ -17,10 +17,6 @@ async function getQuestionsForScaffolding(ctx, inputs) {
     const capQuestion = question_1.createCapabilityQuestion();
     const capNode = new teamsfx_api_1.QTreeNode(capQuestion);
     node.addChild(capNode);
-    // 1.1 hostType
-    const hostTypeNode = new teamsfx_api_1.QTreeNode(question_1.FrontendHostTypeQuestion);
-    hostTypeNode.condition = { contains: question_1.TabOptionItem.id };
-    capNode.addChild(hostTypeNode);
     // 1.1.1 SPFX Tab
     const spfxPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.SpfxPlugin);
     if (spfxPlugin.getQuestionsForScaffolding) {
@@ -29,9 +25,9 @@ async function getQuestionsForScaffolding(ctx, inputs) {
             return res;
         if (res.value) {
             const spfxNode = res.value;
-            spfxNode.condition = { equals: question_1.HostTypeOptionSPFx.id };
+            spfxNode.condition = { equals: question_1.TabSPFxItem.id };
             if (spfxNode.data)
-                hostTypeNode.addChild(spfxNode);
+                capNode.addChild(spfxNode);
         }
     }
     // 1.1.2 Azure Tab
@@ -41,7 +37,7 @@ async function getQuestionsForScaffolding(ctx, inputs) {
     if (tabRes.value) {
         const tabNode = tabRes.value;
         tabNode.condition = { equals: question_1.HostTypeOptionAzure.id };
-        hostTypeNode.addChild(tabNode);
+        capNode.addChild(tabNode);
     }
     // 1.2 Bot
     const botPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);

package/build/plugins/solution/fx-solution/v2/getQuestions.js.map CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.0.1-alpha.d18908a8.0",
+  "version": "1.0.1-alpha.f7bb20aa.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "0.11.1-alpha.d18908a8.0",
+    "@microsoft/teamsfx-api": "0.11.1-alpha.f7bb20aa.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -62,6 +62,7 @@
     "fs-extra": "^9.1.0",
     "glob": "^7.1.6",
     "got": "^11.8.2",
+    "handlebars": "^4.7.7",
     "http-close": "^1.0.0",
     "ignore": "^5.1.8",
     "install": "^0.13.0",
@@ -154,7 +155,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "5124ec55c7ac22be304fcdb098c47525074e1558",
+  "gitHead": "48ac77866afa8f302d8391f573609fadbadc5bcd",
   "publishConfig": {
     "access": "public"
   },

package/templates/azure/config.bicep CHANGED Viewed

@@ -1,25 +1,25 @@
 @secure()
 param provisionParameters object
 param provisionOutputs object
-var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
-var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
+var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
-module teamsFxFunctionConfig './teamsFx/function.bicep' = {
-  name: 'addTeamsFxFunctionConfiguration'
+module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
+  name: 'addTeamsFxSimpleAuthConfiguration'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs
-    currentConfigs: functionCurrentConfigs
-    currentAppSettings: functionCurrentAppSettings
+    currentAppSettings: simpleAuthCurrentAppSettings
   }
 }
-var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
+var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
+var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
-module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
-  name: 'addTeamsFxSimpleAuthConfiguration'
+module teamsFxFunctionConfig './teamsFx/function.bicep' = {
+  name: 'addTeamsFxFunctionConfiguration'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs
-    currentAppSettings: simpleAuthCurrentAppSettings
+    currentConfigs: functionCurrentConfigs
+    currentAppSettings: functionCurrentAppSettings
   }
 }

package/templates/azure/provision.bicep CHANGED Viewed

@@ -14,19 +14,19 @@ output frontendHostingOutput object = {
   endpoint: frontendHostingProvision.outputs.endpoint
   storageResourceId: frontendHostingProvision.outputs.resourceId
 }
-// Resources for identity
-module userAssignedIdentityProvision './provision/identity.bicep' = {
-  name: 'userAssignedIdentityProvision'
+// Resources for Simple Auth
+module simpleAuthProvision './provision/simpleAuth.bicep' = {
+  name: 'simpleAuthProvision'
   params: {
     provisionParameters: provisionParameters
+    userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
   }
 }
-output identityOutput object = {
-  teamsFxPluginId: 'fx-resource-identity'
-  identityName: userAssignedIdentityProvision.outputs.identityName
-  identityResourceId: userAssignedIdentityProvision.outputs.identityResourceId
-  identityClientId: userAssignedIdentityProvision.outputs.identityClientId
+output simpleAuthOutput object = {
+  teamsFxPluginId: 'fx-resource-simple-auth'
+  endpoint: simpleAuthProvision.outputs.endpoint
+  webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
 }
 // Resources for Azure SQL
 module azureSqlProvision './provision/azureSql.bicep' = {
@@ -55,18 +55,4 @@ output functionOutput object = {
   teamsFxPluginId: 'fx-resource-function'
   functionAppResourceId: functionProvision.outputs.functionAppResourceId
   functionEndpoint: functionProvision.outputs.functionEndpoint
-}
-// Resources for Simple Auth
-module simpleAuthProvision './provision/simpleAuth.bicep' = {
-  name: 'simpleAuthProvision'
-  params: {
-    provisionParameters: provisionParameters
-    userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
-  }
-}
-output simpleAuthOutput object = {
-  teamsFxPluginId: 'fx-resource-simple-auth'
-  endpoint: simpleAuthProvision.outputs.endpoint
-  webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
 }

package/templates/azure/teamsFx/bot.bicep ADDED Viewed

@@ -0,0 +1,34 @@
+// Auto generated content, please customize files under provision folder
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
+var m365ClientId = provisionParameters['m365ClientId']
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+var botId = provisionParameters['botAadAppClientId']
+var m365ApplicationIdUri = 'api://${provisionOutputs.frontendHostingOutput.value.domain}/botid-${botId}'
+resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${botWebAppName}/appsettings'
+  properties: union({
+    INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost
+    M365_CLIENT_ID: m365ClientId
+    M365_CLIENT_SECRET: m365ClientSecret
+    M365_TENANT_ID: m365TenantId
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri
+    BOT_ID: botAadAppClientId
+    BOT_PASSWORD: botAadAppClientSecret
+    IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
+  }, currentAppSettings)
+}

package/templates/azure/teamsFx/simpleAuth.bicep CHANGED Viewed

@@ -8,6 +8,47 @@ param currentAppSettings object
 var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
+var m365ClientId = provisionParameters['m365ClientId']
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
+var aadMetadataAddress = uri(m365OauthAuthorityHost, '${m365TenantId}/v2.0/.well-known/openid-configuration')
+var botId = provisionParameters['botAadAppClientId']
+var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
+var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
+var m365ApplicationIdUri = 'api://${tabAppDomain}/botid-${botId}'
+var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
+var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
+var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
+var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
+var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
+var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
+var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
+resource simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${webAppName}/appsettings'
+  properties: union({
+    AAD_METADATA_ADDRESS: aadMetadataAddress
+    ALLOWED_APP_IDS: authorizedClientApplicationIds
+    IDENTIFIER_URI: m365ApplicationIdUri
+    CLIENT_ID: m365ClientId
+    CLIENT_SECRET: m365ClientSecret
+    OAUTH_AUTHORITY: oauthAuthority
+    TAB_APP_ENDPOINT: tabAppEndpoint
+  }, currentAppSettings)
+}
+// Auto generated content, please customize files under provision folder
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
 var m365ClientId = provisionParameters['m365ClientId']
 var m365ClientSecret = provisionParameters['m365ClientSecret']
 var m365TenantId = provisionParameters['m365TenantId']

package/templates/azure/provision/identity.bicep DELETED Viewed

@@ -1,14 +0,0 @@
-@secure()
-param provisionParameters object
-var resourceBaseName = provisionParameters.resourceBaseName
-var identityName = contains(provisionParameters, 'userAssignedIdentityName') ? provisionParameters['userAssignedIdentityName'] : '${resourceBaseName}'
-resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
-  name: identityName
-  location: resourceGroup().location
-}
-output identityName string = identityName
-output identityClientId string = managedIdentity.properties.clientId
-output identityResourceId string = managedIdentity.id
-output identityPrincipalId string = managedIdentity.properties.principalId