[AutoPR @azure/arm-botservice] [Hub Generated] Review request for Microsoft.BotService to add version stable/2021-03-01

sdk/botservice/arm-botservice/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Microsoft
+Copyright (c) 2021 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

sdk/botservice/arm-botservice/README.md

@@ -15,7 +15,7 @@ npm install @azure/arm-botservice
 
 ### How to use
 
-#### nodejs - Authentication, client creation and get bots as an example written in TypeScript.
+#### nodejs - client creation and get bots as an example written in TypeScript.
 
 ##### Install @azure/ms-rest-nodeauth
 
@@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
 
 ##### Sample code
 
+While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
-import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
-import { AzureBotService, AzureBotServiceModels, AzureBotServiceMappers } from "@azure/arm-botservice";
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
+const { AzureBotService } = require("@azure/arm-botservice");
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {

sdk/botservice/arm-botservice/rollup.config.js

@@ -21,8 +21,8 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/botservice/arm-botservice/src/azureBotService.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -22,6 +21,7 @@ class AzureBotService extends AzureBotServiceContext {
   directLine: operations.DirectLine;
   operations: operations.Operations;
   botConnection: operations.BotConnection;
+  hostSettings: operations.HostSettings;
 
   /**
    * Initializes a new instance of the AzureBotService class.
@@ -36,6 +36,7 @@ class AzureBotService extends AzureBotServiceContext {
     this.directLine = new operations.DirectLine(this);
     this.operations = new operations.Operations(this);
     this.botConnection = new operations.BotConnection(this);
+    this.hostSettings = new operations.HostSettings(this);
   }
 }
 

sdk/botservice/arm-botservice/src/azureBotServiceContext.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -37,25 +36,25 @@ export class AzureBotServiceContext extends msRestAzure.AzureServiceClient {
     if (!options) {
       options = {};
     }
-    if (!options.userAgent) {
+    if(!options.userAgent) {
       const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
     super(credentials, options);
 
-    this.apiVersion = '2020-06-02';
+    this.apiVersion = '2021-03-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
     this.requestContentType = "application/json; charset=utf-8";
     this.credentials = credentials;
     this.subscriptionId = subscriptionId;
 
-    if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
+    if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
       this.acceptLanguage = options.acceptLanguage;
     }
-    if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
+    if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
       this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
     }
   }

sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/botservice/arm-botservice/src/models/botsMappers.ts

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/botservice/arm-botservice/src/models/channelsMappers.ts

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/botservice/arm-botservice/src/models/directLineMappers.ts

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/botservice/arm-botservice/src/models/hostSettingsMappers.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  discriminators,
+  ErrorBody,
+  ErrorModel,
+  HostSettingsResponse
+} from "../models/mappers";

sdk/botservice/arm-botservice/src/models/index.ts

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -59,7 +59,7 @@ export interface Resource extends BaseResource {
   sku?: Sku;
   /**
    * Required. Gets or sets the Kind of the resource. Possible values include: 'sdk', 'designer',
-   * 'bot', 'function'
+   * 'bot', 'function', 'azurebot'
    */
   kind?: Kind;
   /**
@@ -127,6 +127,22 @@ export interface BotProperties {
    * The LUIS Key
    */
   luisKey?: string;
+  /**
+   * Whether Cmek is enabled
+   */
+  isCmekEnabled?: boolean;
+  /**
+   * The CMK Url
+   */
+  cmekKeyVaultUrl?: string;
+  /**
+   * Whether the bot is in an isolated network
+   */
+  isIsolated?: boolean;
+  /**
+   * The channel schema transformation version for the bot
+   */
+  schemaTransformationVersion?: string;
 }
 
 /**
@@ -214,7 +230,7 @@ export interface FacebookPage {
    * Facebook application access token. Value only returned through POST to the action Channel List
    * API, otherwise empty.
    */
-  accessToken: string;
+  accessToken?: string;
 }
 
 /**
@@ -239,7 +255,7 @@ export interface FacebookChannelProperties {
    * Facebook application secret. Value only returned through POST to the action Channel List API,
    * otherwise empty.
    */
-  appSecret: string;
+  appSecret?: string;
   /**
    * Callback Url
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -277,7 +293,7 @@ export interface EmailChannelProperties {
    * The password for the email address. Value only returned through POST to the action Channel
    * List API, otherwise empty.
    */
-  password: string;
+  password?: string;
   /**
    * Whether this channel is enabled for the bot
    */
