Merge branch 'main' into dependabot/npm_and_yarn/dot-github/actions/conventional-pr/actions/core-1.9.1

Author: tracyboehrer

Composer/packages/server/src/externalContentProvider/azureBotServiceProvider.ts

@@ -74,7 +74,7 @@ export class AzureBotServiceProvider extends ExternalContentProvider<AzureBotSer
       type: 'azurePublish',
       configuration: JSON.stringify({
         hostname: '',
-        runtimeIdentifier: 'win-x64',
+        runtimeIdentifier: this.metadata.runtimeIdentifier ?? 'win-x64',
         settings: {
           MicrosoftAppId: appId,
           MicrosoftAppPassword: appPwd,

Composer/packages/ui-plugins/composer/src/defaultFlowSchema.ts

@@ -221,7 +221,7 @@ export const DefaultFlowSchema: FlowUISchema = {
     widget: 'ActionCard',
     body: {
       widget: 'PropertyDescription',
-      property: '=coalesce(action.errorValue, "?")',
+      property: '=coalesce(string(action.errorValue), "?")',
       description: '= ErrorValue',
     },
   },

Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx

@@ -7,7 +7,6 @@ import { EditorExtension } from '@bfc/extension-client';
 import { render, fireEvent } from '@botframework-composer/test-utils';
 
 import { SchemaEditorField } from '../Fields/SchemaEditorField';
-import { SCHEMA_URI } from '../contants';
 
 const renderSchemaEditor = ({ updateDialogSchema = jest.fn() } = {}) => {
   const api: any = {
@@ -61,7 +60,7 @@ describe('Schema Editor', () => {
           properties: expect.objectContaining({
             propertyName: {
               title: 'Property Name',
-              $ref: `${SCHEMA_URI}#/definitions/valueExpression`,
+              type: 'string',
             },
           }),
         }),

Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts

@@ -5,8 +5,6 @@ import { UIOptions } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 import startCase from 'lodash/startCase';
 
-import { ValueRefField } from './Fields/ValueRefField';
-
 const objectSerializer = {
   get: (value) => value,
   set: (value) =>
@@ -25,15 +23,6 @@ export const uiOptions: UIOptions = {
         additionalProperties: {
           hidden: ['title'],
           order: ['type', 'description', '*'],
-          serializer: {
-            get: ({ $ref, ...rest }: any = {}) => ($ref ? { ...rest, type: $ref } : rest),
-            set: ({ type, ...rest }: any = {}) => (type ? { ...rest, $ref: type } : rest),
-          },
-          properties: {
-            type: {
-              field: ValueRefField,
-            },
-          },
         },
       },
     },

extensions/azurePublish/src/node/deploy.ts

@@ -162,6 +162,26 @@ export class BotProjectDeploy {
         status: BotProjectDeployLoggerType.DEPLOY_SUCCESS,
         message: 'Published successfully!',
       });
+
+      // STEP 6: UPDATE STACK PROPERTY IN WEB APP
+      this.logger({
+        status: BotProjectDeployLoggerType.DEPLOY_INFO,
+        message: 'Updating Bots properties',
+      });
+
+      const profile = settings.publishTargets.find((p) => p.name === profileName);
+      const configuration = JSON.parse(profile.configuration);
+
+      if (settings.runtime.command.includes('dotnet') && configuration.appServiceOperatingSystem === 'linux') {
+        await this.updateBotSettings(
+          this.accessToken,
+          name,
+          environment,
+          hostname,
+          absSettings.subscriptionId,
+          absSettings.resourceGroup
+        );
+      }
     } catch (error) {
       this.logger({
         status: BotProjectDeployLoggerType.DEPLOY_ERROR,
@@ -248,14 +268,22 @@ export class BotProjectDeploy {
         try {
           const statusResponse = await axios.get(statusUrl, { headers: { Authorization: `Bearer ${token}` } });
 
-          if (statusResponse.data.provisioningState === 'Succeeded') {
+          /* We use the 'statusEnum' property to map the states of Windows and Linux bots.
+          The 'provisioningState' property was previously being used, but Linux bots don't have it.
+          Visit https://github.com/projectkudu/kudu/blob/master/Kudu.Contracts/Deployment/DeployStatus.cs for more information. */
+          const statusEnum = {
+            3: 'Failed',
+            4: 'Succeeded',
+          }[statusResponse.data.status];
+
+          if (statusEnum === 'Succeeded') {
             this.logger({
               status: BotProjectDeployLoggerType.DEPLOY_INFO,
               message: 'Zip upload processed successfully.',
             });
             clearInterval(timerId);
             resolve();
-          } else if (statusResponse.data.provisioningState === 'Failed') {
+          } else if (statusEnum === 'Failed') {
             clearInterval(timerId);
             reject(`Zip upload processing failed. ${statusResponse.data.status_text}`);
           } else {
@@ -324,6 +352,49 @@ export class BotProjectDeploy {
     return `https://${hostnameResult}.${scmHostDomainResult}/zipdeploy/?isAsync=true`;
   };
 
+  // Update Web App Settings
+  private async updateBotSettings(
+    token: string,
+    name: string,
+    env: string,
+    hostname: string,
+    subscriptionId: string,
+    resourceGroup: string
+  ) {
+    try {
+      const updateEndpoint = this.buildUpdateEndpoint(hostname, name, env, subscriptionId, resourceGroup);
+      const response = await axios.put(
+        updateEndpoint,
+        { properties: { linuxFxVersion: 'DOTNETCORE|3.1' } },
+        { headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' } }
+      );
+
+      if (response.status === 200) {
+        this.logger({
+          status: BotProjectDeployLoggerType.DEPLOY_INFO,
+          message: `Settings successfully updated.`,
+        });
+      }
+    } catch (err) {
+      const errorMessage = JSON.stringify(err, Object.getOwnPropertyNames(err));
+      throw createCustomizeError(
+        AzurePublishErrors.DEPLOY_ZIP_ERROR,
+        `There was a problem updating the bot's settings. ${errorMessage}`
+      );
+    }
+  }
+
+  private buildUpdateEndpoint = (
+    hostname: string,
+    name: string,
+    env: string,
+    subscriptionId: string,
+    resourceGroupName: string
+  ) => {
+    const hostnameResult = hostname ? hostname : name + (env ? '-' + env : '');
+    return `https://management.azure.com/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.Web/sites/${hostnameResult}/config/web?api-version=2022-03-01`;
+  };
+
   /**
    * link the bot channel registration with azure web app service
    * @param absSettings the abs settings

extensions/azurePublish/src/node/index.ts

@@ -305,6 +305,13 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
       }
       const currentSettings = currentProfile?.settings;
 
+      let runtimeIdentifier = 'win-x64';
+      if (currentProfile?.runtimeIdentifier) {
+        runtimeIdentifier = currentProfile?.runtimeIdentifier;
+      } else if (provisionConfig.appServiceOperatingSystem === 'linux') {
+        runtimeIdentifier = 'linux-x64';
+      }
+
       const publishProfile = {
         name: currentProfile?.name ?? provisionConfig.hostname,
         environment: currentProfile?.environment ?? 'composer',
@@ -316,7 +323,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
         luisResource: provisionResults.luisPrediction
           ? `${provisionConfig.hostname}-luis`
           : currentProfile?.luisResource,
-        runtimeIdentifier: currentProfile?.runtimeIdentifier ?? 'win-x64',
+        runtimeIdentifier: runtimeIdentifier,
         region: provisionConfig.location,
         appServiceOperatingSystem:
           provisionConfig.appServiceOperatingSystem ?? currentProfile?.appServiceOperatingSystem,