perf: support aad frontend simpleauth bot scaffold (#2827)

* perf: support change folder structure

* chore: support bot

* chore: update

* chore: fix code on commends

* test: fix test

* test: update test cases

* chore: check branch unit test

* chore: bicep config as lf eol

* test: fix ut

* test: update

* perf(arm): solution help frontend hosting plugin fill in arm output (#2771)

* perf(arm): solution help frontend hosting plugin fill in arm output

* fix: fix import path

* chore: remove logs

Co-authored-by: Di Lin <[email protected]>

Author: wenytang-ms

.gitattributes

@@ -6,3 +6,4 @@
 *.tsx eol=lf
 *.yml eol=lf
 *.sh eol=lf
+*.bicep eol=lf

.github/workflows/unit-test.yml

@@ -5,13 +5,11 @@ on:
     branches:
       - main
       - dev
-      # delete this want merge into dev branch
       - feat/arm-support
   push:
     branches:
       - main
       - dev
-      # delete this want merge into dev branch
       - feat/arm-support
 
 jobs:

packages/fx-core/src/common/armInterface.ts

@@ -37,3 +37,13 @@ export interface ScaffoldArmTemplateResult extends Record<string, unknown> {
   Modules?: { [moduleFileName: string]: BicepModule };
   Orchestration: BicepOrchestration;
 }
+
+export interface ArmTemplateResult extends Record<string, unknown> {
+  Provision?: {
+    Orchestration: string;
+    Reference?: Record<string, unknown>;
+    Modules?: { [moduleFileName: string]: string };
+  };
+  Configuration?: { Orchestration: string; Modules?: { [moduleFileName: string]: string } };
+  Parameters?: Record<string, string>;
+}

packages/fx-core/src/common/constants.ts

@@ -13,6 +13,8 @@ export class Bicep {
   static readonly OutputOrchestrationFileName: string = "output.template.bicep";
   static readonly VariablesOrchestrationFileName: string = "variables.template.bicep";
   static readonly ParameterFileName: string = "parameters.json";
+  static readonly ProvisionV2FileName: string = "provision.template.v2.bicep";
+  static readonly ConfigV2FileName: string = "config.template.v2.bicep";
 }
 
 export class TeamsClientId {

packages/fx-core/src/plugins/resource/aad/plugin.ts

@@ -51,7 +51,7 @@ import * as jsonPermissionList from "./permissions/permissions.json";
 import { Utils } from "./utils/common";
 import * as path from "path";
 import * as fs from "fs-extra";
-import { ScaffoldArmTemplateResult } from "../../../common/armInterface";
+import { ScaffoldArmTemplateResult, ArmTemplateResult } from "../../../common/armInterface";
 import { Bicep, ConstantString, ResourcePlugins } from "../../../common/constants";
 import { isMultiEnvEnabled } from "../../../common/tools";
 import { getTemplatesFolder } from "../../../folder";
@@ -311,33 +311,11 @@ export class AadAppForTeamsImpl {
       getTemplatesFolder(),
       TemplatePathInfo.BicepTemplateRelativeDir
     );
-    const inputParameterOrchestrationFilePath = path.join(
-      bicepTemplateDir,
-      Bicep.ParameterOrchestrationFileName
-    );
-    const variablesOrchestrationFilePath = path.join(
-      bicepTemplateDir,
-      Bicep.VariablesOrchestrationFileName
-    );
     const parameterFilePath = path.join(bicepTemplateDir, Bicep.ParameterFileName);
 
-    const result: ScaffoldArmTemplateResult = {
-      Orchestration: {
-        ParameterTemplate: {
-          Content: await fs.readFile(
-            inputParameterOrchestrationFilePath,
-            ConstantString.UTF8Encoding
-          ),
-          ParameterJson: JSON.parse(
-            await fs.readFile(parameterFilePath, ConstantString.UTF8Encoding)
-          ),
-        },
-        VariableTemplate: {
-          Content: await fs.readFile(variablesOrchestrationFilePath, ConstantString.UTF8Encoding),
-        },
-      },
+    const result: ArmTemplateResult = {
+      Parameters: JSON.parse(await fs.readFile(parameterFilePath, ConstantString.UTF8Encoding)),
     };
-
     Utils.addLogAndTelemetry(ctx.logProvider, Messages.EndGenerateArmTemplates);
     return ResultFactory.Success(result);
   }

packages/fx-core/src/plugins/resource/bot/constants.ts

@@ -269,6 +269,9 @@ export class PathInfo {
   );
   public static readonly ProvisionModuleTemplateFileName = "botProvision.template.bicep";
   public static readonly ConfigurationModuleTemplateFileName = "botConfiguration.template.bicep";
+  public static readonly ProvisionModuleTemplateV2FileName = "botProvision.template.v2.bicep";
+  public static readonly ConfigurationModuleTemplateV2FileName =
+    "botConfiguration.template.v2.bicep";
 }
 
 export class BotArmOutput {

packages/fx-core/src/plugins/resource/bot/plugin.ts

@@ -53,17 +53,15 @@ import { AzureOperations } from "./azureOps";
 import { TokenCredentialsBase } from "@azure/ms-rest-nodeauth";
 import path from "path";
 import { getTemplatesFolder } from "../../..";
-import { ScaffoldArmTemplateResult } from "../../../common/armInterface";
+import { ArmTemplateResult } from "../../../common/armInterface";
 import { Bicep, ConstantString } from "../../../common/constants";
 import {
   copyFiles,
-  generateBicepFiles,
   getResourceGroupNameFromResourceId,
   getSiteNameFromResourceId,
   getSubscriptionIdFromResourceId,
   isArmSupportEnabled,
 } from "../../../common";
-import { AzureSolutionSettings } from "@microsoft/teamsfx-api";
 import { getArmOutput } from "../utils4v2";
 
 export class TeamsBotImpl {
@@ -198,78 +196,42 @@ export class TeamsBotImpl {
 
     const bicepTemplateDir = path.join(getTemplatesFolder(), PathInfo.BicepTemplateRelativeDir);
 
-    const selectedPlugins = (this.ctx.projectSettings?.solutionSettings as AzureSolutionSettings)
-      .activeResourcePlugins;
-    const handleBarsContext = {
-      Plugins: selectedPlugins,
-    };
-
-    const provisionModuleContentResult = await generateBicepFiles(
-      path.join(bicepTemplateDir, PathInfo.ProvisionModuleTemplateFileName),
-      handleBarsContext
-    );
-    if (provisionModuleContentResult.isErr()) {
-      throw provisionModuleContentResult.error;
-    }
-
-    const configurationModuleContentResult = await generateBicepFiles(
-      path.join(bicepTemplateDir, PathInfo.ConfigurationModuleTemplateFileName),
-      handleBarsContext
-    );
-    if (configurationModuleContentResult.isErr()) {
-      throw configurationModuleContentResult.error;
-    }
-
-    const inputParameterContentResult = await generateBicepFiles(
-      path.join(bicepTemplateDir, Bicep.ParameterOrchestrationFileName),
-      handleBarsContext
-    );
-    if (inputParameterContentResult.isErr()) {
-      throw inputParameterContentResult.error;
-    }
-
-    const moduleOrchestrationContentResult = await generateBicepFiles(
-      path.join(bicepTemplateDir, Bicep.ModuleOrchestrationFileName),
-      handleBarsContext
-    );
-    if (moduleOrchestrationContentResult.isErr()) {
-      throw moduleOrchestrationContentResult.error;
-    }
-
-    const outputOrchestrationContentResult = await generateBicepFiles(
-      path.join(bicepTemplateDir, Bicep.OutputOrchestrationFileName),
-      handleBarsContext
-    );
-    if (outputOrchestrationContentResult.isErr()) {
-      throw outputOrchestrationContentResult.error;
-    }
-
-    const result: ScaffoldArmTemplateResult = {
-      Modules: {
-        botProvision: {
-          Content: provisionModuleContentResult.value,
+    const result: ArmTemplateResult = {
+      Provision: {
+        Orchestration: await fs.readFile(
+          path.join(bicepTemplateDir, Bicep.ProvisionV2FileName),
+          ConstantString.UTF8Encoding
+        ),
+        Modules: {
+          botProvision: await fs.readFile(
+            path.join(bicepTemplateDir, PathInfo.ProvisionModuleTemplateV2FileName),
+            ConstantString.UTF8Encoding
+          ),
         },
-        botConfiguration: {
-          Content: configurationModuleContentResult.value,
+        Reference: {
+          resourceId: "webAppResourceId",
+          hostName: "webAppHostName",
+          webAppEndpoint: "webAppEndpoint",
         },
       },
-      Orchestration: {
-        ParameterTemplate: {
-          Content: inputParameterContentResult.value,
-          ParameterJson: JSON.parse(
-            await fs.readFile(
-              path.join(bicepTemplateDir, Bicep.ParameterFileName),
-              ConstantString.UTF8Encoding
-            )
+      Configuration: {
+        Orchestration: await fs.readFile(
+          path.join(bicepTemplateDir, Bicep.ConfigV2FileName),
+          ConstantString.UTF8Encoding
+        ),
+        Modules: {
+          botConfiguration: await fs.readFile(
+            path.join(bicepTemplateDir, PathInfo.ConfigurationModuleTemplateV2FileName),
+            ConstantString.UTF8Encoding
           ),
         },
-        ModuleTemplate: {
-          Content: moduleOrchestrationContentResult.value,
-        },
-        OutputTemplate: {
-          Content: outputOrchestrationContentResult.value,
-        },
       },
+      Parameters: JSON.parse(
+        await fs.readFile(
+          path.join(bicepTemplateDir, Bicep.ParameterFileName),
+          ConstantString.UTF8Encoding
+        )
+      ),
     };
 
     Logger.info(Messages.SuccessfullyGenerateArmTemplatesBot);

packages/fx-core/src/plugins/resource/frontend/constants.ts

@@ -56,6 +56,7 @@ export class FrontendPathInfo {
   static TemplatePackageExt = ".zip";
 
   static ModuleFileName = "frontendHosting.bicep";
+  static ModuleProvisionV2FileName = "frontendHostingProvision.v2.bicep";
 
   static BuildFolderName = "build";
   static BuildPath = `${FrontendPathInfo.BuildFolderName}${path.sep}`;
@@ -101,9 +102,12 @@ export class FrontendConfigInfo {
 }
 
 export class FrontendOutputBicepSnippet {
-  static readonly StorageName = "frontendHostingProvision.outputs.storageName";
-  static readonly Endpoint = "frontendHostingProvision.outputs.endpoint";
-  static readonly Domain = "frontendHostingProvision.outputs.domain";
+  static readonly StorageName = "provisionOutputs.frontendHostingProvision.outputs.storageName";
+  static readonly Endpoint = "provisionOutputs.frontendHostingProvision.outputs.endpoint";
+  static readonly Domain = "provisionOutputs.frontendHostingProvision.outputs.domain";
+  static readonly Domain2 = "provisionOutputs.frontendHostingOutput.value.domain";
+  static readonly Endpoint2 = "provisionOutputs.frontendHostingOutput.value.endpoint";
+  static readonly StorageName2 = "provisionOutputs.frontendHostingOutput.value.storageName";
 }
 
 export class TelemetryEvent {

packages/fx-core/src/plugins/resource/frontend/plugin.ts

@@ -54,7 +54,7 @@ import {
 import { TemplateInfo } from "./resources/templateInfo";
 import { AzureClientFactory, AzureLib } from "./utils/azure-client";
 import { getTemplatesFolder } from "../../../folder";
-import { ScaffoldArmTemplateResult } from "../../../common/armInterface";
+import { ArmTemplateResult } from "../../../common/armInterface";
 import * as fs from "fs-extra";
 import { Bicep, ConstantString } from "../../../common/constants";
 import { EnvironmentUtils } from "./utils/environment-utils";
@@ -195,44 +195,25 @@ export class FrontendPluginImpl {
       FrontendPathInfo.BicepTemplateRelativeDir
     );
 
-    const moduleFilePath = path.join(bicepTemplateDir, FrontendPathInfo.ModuleFileName);
-
-    const inputParameterOrchestrationFilePath = path.join(
-      bicepTemplateDir,
-      Bicep.ParameterOrchestrationFileName
-    );
-    const moduleOrchestrationFilePath = path.join(
-      bicepTemplateDir,
-      Bicep.ModuleOrchestrationFileName
-    );
-    const outputOrchestrationFilePath = path.join(
+    const provisionFilePath = path.join(bicepTemplateDir, Bicep.ProvisionV2FileName);
+    const moduleProvisionFilePath = path.join(
       bicepTemplateDir,
-      Bicep.OutputOrchestrationFileName
+      FrontendPathInfo.ModuleProvisionV2FileName
     );
 
-    const result: ScaffoldArmTemplateResult = {
-      Modules: {
-        frontendHostingProvision: {
-          Content: await fs.readFile(moduleFilePath, ConstantString.UTF8Encoding),
+    const result: ArmTemplateResult = {
+      Provision: {
+        Orchestration: await fs.readFile(provisionFilePath, ConstantString.UTF8Encoding),
+        Reference: {
+          endpoint: FrontendOutputBicepSnippet.Endpoint2,
+          domain: FrontendOutputBicepSnippet.Domain2,
         },
-      },
-      Orchestration: {
-        ParameterTemplate: {
-          Content: await fs.readFile(
-            inputParameterOrchestrationFilePath,
+        Modules: {
+          frontendHostingProvision: await fs.readFile(
+            moduleProvisionFilePath,
             ConstantString.UTF8Encoding
           ),
         },
-        ModuleTemplate: {
-          Content: await fs.readFile(moduleOrchestrationFilePath, ConstantString.UTF8Encoding),
-          Outputs: {
-            endpoint: FrontendOutputBicepSnippet.Endpoint,
-            domain: FrontendOutputBicepSnippet.Domain,
-          },
-        },
-        OutputTemplate: {
-          Content: await fs.readFile(outputOrchestrationFilePath, ConstantString.UTF8Encoding),
-        },
       },
     };
 

packages/fx-core/src/plugins/resource/function/constants.ts

@@ -181,10 +181,16 @@ export class QuestionValidationFunc {
 }
 
 export class FunctionBicep {
-  static readonly functionEndpoint: string = "functionProvision.outputs.functionEndpoint";
+  static readonly functionEndpoint: string =
+    "provisionOutputs.functionProvision.value.functionEndpoint";
+  static readonly functionResourceId: string =
+    "provisionOutputs.functionOutput.value.functionAppResourceId";
 }
 
 export class FunctionBicepFile {
   static readonly provisionModuleTemplateFileName: string = "functionProvision.template.bicep";
   static readonly configurationTemplateFileName: string = "functionConfiguration.template.bicep";
+  static readonly provisionModuleTemplateV2FileName: string = "functionProvision.template.v2.bicep";
+  static readonly configuraitonTemplateV2FileName: string =
+    "functionConfiguration.template.v2.bicep";
 }