@@ -397,7 +413,7 @@ export interface KikChannelProperties {
   /**
    * Kik API key. Value only returned through POST to the action Channel List API, otherwise empty.
    */
-  apiKey: string;
+  apiKey?: string;
   /**
    * Whether this channel is validated for the bot
    */
@@ -564,7 +580,7 @@ export interface TelegramChannelProperties {
    * The Telegram access token. Value only returned through POST to the action Channel List API,
    * otherwise empty.
    */
-  accessToken: string;
+  accessToken?: string;
   /**
    * Whether this channel is validated for the bot
    */
@@ -606,7 +622,7 @@ export interface SmsChannelProperties {
    * The Sms auth token. Value only returned through POST to the action Channel List API, otherwise
    * empty.
    */
-  authToken: string;
+  authToken?: string;
   /**
    * Whether this channel is validated for the bot
    */
@@ -638,17 +654,17 @@ export interface SlackChannelProperties {
   /**
    * The Slack client id
    */
-  clientId: string;
+  clientId?: string;
   /**
    * The Slack client secret. Value only returned through POST to the action Channel List API,
    * otherwise empty.
    */
-  clientSecret: string;
+  clientSecret?: string;
   /**
    * The Slack verification token. Value only returned through POST to the action Channel List API,
    * otherwise empty.
    */
-  verificationToken: string;
+  verificationToken?: string;
   /**
    * The Slack landing page Url
    */
@@ -1069,6 +1085,45 @@ export interface CheckNameAvailabilityResponseBody {
   message?: string;
 }
 
+/**
+ * The response body returned for a request to Bot Service Management to check per subscription
+ * hostSettings
+ */
+export interface HostSettingsResponse {
+  /**
+   * For in-conversation bot user authentication
+   */
+  oAuthUrl?: string;
+  /**
+   * For verifying incoming tokens from the channels
+   */
+  toBotFromChannelOpenIdMetadataUrl?: string;
+  /**
+   * For verifying incoming tokens from the channels
+   */
+  toBotFromChannelTokenIssuer?: string;
+  /**
+   * For verifying incoming tokens from bot emulator
+   */
+  toBotFromEmulatorOpenIdMetadataUrl?: string;
+  /**
+   * For getting access token to channels from bot host
+   */
+  toChannelFromBotLoginUrl?: string;
+  /**
+   * For getting access token to channels from bot host
+   */
+  toChannelFromBotOAuthScope?: string;
+  /**
+   * Per cloud OAuth setting on whether authority is validated
+   */
+  validateAuthority?: boolean;
+  /**
+   * Same as ToBotFromChannelOpenIdMetadataUrl, used by SDK < v4.12
+   */
+  botOpenIdMetadata?: string;
+}
+
 /**
  * Optional Parameters.
  */
@@ -1087,7 +1142,7 @@ export interface BotsUpdateOptionalParams extends msRest.RequestOptionsBase {
   sku?: Sku;
   /**
    * Required. Gets or sets the Kind of the resource. Possible values include: 'sdk', 'designer',
-   * 'bot', 'function'
+   * 'bot', 'function', 'azurebot'
    */
   kind?: Kind;
   /**
@@ -1118,7 +1173,7 @@ export interface ChannelsUpdateOptionalParams extends msRest.RequestOptionsBase
   sku?: Sku;
   /**
    * Required. Gets or sets the Kind of the resource. Possible values include: 'sdk', 'designer',
-   * 'bot', 'function'
+   * 'bot', 'function', 'azurebot'
    */
   kind?: Kind;
   /**
@@ -1204,11 +1259,11 @@ export type SkuTier = 'Free' | 'Standard';
 
 /**
  * Defines values for Kind.
- * Possible values include: 'sdk', 'designer', 'bot', 'function'
+ * Possible values include: 'sdk', 'designer', 'bot', 'function', 'azurebot'
  * @readonly
  * @enum {string}
  */
-export type Kind = 'sdk' | 'designer' | 'bot' | 'function';
+export type Kind = 'sdk' | 'designer' | 'bot' | 'function' | 'azurebot';
 
 /**
  * Defines values for Key.
@@ -1715,3 +1770,23 @@ export type BotConnectionListByBotServiceNextResponse = ConnectionSettingRespons
       parsedBody: ConnectionSettingResponseList;
     };
 };
+
+/**
+ * Contains response data for the get operation.
+ */
+export type HostSettingsGetResponse = HostSettingsResponse & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: HostSettingsResponse;
+    };
+};