@microsoft/teamsfx-core 1.2.1 → 1.2.2-alpha.096c8289.0

package/build/plugins/resource/sql/utils/message.js

@@ -15,23 +15,13 @@ Message.endPreProvision = `[${constants_1.Constants.pluginName}] end preProvisio
 Message.endProvision = `[${constants_1.Constants.pluginName}] end provision`;
 Message.endPostProvision = `[${constants_1.Constants.pluginName}] end postProvision`;
 Message.endGetQuestions = `[${constants_1.Constants.pluginName}] end getQuestions`;
-Message.checkProvider = `[${constants_1.Constants.pluginName}] check SQL resource provider`;
-Message.provisionSql = `[${constants_1.Constants.pluginName}] provision SQL`;
-Message.provisionDatabase = `[${constants_1.Constants.pluginName}] provision database`;
-Message.checkSql = `[${constants_1.Constants.pluginName}] check SQL server`;
-Message.checkDatabase = `[${constants_1.Constants.pluginName}] check database`;
 Message.checkAadAdmin = `[${constants_1.Constants.pluginName}] check aad admin`;
-Message.checkDatabaseUser = `[${constants_1.Constants.pluginName}] check database user`;
 Message.connectDatabase = `[${constants_1.Constants.pluginName}] connect database`;
-Message.skipCheckProvider = `[${constants_1.Constants.pluginName}] skip checking SQL resource provider`;
-Message.skipProvisionSql = `[${constants_1.Constants.pluginName}] skip provisioning existing SQL`;
-Message.skipProvisionDatabase = `[${constants_1.Constants.pluginName}] skip provisioning existing database`;
 Message.skipAddAadAdmin = `[${constants_1.Constants.pluginName}] skip adding existing aad admin`;
 Message.skipAddUser = `[${constants_1.Constants.pluginName}] skip adding user`;
 Message.addFirewall = `[${constants_1.Constants.pluginName}] add firewall`;
 Message.addSqlAadAdmin = `[${constants_1.Constants.pluginName}] add SQL aad admin`;
 Message.addTable = `[${constants_1.Constants.pluginName}] add table`;
-Message.registerResourceProviderFailed = (message) => `[${constants_1.Constants.pluginName}] Failed to register SQL resource provider. Reason: ${message}.`;
 Message.addDatabaseUser = (name) => `[${constants_1.Constants.pluginName}] add database user ${name}`;
 Message.adminName = (name) => `[${constants_1.Constants.pluginName}] AAD admin name is ${name}`;
 Message.endpoint = (endpoint) => `[${constants_1.Constants.pluginName}] SQL endpoint is ${endpoint}`;

package/build/plugins/resource/sql/utils/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/utils/message.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4CAAyC;AAEzC,MAAa,OAAO;;AAApB,0BA2DC;AA1DwB,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,sBAAsB,CAAC;AACnE,sBAAc,GAAG,IAAI,qBAAS,CAAC,UAAU,mBAAmB,CAAC;AAC7D,0BAAkB,GAAG,IAAI,qBAAS,CAAC,UAAU,uBAAuB,CAAC;AACrE,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,sBAAsB,CAAC;AAEnE,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAC/D,oBAAY,GAAG,IAAI,qBAAS,CAAC,UAAU,iBAAiB,CAAC;AACzD,wBAAgB,GAAG,IAAI,qBAAS,CAAC,UAAU,qBAAqB,CAAC;AACjE,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE/D,qBAAa,GAAG,IAAI,qBAAS,CAAC,UAAU,+BAA+B,CAAC;AACxE,oBAAY,GAAG,IAAI,qBAAS,CAAC,UAAU,iBAAiB,CAAC;AACzD,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,sBAAsB,CAAC;AAEnE,gBAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AACxD,qBAAa,GAAG,IAAI,qBAAS,CAAC,UAAU,kBAAkB,CAAC;AAC3D,qBAAa,GAAG,IAAI,qBAAS,CAAC,UAAU,mBAAmB,CAAC;AAC5D,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,uBAAuB,CAAC;AACpE,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE/D,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,uCAAuC,CAAC;AACpF,wBAAgB,GAAG,IAAI,qBAAS,CAAC,UAAU,kCAAkC,CAAC;AAC9E,6BAAqB,GAAG,IAAI,qBAAS,CAAC,UAAU,uCAAuC,CAAC;AACxF,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,kCAAkC,CAAC;AAC7E,mBAAW,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE3D,mBAAW,GAAG,IAAI,qBAAS,CAAC,UAAU,gBAAgB,CAAC;AACvD,sBAAc,GAAG,IAAI,qBAAS,CAAC,UAAU,qBAAqB,CAAC;AAC/D,gBAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,aAAa,CAAC;AAEjD,sCAA8B,GAAG,CAAC,OAAe,EAAE,EAAE,CAC1E,IAAI,qBAAS,CAAC,UAAU,uDAAuD,OAAO,GAAG,CAAC;AAErE,uBAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACxD,IAAI,qBAAS,CAAC,UAAU,uBAAuB,IAAI,EAAE,CAAC;AAEjC,iBAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,IAAI,qBAAS,CAAC,UAAU,uBAAuB,IAAI,EAAE,CAAC;AAEjC,gBAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE,CACrD,IAAI,qBAAS,CAAC,UAAU,qBAAqB,QAAQ,EAAE,CAAC;AAEnC,kBAAU,GAAG;IAClC,gBAAgB,EAAE,qCAAqC;IACvD,gCAAgC,EAC9B,uNAAuN;IACzN,kCAAkC,EAChC,gEAAgE;IAClE,0BAA0B,EAAE,gDAAgD;IAC5E,gBAAgB,EAAE,oCAAoC;IACtD,0BAA0B,EAAE,4DAA4D;IACxF,6BAA6B,EAC3B,kEAAkE;IACpE,iCAAiC,EAC/B,wMAAwM;IAC1M,gCAAgC,EAAE,2DAA2D;IAC7F,oBAAoB,EAAE,+CAA+C;CACtE,CAAC"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/utils/message.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4CAAyC;AAEzC,MAAa,OAAO;;AAApB,0BA8CC;AA7CwB,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,sBAAsB,CAAC;AACnE,sBAAc,GAAG,IAAI,qBAAS,CAAC,UAAU,mBAAmB,CAAC;AAC7D,0BAAkB,GAAG,IAAI,qBAAS,CAAC,UAAU,uBAAuB,CAAC;AACrE,yBAAiB,GAAG,IAAI,qBAAS,CAAC,UAAU,sBAAsB,CAAC;AAEnE,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAC/D,oBAAY,GAAG,IAAI,qBAAS,CAAC,UAAU,iBAAiB,CAAC;AACzD,wBAAgB,GAAG,IAAI,qBAAS,CAAC,UAAU,qBAAqB,CAAC;AACjE,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE/D,qBAAa,GAAG,IAAI,qBAAS,CAAC,UAAU,mBAAmB,CAAC;AAC5D,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE/D,uBAAe,GAAG,IAAI,qBAAS,CAAC,UAAU,kCAAkC,CAAC;AAC7E,mBAAW,GAAG,IAAI,qBAAS,CAAC,UAAU,oBAAoB,CAAC;AAE3D,mBAAW,GAAG,IAAI,qBAAS,CAAC,UAAU,gBAAgB,CAAC;AACvD,sBAAc,GAAG,IAAI,qBAAS,CAAC,UAAU,qBAAqB,CAAC;AAC/D,gBAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,aAAa,CAAC;AAEjD,uBAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACxD,IAAI,qBAAS,CAAC,UAAU,uBAAuB,IAAI,EAAE,CAAC;AAEjC,iBAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,IAAI,qBAAS,CAAC,UAAU,uBAAuB,IAAI,EAAE,CAAC;AAEjC,gBAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE,CACrD,IAAI,qBAAS,CAAC,UAAU,qBAAqB,QAAQ,EAAE,CAAC;AAEnC,kBAAU,GAAG;IAClC,gBAAgB,EAAE,qCAAqC;IACvD,gCAAgC,EAC9B,uNAAuN;IACzN,kCAAkC,EAChC,gEAAgE;IAClE,0BAA0B,EAAE,gDAAgD;IAC5E,gBAAgB,EAAE,oCAAoC;IACtD,0BAA0B,EAAE,4DAA4D;IACxF,6BAA6B,EAC3B,kEAAkE;IACpE,iCAAiC,EAC/B,wMAAwM;IAC1M,gCAAgC,EAAE,2DAA2D;IAC7F,oBAAoB,EAAE,+CAA+C;CACtE,CAAC"}

package/build/plugins/resource/sql/v2/index.d.ts

@@ -1,13 +1,13 @@
-import { AzureSolutionSettings, FxError, Inputs, QTreeNode, Result, TokenProvider, v2 } from "@microsoft/teamsfx-api";
-import { Context, DeepReadonly, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput } from "@microsoft/teamsfx-api/build/v2";
+import { FxError, Inputs, ProjectSettings, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+import { Context, DeepReadonly, ProvisionInputs, ResourcePlugin } from "@microsoft/teamsfx-api/build/v2";
 import { SqlPlugin } from "..";
 export declare class SqlPluginV2 implements ResourcePlugin {
     name: string;
     displayName: string;
     plugin: SqlPlugin;
-    activate(solutionSettings: AzureSolutionSettings): boolean;
-    provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
-    configureResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
+    activate(projectSettings: ProjectSettings): boolean;
+    provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    configureResource(ctx: Context, inputs: ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
     getQuestions(ctx: Context, inputs: Inputs, envInfo: DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
     generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     updateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;

package/build/plugins/resource/sql/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EACrB,OAAO,EACP,MAAM,EACN,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,EACd,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAa/B,qBACa,WAAY,YAAW,cAAc;IAChD,IAAI,SAA2B;IAC/B,WAAW,SAAwB;IAEnC,MAAM,EAAG,SAAS,CAAC;IAEnB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAIpD,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,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,YAAY,CAChB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAI5C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,eAAe,EACf,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAa/B,qBACa,WAAY,YAAW,cAAc;IAChD,IAAI,SAA2B;IAC/B,WAAW,SAAwB;IAEnC,MAAM,EAAG,SAAS,CAAC;IAEnB,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAK7C,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,YAAY,CAChB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAI5C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}

package/build/plugins/resource/sql/v2/index.js

@@ -13,7 +13,8 @@ let SqlPluginV2 = class SqlPluginV2 {
         this.name = "fx-resource-azure-sql";
         this.displayName = "Azure SQL Database";
     }
-    activate(solutionSettings) {
+    activate(projectSettings) {
+        const solutionSettings = projectSettings.solutionSettings;
         return this.plugin.activate(solutionSettings);
     }
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {

package/build/plugins/resource/sql/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAkBlC,mCAAyC;AACzC,0BAA+B;AAC/B,mGAG+D;AAC/D,6CAMwB;AAGxB,IAAa,WAAW,GAAxB,MAAa,WAAW;IAAxB;QACE,SAAI,GAAG,uBAAuB,CAAC;QAC/B,gBAAW,GAAG,oBAAoB,CAAC;IAgDrC,CAAC;IA5CC,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,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,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,YAAY,CAChB,GAAY,EACZ,MAAc,EACd,OAAmC,EACnC,aAA4B;QAE5B,OAAO,MAAM,8BAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrF,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,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,MAAM,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;CACF,CAAA;AA9CC;IADC,eAAM,CAAC,yCAAe,CAAC,SAAS,CAAC;sCACzB,aAAS;2CAAC;AAJR,WAAW;IADvB,gBAAO,CAAC,2CAAiB,CAAC,SAAS,CAAC;GACxB,WAAW,CAkDvB;AAlDY,kCAAW"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/sql/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAqBlC,mCAAyC;AACzC,0BAA+B;AAC/B,mGAG+D;AAC/D,6CAMwB;AAGxB,IAAa,WAAW,GAAxB,MAAa,WAAW;IAAxB;QACE,SAAI,GAAG,uBAAuB,CAAC;QAC/B,gBAAW,GAAG,oBAAoB,CAAC;IAiDrC,CAAC;IA7CC,QAAQ,CAAC,eAAgC;QACvC,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAAqB,EACrB,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAAqB,EACrB,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,GAAY,EACZ,MAAc,EACd,OAAmC,EACnC,aAA4B;QAE5B,OAAO,MAAM,8BAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrF,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,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,MAAM,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;CACF,CAAA;AA/CC;IADC,eAAM,CAAC,yCAAe,CAAC,SAAS,CAAC;sCACzB,aAAS;2CAAC;AAJR,WAAW;IADvB,gBAAO,CAAC,2CAAiB,CAAC,SAAS,CAAC;GACxB,WAAW,CAmDvB;AAnDY,kCAAW"}

package/build/plugins/resource/utils4v2.d.ts

@@ -1,25 +1,21 @@
-import { ConfigMap, Func, FxError, Inputs, Json, Plugin, PluginContext, QTreeNode, Result, TokenProvider, Void, v2 } from "@microsoft/teamsfx-api";
-import { Context, DeepReadonly, DeploymentInputs, EnvInfoV2, ProvisionInputs, ResourceProvisionOutput, ResourceTemplate } from "@microsoft/teamsfx-api/build/v2";
-export declare function convert2PluginContext(pluginName: string, ctx: Context, inputs: Inputs, ignoreEmptyProjectPath?: boolean): PluginContext;
-export declare function scaffoldSourceCodeAdapter(ctx: Context, inputs: Inputs, plugin: Plugin): Promise<Result<Void, FxError>>;
-export declare function generateResourceTemplateAdapter(ctx: Context, inputs: Inputs, plugin: Plugin): Promise<Result<ResourceTemplate, FxError>>;
-export declare function updateResourceTemplateAdapter(ctx: Context, inputs: Inputs, plugin: Plugin): Promise<Result<ResourceTemplate, FxError>>;
-export declare function provisionResourceAdapter(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<ResourceProvisionOutput, FxError>>;
+import { ConfigMap, Func, FxError, Inputs, Json, Plugin, PluginContext, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+export declare function convert2PluginContext(pluginName: string, ctx: v2.Context, inputs: Inputs, ignoreEmptyProjectPath?: boolean): PluginContext;
+export declare function scaffoldSourceCodeAdapter(ctx: v2.Context, inputs: Inputs, plugin: Plugin): Promise<Result<Void, FxError>>;
+export declare function generateResourceTemplateAdapter(ctx: v2.Context, inputs: Inputs, plugin: Plugin): Promise<Result<v2.ResourceTemplate, FxError>>;
+export declare function updateResourceTemplateAdapter(ctx: v2.Context, inputs: Inputs, plugin: Plugin): Promise<Result<v2.ResourceTemplate, FxError>>;
+export declare function provisionResourceAdapter(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
 export declare function flattenConfigMap(configMap: ConfigMap): ConfigMap;
-export declare function legacyConfig2EnvState(config: ConfigMap, pluginName: string): {
-    output: Json;
-    secrets: Json;
-};
-export declare function configureResourceAdapter(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<ResourceProvisionOutput, FxError>>;
-export declare function deployAdapter(ctx: Context, inputs: DeploymentInputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
-export declare function provisionLocalResourceAdapter(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Json, FxError>>;
-export declare function configureLocalResourceAdapter(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Json, FxError>>;
-export declare function executeUserTaskAdapter(ctx: Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: EnvInfoV2, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<unknown, FxError>>;
-export declare function getQuestionsForScaffoldingAdapter(ctx: Context, inputs: Inputs, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function getQuestionsAdapter(ctx: Context, inputs: Inputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function getQuestionsForUserTaskAdapter(ctx: Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function legacyConfig2EnvState(config: ConfigMap, pluginName: string): Json;
+export declare function configureResourceAdapter(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
+export declare function deployAdapter(ctx: v2.Context, inputs: v2.DeploymentInputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
+export declare function provisionLocalResourceAdapter(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
+export declare function configureLocalResourceAdapter(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<Void, FxError>>;
+export declare function executeUserTaskAdapter(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<unknown, FxError>>;
+export declare function getQuestionsForScaffoldingAdapter(ctx: v2.Context, inputs: Inputs, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsAdapter(ctx: v2.Context, inputs: Inputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function getQuestionsForUserTaskAdapter(ctx: v2.Context, inputs: Inputs, func: Func, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
 export declare function setStateV2ByConfigMapInc(pluginName: string, state: Json, config: ConfigMap): void;
-export declare function setEnvInfoV1ByStateV2(pluginName: string, pluginContext: PluginContext, envInfoV2: EnvInfoV2): void;
+export declare function setEnvInfoV1ByStateV2(pluginName: string, pluginContext: PluginContext, envInfoV2: v2.EnvInfoV2): void;
 export declare function assignJsonInc(target?: Json, source?: Json): Json | undefined;
-export declare function collaborationApiAdaptor(ctx: Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json, plugin: Plugin, taskName: "grantPermission" | "listCollaborator" | "checkPermission"): Promise<Result<Json, FxError>>;
+export declare function collaborationApiAdaptor(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json, plugin: Plugin, taskName: "grantPermission" | "listCollaborator" | "checkPermission"): Promise<Result<Json, FxError>>;
 //# sourceMappingURL=utils4v2.d.ts.map

package/build/plugins/resource/utils4v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils4v2.d.ts","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils4v2.d.ts","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EAIT,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EAIJ,MAAM,EACN,aAAa,EACb,SAAS,EACT,MAAM,EAEN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,sBAAsB,UAAQ,GAC7B,aAAa,CAkBf;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAW/C;AACD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAW/C;AACD,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAGD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAEhE;AAGD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAGjF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,gBAAgB,EAC3B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8BhC;AAyHD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAchC;AAED,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAchC;AAED,wBAAsB,sBAAsB,CAC1C,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,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAcnC;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAIjD;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAsB,8BAA8B,CAClD,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,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAGjG;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,EAAE,CAAC,SAAS,GACtB,IAAI,CAiBN;AAED,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAiB5E;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,IAAI,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,iBAAiB,GACnE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkBhC"}

package/build/plugins/resource/utils4v2.js

@@ -5,16 +5,15 @@ const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../common/tools");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const localSettingsProvider_1 = require("../../common/localSettingsProvider");
 const error_1 = require("../../core/error");
-const tools_2 = require("../../core/tools");
+const tools_1 = require("../../core/tools");
 const constants_1 = require("../solution/fx-solution/constants");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const __1 = require("../..");
 function convert2PluginContext(pluginName, ctx, inputs, ignoreEmptyProjectPath = false) {
     if (!ignoreEmptyProjectPath && !inputs.projectPath)
         throw error_1.NoProjectOpenedError();
-    const envInfo = tools_2.newEnvInfo(inputs.env);
+    const envInfo = tools_1.newEnvInfo(inputs.env);
     const config = new teamsfx_api_1.ConfigMap();
     envInfo.state.set(pluginName, config);
     const pluginContext = {
@@ -39,7 +38,7 @@ async function scaffoldSourceCodeAdapter(ctx, inputs, plugin) {
         return teamsfx_api_1.err(error_1.NoProjectOpenedError());
     }
     const pluginContext = convert2PluginContext(plugin.name, ctx, inputs);
-    const localSettingsProvider = new __1.LocalSettingsProvider(pluginContext.root);
+    const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(pluginContext.root);
     pluginContext.localSettings = await localSettingsProvider.load(pluginContext.cryptoProvider);
     if (plugin.preScaffold) {
         const preRes = await plugin.preScaffold(pluginContext);
@@ -117,43 +116,19 @@ async function provisionResourceAdapter(ctx, inputs, envInfo, tokenProvider, plu
         return teamsfx_api_1.err(res.error);
     }
     pluginContext.envInfo.state.delete(constants_1.GLOBAL_CONFIG);
-    return teamsfx_api_1.ok(legacyConfig2EnvState(pluginContext.config, plugin.name));
+    envInfo.state[plugin.name] = pluginContext.config.toJSON();
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.provisionResourceAdapter = provisionResourceAdapter;
 // flattens output/secrets fields in config map for backward compatibility
 function flattenConfigMap(configMap) {
-    const map = new teamsfx_api_1.ConfigMap();
-    for (const [k, v] of configMap.entries()) {
-        if (v instanceof teamsfx_api_1.ConfigMap) {
-            const value = flattenConfigMap(v);
-            if (k === "output" || k === "secrets") {
-                for (const [k, v] of value.entries()) {
-                    map.set(k, v);
-                }
-            }
-            else {
-                map.set(k, value);
-            }
-        }
-        else {
-            map.set(k, v);
-        }
-    }
-    return map;
+    return configMap;
 }
 exports.flattenConfigMap = flattenConfigMap;
 // Convert legacy config map to env state with output and secrets fields
 function legacyConfig2EnvState(config, pluginName) {
     const output = config.toJSON();
-    //separate secret keys from output
-    const secrets = {};
-    for (const key of Object.keys(output)) {
-        if (tools_1.CryptoDataMatchers.has(`${pluginName}.${key}`)) {
-            secrets[key] = output[key];
-            delete output[key];
-        }
-    }
-    return { output, secrets };
+    return output;
 }
 exports.legacyConfig2EnvState = legacyConfig2EnvState;
 async function configureResourceAdapter(ctx, inputs, envInfo, tokenProvider, plugin) {
@@ -175,7 +150,8 @@ async function configureResourceAdapter(ctx, inputs, envInfo, tokenProvider, plu
     if (postRes.isErr()) {
         return teamsfx_api_1.err(postRes.error);
     }
-    return teamsfx_api_1.ok(legacyConfig2EnvState(pluginContext.config, plugin.name));
+    envInfo.state[plugin.name] = pluginContext.config.toJSON();
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.configureResourceAdapter = configureResourceAdapter;
 async function deployAdapter(ctx, inputs, envInfo, tokenProvider, plugin) {
@@ -399,7 +375,7 @@ function setStateV2ByConfigMapInc(pluginName, state, config) {
 }
 exports.setStateV2ByConfigMapInc = setStateV2ByConfigMapInc;
 function setEnvInfoV1ByStateV2(pluginName, pluginContext, envInfoV2) {
-    const envInfo = tools_2.newEnvInfo();
+    const envInfo = tools_1.newEnvInfo();
     let stateV1 = teamsfx_api_1.ConfigMap.fromJSON(envInfoV2.state);
     if (!stateV1) {
         throw error_1.InvalidStateError(pluginName, envInfoV2.state);

package/build/plugins/resource/utils4v2.js.map

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

package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts

@@ -1,4 +1,4 @@
-import { v2, AzureSolutionSettings, Plugin } from "@microsoft/teamsfx-api";
+import { v2, AzureSolutionSettings, Plugin, ProjectSettings } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
 export declare const ResourcePlugins: {
     SpfxPlugin: string;
@@ -52,8 +52,8 @@ export declare function getAllV2ResourcePluginMap(): Map<string, v2.ResourcePlug
 export declare function getActivatedResourcePlugins(solutionSettings: AzureSolutionSettings): Plugin[];
 /**
  * return activated resource plugin according to solution settings
- * @param solutionSettings Azure solution settings
+ * @param projectSettings project settings
  * @returns activated resource plugins
  */
-export declare function getActivatedV2ResourcePlugins(solutionSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function getActivatedV2ResourcePlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 //# sourceMappingURL=ResourcePluginContainer.d.ts.map

package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourcePluginContainer.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/ResourcePluginContainer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAmB,MAAM,wBAAwB,CAAC;AAC5F,OAAO,kBAAkB,CAAC;AAI1B,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAa3B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;CAa7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAShD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,EAAE,CAAC,cAAc,EAAE,CAW7D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAO7D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,CAO1E;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,MAAM,EAAE,CAY7F;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,qBAAqB,GACtC,EAAE,CAAC,cAAc,EAAE,CAYrB"}
+{"version":3,"file":"ResourcePluginContainer.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/ResourcePluginContainer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,EAAE,EACF,qBAAqB,EACrB,MAAM,EAEN,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAI1B,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAa3B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;CAa7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAShD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,EAAE,CAAC,cAAc,EAAE,CAW7D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAO7D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,CAO1E;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,MAAM,EAAE,CAY7F;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,eAAe,EAAE,eAAe,GAC/B,EAAE,CAAC,cAAc,EAAE,CAQrB"}

package/build/plugins/solution/fx-solution/ResourcePluginContainer.js

@@ -104,14 +104,15 @@ function getActivatedResourcePlugins(solutionSettings) {
 exports.getActivatedResourcePlugins = getActivatedResourcePlugins;
 /**
  * return activated resource plugin according to solution settings
- * @param solutionSettings Azure solution settings
+ * @param projectSettings project settings
  * @returns activated resource plugins
  */
-function getActivatedV2ResourcePlugins(solutionSettings) {
-    const activatedPlugins = getAllV2ResourcePlugins().filter((p) => p.activate && p.activate(solutionSettings) === true);
-    if (activatedPlugins.length === 0) {
-        throw teamsfx_api_1.returnUserError(new Error(`No plugin selected`), constants_1.SolutionSource, constants_1.SolutionError.NoResourcePluginSelected);
-    }
+function getActivatedV2ResourcePlugins(projectSettings) {
+    var _a;
+    const activeResourcePlugins = (_a = projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
+    if (!activeResourcePlugins)
+        return [];
+    const activatedPlugins = getAllV2ResourcePlugins().filter((p) => activeResourcePlugins.includes(p.name));
     return activatedPlugins;
 }
 exports.getActivatedV2ResourcePlugins = getActivatedV2ResourcePlugins;

package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map

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

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

@@ -3,7 +3,7 @@ import { DeploymentOperation } from "@azure/arm-resources/esm/models";
 import { AzureAccountProvider, FxError, Result, SolutionContext, v2, v3 } from "@microsoft/teamsfx-api";
 import { ArmTemplateResult, NamedArmResourcePlugin } from "../../../common/armInterface";
 export declare function generateArmTemplate(ctx: SolutionContext, selectedPlugins?: NamedArmResourcePlugin[]): Promise<Result<any, FxError>>;
-export declare function generateArmTemplateV3(ctx: v2.Context, inputs: v2.InputsWithProjectPath, activatedPlugins: v3.ResourcePlugin[], addedPlugins: v3.ResourcePlugin[]): Promise<Result<any, FxError>>;
+export declare function addFeature(ctx: v3.ContextWithManifestProvider, inputs: v3.SolutionAddFeatureInputs): Promise<Result<any, FxError>>;
 declare type DeployContext = {
     ctx: SolutionContext;
     finished: boolean;
@@ -47,11 +47,17 @@ interface PluginContext {
 interface PluginModuleProperties {
     path: string;
 }
+export declare function wrapGetDeploymentError(deployCtx: DeployContext, resourceGroupName: string, deploymentName: string): Promise<Result<any, FxError>>;
 export declare function formattedDeploymentError(deploymentError: any): any;
+declare class ArmV2 {
+    generateArmTemplate(ctx: SolutionContext, selectedPlugins?: NamedArmResourcePlugin[]): Promise<Result<any, FxError>>;
+    deployArmTemplates(ctx: SolutionContext): Promise<Result<void, FxError>>;
+}
 declare class Arm {
-    generateArmTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath, activatedPlugins: v3.ResourcePlugin[], addedPlugins: v3.ResourcePlugin[]): Promise<Result<any, FxError>>;
+    addFeature(ctx: v3.ContextWithManifestProvider, inputs: v3.SolutionAddFeatureInputs): Promise<Result<any, FxError>>;
     deployArmTemplates(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider): Promise<Result<void, FxError>>;
 }
 declare const arm: Arm;
+export declare const armV2: ArmV2;
 export default arm;
 //# sourceMappingURL=arm.d.ts.map

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

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