From b25744f2417aaed16009325eef47804aafeba003 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 8 Dec 2021 10:00:32 +0000 Subject: [PATCH] CodeGen from PR 16882 in Azure/azure-rest-api-specs Merge d25c84060c155b0e3dee8a62486275de0afc1a98 into 682ebc3841bc1095ee8812199bde2eddcc2ad99f --- sdk/botservice/arm-botservice/package.json | 2 +- .../src/models/botConnectionMappers.ts | 5 + .../arm-botservice/src/models/botsMappers.ts | 3 + .../src/models/channelsMappers.ts | 3 + .../src/models/directLineMappers.ts | 3 + .../arm-botservice/src/models/index.ts | 429 +++++++++++++++++- .../arm-botservice/src/models/mappers.ts | 405 ++++++++++++++++- .../privateEndpointConnectionsMappers.ts | 3 + .../src/models/privateLinkResourcesMappers.ts | 3 + .../arm-botservice/src/operations/channels.ts | 8 +- 10 files changed, 849 insertions(+), 15 deletions(-) diff --git a/sdk/botservice/arm-botservice/package.json b/sdk/botservice/arm-botservice/package.json index 174b6e6588b8..efc601449037 100644 --- a/sdk/botservice/arm-botservice/package.json +++ b/sdk/botservice/arm-botservice/package.json @@ -27,7 +27,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/botservice/arm-botservice", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/botservice/arm-botservice", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts b/sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts index fc3f814e9ba8..8be454842f90 100644 --- a/sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts @@ -15,6 +15,7 @@ export { BotChannel, BotProperties, Channel, + ChannelSettings, ConnectionSetting, ConnectionSettingParameter, ConnectionSettingProperties, @@ -36,6 +37,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -46,8 +48,11 @@ export { Resource, ServiceProvider, ServiceProviderParameter, + ServiceProviderParameterMetadata, + ServiceProviderParameterMetadataConstraints, ServiceProviderProperties, ServiceProviderResponseList, + Site, Sku, SkypeChannel, SkypeChannelProperties, diff --git a/sdk/botservice/arm-botservice/src/models/botsMappers.ts b/sdk/botservice/arm-botservice/src/models/botsMappers.ts index 0e2a3685b359..38cdfa1dc9c6 100644 --- a/sdk/botservice/arm-botservice/src/models/botsMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/botsMappers.ts @@ -16,6 +16,7 @@ export { BotProperties, BotResponseList, Channel, + ChannelSettings, CheckNameAvailabilityRequestBody, CheckNameAvailabilityResponseBody, ConnectionSetting, @@ -38,6 +39,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -46,6 +48,7 @@ export { PrivateLinkResourceBase, PrivateLinkServiceConnectionState, Resource, + Site, Sku, SkypeChannel, SkypeChannelProperties, diff --git a/sdk/botservice/arm-botservice/src/models/channelsMappers.ts b/sdk/botservice/arm-botservice/src/models/channelsMappers.ts index 93efba776c68..43b606eebbeb 100644 --- a/sdk/botservice/arm-botservice/src/models/channelsMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/channelsMappers.ts @@ -16,6 +16,7 @@ export { BotProperties, Channel, ChannelResponseList, + ChannelSettings, ConnectionSetting, ConnectionSettingParameter, ConnectionSettingProperties, @@ -36,6 +37,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -44,6 +46,7 @@ export { PrivateLinkResourceBase, PrivateLinkServiceConnectionState, Resource, + Site, Sku, SkypeChannel, SkypeChannelProperties, diff --git a/sdk/botservice/arm-botservice/src/models/directLineMappers.ts b/sdk/botservice/arm-botservice/src/models/directLineMappers.ts index 38c0c3ad5ed2..92fd9ef1364d 100644 --- a/sdk/botservice/arm-botservice/src/models/directLineMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/directLineMappers.ts @@ -15,6 +15,7 @@ export { BotChannel, BotProperties, Channel, + ChannelSettings, ConnectionSetting, ConnectionSettingParameter, ConnectionSettingProperties, @@ -35,6 +36,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -43,6 +45,7 @@ export { PrivateLinkResourceBase, PrivateLinkServiceConnectionState, Resource, + Site, SiteInfo, Sku, SkypeChannel, diff --git a/sdk/botservice/arm-botservice/src/models/index.ts b/sdk/botservice/arm-botservice/src/models/index.ts index dfc0213be90f..f8b21e110e28 100644 --- a/sdk/botservice/arm-botservice/src/models/index.ts +++ b/sdk/botservice/arm-botservice/src/models/index.ts @@ -66,6 +66,11 @@ export interface Resource extends BaseResource { * Entity Tag */ etag?: string; + /** + * Entity zones + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly zones?: string[]; } /** @@ -168,6 +173,18 @@ export interface BotProperties { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly endpointVersion?: string; + /** + * Contains resource all settings defined as key/value pairs. + */ + allSettings?: { [propertyName: string]: string }; + /** + * Contains resource parameters defined as key/value pairs. + */ + parameters?: { [propertyName: string]: string }; + /** + * The bot's manifest url + */ + manifestUrl?: string; /** * Microsoft App Type for the bot. Possible values include: 'UserAssignedMSI', 'SingleTenant', * 'MultiTenant' @@ -224,9 +241,27 @@ export interface BotProperties { */ cmekKeyVaultUrl?: string; /** - * Whether the bot is in an isolated network + * The CMK encryption status */ - isIsolated?: boolean; + cmekEncryptionStatus?: string; + /** + * Whether the bot is in an isolated network. Possible values include: 'Enabled', 'Disabled'. + * Default value: 'Enabled'. + */ + publicNetworkAccess?: PublicNetworkAccess; + /** + * Whether the bot is streaming supported + */ + isStreamingSupported?: boolean; + /** + * Whether the bot is developerAppInsightsApiKey set + */ + isDeveloperAppInsightsApiKeySet?: boolean; + /** + * Token used to migrate non Azure bot to azure subscription + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly migrationToken?: string; /** * Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for * authentication. @@ -236,6 +271,10 @@ export interface BotProperties { * The channel schema transformation version for the bot */ schemaTransformationVersion?: string; + /** + * The storage resourceId for the bot + */ + storageResourceId?: string; /** * List of Private Endpoint Connections configured for the bot * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -249,6 +288,15 @@ export interface BotProperties { * The hint (e.g. keyVault secret resourceId) on how to fetch the app secret */ appPasswordHint?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Publishing credentials of the resource + */ + publishingCredentials?: string; } /** @@ -274,6 +322,125 @@ export interface Channel { * Polymorphic Discriminator */ channelName: "Channel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; +} + +/** + * A site for the channel + */ +export interface Site { + /** + * Site Id + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly siteId?: string; + /** + * Site name + */ + siteName: string; + /** + * Primary key. Value only returned through POST to the action Channel List API, otherwise empty. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly key?: string; + /** + * Secondary key. Value only returned through POST to the action Channel List API, otherwise + * empty. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly key2?: string; + /** + * Whether this site is enabled for DirectLine channel + */ + isEnabled: boolean; + /** + * Whether this site is enabled for preview versions of Webchat + */ + isWebchatPreviewEnabled: boolean; + /** + * Whether this site is enabled for Bot Framework V1 protocol. + */ + isV1Enabled: boolean; + /** + * Whether this site is enabled for Bot Framework V1 protocol. + */ + isV3Enabled: boolean; + /** + * Whether this site is enabled for authentication with Bot Framework. + */ + isSecureSiteEnabled?: boolean; + /** + * Whether this site is enabled for block user upload. + */ + isBlockUserUploadEnabled?: boolean; + /** + * List of Trusted Origin URLs for this site. This field is applicable only if + * isSecureSiteEnabled is True. + */ + trustedOrigins?: string[]; + /** + * Whether this site is token enabled for channel + */ + isTokenEnabled?: boolean; + /** + * Entity Tag + */ + eTag?: string; +} + +/** + * Channel settings definition + */ +export interface ChannelSettings { + /** + * The extensionKey1 + */ + extensionKey1?: string; + /** + * The extensionKey2 + */ + extensionKey2?: string; + /** + * The list of sites + */ + sites?: Site[]; + /** + * The channel id + */ + channelId?: string; + /** + * The channel display name + */ + channelDisplayName?: string; + /** + * The bot id + */ + botId?: string; + /** + * The bot icon url + */ + botIconUrl?: string; + /** + * Whether this channel is enabled for the bot + */ + isEnabled?: boolean; + /** + * Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for + * authentication. + */ + disableLocalAuth?: boolean; } /** @@ -286,6 +453,20 @@ export interface BotChannel extends Resource { properties?: ChannelUnion; } +/** + * The ARM channel of list channel with keys operation response. + */ +export interface ListChannelWithKeysResponse extends BotChannel { + /** + * The set of properties specific to bot channel resource + */ + resource?: ChannelUnion; + /** + * Channel settings + */ + setting?: ChannelSettings; +} + /** * The parameters to provide for the Alexa channel. */ @@ -318,6 +499,19 @@ export interface AlexaChannel { * Polymorphic Discriminator */ channelName: "AlexaChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Alexa channel resource */ @@ -381,6 +575,19 @@ export interface FacebookChannel { * Polymorphic Discriminator */ channelName: "FacebookChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to bot facebook channel */ @@ -414,6 +621,19 @@ export interface EmailChannel { * Polymorphic Discriminator */ channelName: "EmailChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to email channel resource */ @@ -436,6 +656,18 @@ export interface MsTeamsChannelProperties { * Whether this channel is enabled for the bot */ isEnabled: boolean; + /** + * Webhook for Microsoft Teams channel calls + */ + incomingCallRoute?: string; + /** + * Deployment environment for Microsoft Teams channel calls + */ + deploymentEnvironment?: string; + /** + * Whether this channel accepted terms + */ + acceptedTerms?: boolean; } /** @@ -446,6 +678,19 @@ export interface MsTeamsChannel { * Polymorphic Discriminator */ channelName: "MsTeamsChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Microsoft Teams channel resource */ @@ -488,6 +733,10 @@ export interface SkypeChannelProperties { * Calling web hook for Skype channel */ callingWebHook?: string; + /** + * Incoming call route for Skype channel + */ + incomingCallRoute?: string; /** * Whether this channel is enabled for the bot */ @@ -502,6 +751,19 @@ export interface SkypeChannel { * Polymorphic Discriminator */ channelName: "SkypeChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Skype channel resource */ @@ -538,6 +800,19 @@ export interface KikChannel { * Polymorphic Discriminator */ channelName: "KikChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Kik channel resource */ @@ -575,7 +850,7 @@ export interface WebChatSite { /** * Whether this site is enabled for preview versions of Webchat */ - enablePreview: boolean; + isWebchatPreviewEnabled: boolean; } /** @@ -601,6 +876,19 @@ export interface WebChatChannel { * Polymorphic Discriminator */ channelName: "WebChatChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Web Chat channel resource */ @@ -647,6 +935,10 @@ export interface DirectLineSite { * Whether this site is enabled for authentication with Bot Framework. */ isSecureSiteEnabled?: boolean; + /** + * Whether this site is enabled for block user upload. + */ + isBlockUserUploadEnabled?: boolean; /** * List of Trusted Origin URLs for this site. This field is applicable only if * isSecureSiteEnabled is True. @@ -662,6 +954,10 @@ export interface DirectLineChannelProperties { * The list of Direct Line sites */ sites?: DirectLineSite[]; + /** + * Direct Line embed code of the resource + */ + directLineEmbedCode?: string; } /** @@ -672,6 +968,19 @@ export interface DirectLineChannel { * Polymorphic Discriminator */ channelName: "DirectLineChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Direct Line channel resource */ @@ -705,6 +1014,19 @@ export interface TelegramChannel { * Polymorphic Discriminator */ channelName: "TelegramChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Telegram channel resource */ @@ -747,6 +1069,19 @@ export interface SmsChannel { * Polymorphic Discriminator */ channelName: "SmsChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Sms channel resource */ @@ -817,6 +1152,19 @@ export interface SlackChannel { * Polymorphic Discriminator */ channelName: "SlackChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to Slack channel resource */ @@ -870,6 +1218,19 @@ export interface LineChannel { * Polymorphic Discriminator */ channelName: "LineChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to line channel resource */ @@ -914,6 +1275,19 @@ export interface DirectLineSpeechChannel { * Polymorphic Discriminator */ channelName: "DirectLineSpeechChannel"; + /** + * Entity Tag of the resource + */ + etag?: string; + /** + * Provisioning state of the resource + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: string; + /** + * Specifies the location of the resource. + */ + location?: string; /** * The set of properties specific to DirectLine Speech channel resource */ @@ -965,6 +1339,14 @@ export interface ConnectionSettingParameter { * Properties for a Connection Setting Item */ export interface ConnectionSettingProperties { + /** + * Id associated with the Connection Setting. + */ + id?: string; + /** + * Name associated with the Connection Setting. + */ + name?: string; /** * Client Id associated with the Connection Setting. */ @@ -994,6 +1376,10 @@ export interface ConnectionSettingProperties { * Service Provider Parameters associated with the Connection Setting */ parameters?: ConnectionSettingParameter[]; + /** + * Provisioning state of the resource + */ + provisioningState?: string; } /** @@ -1006,6 +1392,26 @@ export interface ConnectionSetting extends Resource { properties?: ConnectionSettingProperties; } +/** + * the constraints of the bot meta data. + */ +export interface ServiceProviderParameterMetadataConstraints { + /** + * Whether required the constraints of the bot meta data. + */ + required?: boolean; +} + +/** + * Meta data for the Service Provider + */ +export interface ServiceProviderParameterMetadata { + /** + * the constraints of the bot meta data. + */ + constraints?: ServiceProviderParameterMetadataConstraints; +} + /** * Extra Parameters specific to each Service Provider */ @@ -1040,6 +1446,11 @@ export interface ServiceProviderParameter { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly default?: string; + /** + * Meta data for the Service Provider + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly metadata?: ServiceProviderParameterMetadata; } /** @@ -1452,6 +1863,14 @@ export type Kind = 'sdk' | 'designer' | 'bot' | 'function' | 'azurebot'; */ export type MsaAppType = 'UserAssignedMSI' | 'SingleTenant' | 'MultiTenant'; +/** + * Defines values for PublicNetworkAccess. + * Possible values include: 'Enabled', 'Disabled' + * @readonly + * @enum {string} + */ +export type PublicNetworkAccess = 'Enabled' | 'Disabled'; + /** * Defines values for PrivateEndpointServiceConnectionStatus. * Possible values include: 'Pending', 'Approved', 'Rejected' @@ -1725,7 +2144,7 @@ export type ChannelsGetResponse = BotChannel & { /** * Contains response data for the listWithKeys operation. */ -export type ChannelsListWithKeysResponse = BotChannel & { +export type ChannelsListWithKeysResponse = ListChannelWithKeysResponse & { /** * The underlying HTTP response. */ @@ -1738,7 +2157,7 @@ export type ChannelsListWithKeysResponse = BotChannel & { /** * The response body as parsed JSON or XML */ - parsedBody: BotChannel; + parsedBody: ListChannelWithKeysResponse; }; }; diff --git a/sdk/botservice/arm-botservice/src/models/mappers.ts b/sdk/botservice/arm-botservice/src/models/mappers.ts index b10b359beadc..5e1ba444bdba 100644 --- a/sdk/botservice/arm-botservice/src/models/mappers.ts +++ b/sdk/botservice/arm-botservice/src/models/mappers.ts @@ -98,6 +98,18 @@ export const Resource: msRest.CompositeMapper = { type: { name: "String" } + }, + zones: { + readOnly: true, + serializedName: "zones", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } } } } @@ -250,6 +262,34 @@ export const BotProperties: msRest.CompositeMapper = { name: "String" } }, + allSettings: { + serializedName: "allSettings", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + parameters: { + serializedName: "parameters", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + manifestUrl: { + serializedName: "manifestUrl", + type: { + name: "String" + } + }, msaAppType: { serializedName: "msaAppType", type: { @@ -346,12 +386,38 @@ export const BotProperties: msRest.CompositeMapper = { name: "String" } }, - isIsolated: { - serializedName: "isIsolated", + cmekEncryptionStatus: { + serializedName: "cmekEncryptionStatus", + type: { + name: "String" + } + }, + publicNetworkAccess: { + serializedName: "publicNetworkAccess", + defaultValue: 'Enabled', + type: { + name: "String" + } + }, + isStreamingSupported: { + serializedName: "isStreamingSupported", + type: { + name: "Boolean" + } + }, + isDeveloperAppInsightsApiKeySet: { + serializedName: "isDeveloperAppInsightsApiKeySet", type: { name: "Boolean" } }, + migrationToken: { + readOnly: true, + serializedName: "migrationToken", + type: { + name: "String" + } + }, disableLocalAuth: { serializedName: "disableLocalAuth", type: { @@ -364,6 +430,12 @@ export const BotProperties: msRest.CompositeMapper = { name: "String" } }, + storageResourceId: { + serializedName: "storageResourceId", + type: { + name: "String" + } + }, privateEndpointConnections: { readOnly: true, serializedName: "privateEndpointConnections", @@ -388,6 +460,19 @@ export const BotProperties: msRest.CompositeMapper = { type: { name: "String" } + }, + provisioningState: { + readOnly: true, + serializedName: "provisioningState", + type: { + name: "String" + } + }, + publishingCredentials: { + serializedName: "publishingCredentials", + type: { + name: "String" + } } } } @@ -422,6 +507,25 @@ export const Channel: msRest.CompositeMapper = { uberParent: "Channel", className: "Channel", modelProperties: { + etag: { + serializedName: "etag", + type: { + name: "String" + } + }, + provisioningState: { + readOnly: true, + serializedName: "provisioningState", + type: { + name: "String" + } + }, + location: { + serializedName: "location", + type: { + name: "String" + } + }, channelName: { required: true, serializedName: "channelName", @@ -433,6 +537,177 @@ export const Channel: msRest.CompositeMapper = { } }; +export const Site: msRest.CompositeMapper = { + serializedName: "Site", + type: { + name: "Composite", + className: "Site", + modelProperties: { + siteId: { + readOnly: true, + serializedName: "siteId", + type: { + name: "String" + } + }, + siteName: { + required: true, + serializedName: "siteName", + type: { + name: "String" + } + }, + key: { + readOnly: true, + serializedName: "key", + type: { + name: "String" + } + }, + key2: { + readOnly: true, + serializedName: "key2", + type: { + name: "String" + } + }, + isEnabled: { + required: true, + serializedName: "isEnabled", + type: { + name: "Boolean" + } + }, + isWebchatPreviewEnabled: { + required: true, + serializedName: "isWebchatPreviewEnabled", + type: { + name: "Boolean" + } + }, + isV1Enabled: { + required: true, + serializedName: "isV1Enabled", + type: { + name: "Boolean" + } + }, + isV3Enabled: { + required: true, + serializedName: "isV3Enabled", + type: { + name: "Boolean" + } + }, + isSecureSiteEnabled: { + serializedName: "isSecureSiteEnabled", + type: { + name: "Boolean" + } + }, + isBlockUserUploadEnabled: { + serializedName: "isBlockUserUploadEnabled", + type: { + name: "Boolean" + } + }, + trustedOrigins: { + serializedName: "trustedOrigins", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + isTokenEnabled: { + serializedName: "isTokenEnabled", + type: { + name: "Boolean" + } + }, + eTag: { + serializedName: "eTag", + type: { + name: "String" + } + } + } + } +}; + +export const ChannelSettings: msRest.CompositeMapper = { + serializedName: "ChannelSettings", + type: { + name: "Composite", + className: "ChannelSettings", + modelProperties: { + extensionKey1: { + serializedName: "extensionKey1", + type: { + name: "String" + } + }, + extensionKey2: { + serializedName: "extensionKey2", + type: { + name: "String" + } + }, + sites: { + serializedName: "sites", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "Site" + } + } + } + }, + channelId: { + serializedName: "channelId", + type: { + name: "String" + } + }, + channelDisplayName: { + serializedName: "channelDisplayName", + type: { + name: "String" + } + }, + botId: { + serializedName: "botId", + type: { + name: "String" + } + }, + botIconUrl: { + serializedName: "botIconUrl", + type: { + name: "String" + } + }, + isEnabled: { + serializedName: "isEnabled", + type: { + name: "Boolean" + } + }, + disableLocalAuth: { + serializedName: "disableLocalAuth", + type: { + name: "Boolean" + } + } + } + } +}; + export const BotChannel: msRest.CompositeMapper = { serializedName: "BotChannel", type: { @@ -451,6 +726,31 @@ export const BotChannel: msRest.CompositeMapper = { } }; +export const ListChannelWithKeysResponse: msRest.CompositeMapper = { + serializedName: "ListChannelWithKeysResponse", + type: { + name: "Composite", + className: "ListChannelWithKeysResponse", + modelProperties: { + ...BotChannel.type.modelProperties, + resource: { + serializedName: "resource", + type: { + name: "Composite", + className: "Channel" + } + }, + setting: { + serializedName: "setting", + type: { + name: "Composite", + className: "ChannelSettings" + } + } + } + } +}; + export const AlexaChannelProperties: msRest.CompositeMapper = { serializedName: "AlexaChannelProperties", type: { @@ -682,6 +982,24 @@ export const MsTeamsChannelProperties: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + incomingCallRoute: { + serializedName: "incomingCallRoute", + type: { + name: "String" + } + }, + deploymentEnvironment: { + serializedName: "deploymentEnvironment", + type: { + name: "String" + } + }, + acceptedTerms: { + serializedName: "acceptedTerms", + type: { + name: "Boolean" + } } } } @@ -761,6 +1079,12 @@ export const SkypeChannelProperties: msRest.CompositeMapper = { name: "String" } }, + incomingCallRoute: { + serializedName: "incomingCallRoute", + type: { + name: "String" + } + }, isEnabled: { required: true, serializedName: "isEnabled", @@ -889,9 +1213,9 @@ export const WebChatSite: msRest.CompositeMapper = { name: "Boolean" } }, - enablePreview: { + isWebchatPreviewEnabled: { required: true, - serializedName: "enablePreview", + serializedName: "isWebchatPreviewEnabled", type: { name: "Boolean" } @@ -1010,6 +1334,12 @@ export const DirectLineSite: msRest.CompositeMapper = { name: "Boolean" } }, + isBlockUserUploadEnabled: { + serializedName: "isBlockUserUploadEnabled", + type: { + name: "Boolean" + } + }, trustedOrigins: { serializedName: "trustedOrigins", type: { @@ -1042,6 +1372,12 @@ export const DirectLineChannelProperties: msRest.CompositeMapper = { } } } + }, + directLineEmbedCode: { + serializedName: "DirectLineEmbedCode", + type: { + name: "String" + } } } } @@ -1238,7 +1574,7 @@ export const SlackChannelProperties: msRest.CompositeMapper = { }, isValidated: { readOnly: true, - serializedName: "isValidated", + serializedName: "IsValidated", type: { name: "Boolean" } @@ -1507,6 +1843,18 @@ export const ConnectionSettingProperties: msRest.CompositeMapper = { name: "Composite", className: "ConnectionSettingProperties", modelProperties: { + id: { + serializedName: "id", + type: { + name: "String" + } + }, + name: { + serializedName: "name", + type: { + name: "String" + } + }, clientId: { serializedName: "clientId", type: { @@ -1555,6 +1903,12 @@ export const ConnectionSettingProperties: msRest.CompositeMapper = { } } } + }, + provisioningState: { + serializedName: "provisioningState", + type: { + name: "String" + } } } } @@ -1578,6 +1932,39 @@ export const ConnectionSetting: msRest.CompositeMapper = { } }; +export const ServiceProviderParameterMetadataConstraints: msRest.CompositeMapper = { + serializedName: "ServiceProviderParameter_metadata_constraints", + type: { + name: "Composite", + className: "ServiceProviderParameterMetadataConstraints", + modelProperties: { + required: { + serializedName: "required", + type: { + name: "Boolean" + } + } + } + } +}; + +export const ServiceProviderParameterMetadata: msRest.CompositeMapper = { + serializedName: "ServiceProviderParameter_metadata", + type: { + name: "Composite", + className: "ServiceProviderParameterMetadata", + modelProperties: { + constraints: { + serializedName: "constraints", + type: { + name: "Composite", + className: "ServiceProviderParameterMetadataConstraints" + } + } + } + } +}; + export const ServiceProviderParameter: msRest.CompositeMapper = { serializedName: "ServiceProviderParameter", type: { @@ -1625,6 +2012,14 @@ export const ServiceProviderParameter: msRest.CompositeMapper = { type: { name: "String" } + }, + metadata: { + readOnly: true, + serializedName: "metadata", + type: { + name: "Composite", + className: "ServiceProviderParameterMetadata" + } } } } diff --git a/sdk/botservice/arm-botservice/src/models/privateEndpointConnectionsMappers.ts b/sdk/botservice/arm-botservice/src/models/privateEndpointConnectionsMappers.ts index 6fac607c936d..1e245b9928cb 100644 --- a/sdk/botservice/arm-botservice/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/privateEndpointConnectionsMappers.ts @@ -15,6 +15,7 @@ export { BotChannel, BotProperties, Channel, + ChannelSettings, ConnectionSetting, ConnectionSettingParameter, ConnectionSettingProperties, @@ -35,6 +36,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -44,6 +46,7 @@ export { PrivateLinkResourceBase, PrivateLinkServiceConnectionState, Resource, + Site, Sku, SkypeChannel, SkypeChannelProperties, diff --git a/sdk/botservice/arm-botservice/src/models/privateLinkResourcesMappers.ts b/sdk/botservice/arm-botservice/src/models/privateLinkResourcesMappers.ts index 9dee334e7d09..a09e71c03132 100644 --- a/sdk/botservice/arm-botservice/src/models/privateLinkResourcesMappers.ts +++ b/sdk/botservice/arm-botservice/src/models/privateLinkResourcesMappers.ts @@ -15,6 +15,7 @@ export { BotChannel, BotProperties, Channel, + ChannelSettings, ConnectionSetting, ConnectionSettingParameter, ConnectionSettingProperties, @@ -35,6 +36,7 @@ export { LineChannel, LineChannelProperties, LineRegistration, + ListChannelWithKeysResponse, MsTeamsChannel, MsTeamsChannelProperties, PrivateEndpoint, @@ -44,6 +46,7 @@ export { PrivateLinkResourceListResult, PrivateLinkServiceConnectionState, Resource, + Site, Sku, SkypeChannel, SkypeChannelProperties, diff --git a/sdk/botservice/arm-botservice/src/operations/channels.ts b/sdk/botservice/arm-botservice/src/operations/channels.ts index 566ccb3119c8..5808983f82bb 100644 --- a/sdk/botservice/arm-botservice/src/operations/channels.ts +++ b/sdk/botservice/arm-botservice/src/operations/channels.ts @@ -212,7 +212,7 @@ export class Channels { * 'LineChannel', 'DirectLineSpeechChannel' * @param callback The callback */ - listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, callback: msRest.ServiceCallback): void; + listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the Bot resource group in the user subscription. * @param resourceName The name of the Bot resource. @@ -223,8 +223,8 @@ export class Channels { * @param options The optional parameters * @param callback The callback */ - listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listWithKeys(resourceGroupName: string, resourceName: string, channelName: Models.ChannelName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -464,7 +464,7 @@ const listWithKeysOperationSpec: msRest.OperationSpec = { ], responses: { 200: { - bodyMapper: Mappers.BotChannel + bodyMapper: Mappers.ListChannelWithKeysResponse }, default: { bodyMapper: Mappers.ErrorModel