From f9c3c2645a73cca799c4448e657b052d9f8b917e Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 24 May 2022 08:57:49 +0000 Subject: [PATCH] CodeGen from PR 19105 in Azure/azure-rest-api-specs [BotService] Update Slack property (#19105) * Add blockchain to latest profile * Add additional types * update slack property Co-authored-by: Mark Cowlishaw --- .../mgmt/2021-03-01/botservice/CHANGELOG.md | 128 +++- .../mgmt/2021-03-01/botservice/_meta.json | 2 +- .../botservice/botserviceapi/interfaces.go | 2 +- .../mgmt/2021-03-01/botservice/channels.go | 4 +- .../mgmt/2021-03-01/botservice/enums.go | 32 + .../mgmt/2021-03-01/botservice/models.go | 619 +++++++++++++++++- .../mgmt/2017-12-01/botservice/CHANGELOG.md | 2 +- .../mgmt/2017-12-01/botservice/_meta.json | 2 +- .../mgmt/2018-07-12/botservice/CHANGELOG.md | 2 +- .../mgmt/2018-07-12/botservice/_meta.json | 2 +- .../botservice/CHANGELOG.md | 15 +- .../2021-05-01-preview/botservice/_meta.json | 2 +- .../2021-05-01-preview/botservice/models.go | 5 +- 13 files changed, 784 insertions(+), 33 deletions(-) diff --git a/services/botservice/mgmt/2021-03-01/botservice/CHANGELOG.md b/services/botservice/mgmt/2021-03-01/botservice/CHANGELOG.md index 52911e4cc5e4..e0ade9880a19 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/CHANGELOG.md +++ b/services/botservice/mgmt/2021-03-01/botservice/CHANGELOG.md @@ -1,2 +1,128 @@ -# Change History +# Unreleased +## Breaking Changes + +### Struct Changes + +#### Removed Struct Fields + +1. BotProperties.IsIsolated +1. WebChatSite.EnablePreview + +### Signature Changes + +#### Funcs + +1. ChannelsClient.ListWithKeys + - Returns + - From: BotChannel, error + - To: ListChannelWithKeysResponse, error +1. ChannelsClient.ListWithKeysResponder + - Returns + - From: BotChannel, error + - To: ListChannelWithKeysResponse, error + +## Additive Changes + +### New Constants + +1. MsaAppType.MsaAppTypeMultiTenant +1. MsaAppType.MsaAppTypeSingleTenant +1. MsaAppType.MsaAppTypeUserAssignedMSI +1. PublicNetworkAccess.PublicNetworkAccessDisabled +1. PublicNetworkAccess.PublicNetworkAccessEnabled + +### New Funcs + +1. *ListChannelWithKeysResponse.UnmarshalJSON([]byte) error +1. ListChannelWithKeysResponse.MarshalJSON() ([]byte, error) +1. PossibleMsaAppTypeValues() []MsaAppType +1. PossiblePublicNetworkAccessValues() []PublicNetworkAccess +1. Site.MarshalJSON() ([]byte, error) + +### Struct Changes + +#### New Structs + +1. ChannelSettings +1. ListChannelWithKeysResponse +1. ServiceProviderParameterMetadata +1. ServiceProviderParameterMetadataConstraints +1. Site + +#### New Struct Fields + +1. AlexaChannel.Etag +1. AlexaChannel.Location +1. AlexaChannel.ProvisioningState +1. Bot.Zones +1. BotChannel.Zones +1. BotProperties.AllSettings +1. BotProperties.AppPasswordHint +1. BotProperties.CmekEncryptionStatus +1. BotProperties.DisableLocalAuth +1. BotProperties.IsDeveloperAppInsightsAPIKeySet +1. BotProperties.IsStreamingSupported +1. BotProperties.ManifestURL +1. BotProperties.MigrationToken +1. BotProperties.MsaAppMSIResourceID +1. BotProperties.MsaAppTenantID +1. BotProperties.MsaAppType +1. BotProperties.OpenWithHint +1. BotProperties.Parameters +1. BotProperties.ProvisioningState +1. BotProperties.PublicNetworkAccess +1. BotProperties.PublishingCredentials +1. BotProperties.StorageResourceID +1. Channel.Etag +1. Channel.Location +1. Channel.ProvisioningState +1. ConnectionSetting.Zones +1. ConnectionSettingProperties.ID +1. ConnectionSettingProperties.Name +1. ConnectionSettingProperties.ProvisioningState +1. DirectLineChannel.Etag +1. DirectLineChannel.Location +1. DirectLineChannel.ProvisioningState +1. DirectLineChannelProperties.DirectLineEmbedCode +1. DirectLineSite.IsBlockUserUploadEnabled +1. DirectLineSpeechChannel.Etag +1. DirectLineSpeechChannel.Location +1. DirectLineSpeechChannel.ProvisioningState +1. EmailChannel.Etag +1. EmailChannel.Location +1. EmailChannel.ProvisioningState +1. FacebookChannel.Etag +1. FacebookChannel.Location +1. FacebookChannel.ProvisioningState +1. KikChannel.Etag +1. KikChannel.Location +1. KikChannel.ProvisioningState +1. LineChannel.Etag +1. LineChannel.Location +1. LineChannel.ProvisioningState +1. MsTeamsChannel.Etag +1. MsTeamsChannel.Location +1. MsTeamsChannel.ProvisioningState +1. MsTeamsChannelProperties.AcceptedTerms +1. MsTeamsChannelProperties.DeploymentEnvironment +1. MsTeamsChannelProperties.IncomingCallRoute +1. Resource.Zones +1. ServiceProviderParameter.Metadata +1. SkypeChannel.Etag +1. SkypeChannel.Location +1. SkypeChannel.ProvisioningState +1. SkypeChannelProperties.IncomingCallRoute +1. SlackChannel.Etag +1. SlackChannel.Location +1. SlackChannel.ProvisioningState +1. SmsChannel.Etag +1. SmsChannel.Location +1. SmsChannel.ProvisioningState +1. TelegramChannel.Etag +1. TelegramChannel.Location +1. TelegramChannel.ProvisioningState +1. WebChatChannel.Etag +1. WebChatChannel.Location +1. WebChatChannel.ProvisioningState +1. WebChatSite.IsWebchatPreviewEnabled diff --git a/services/botservice/mgmt/2021-03-01/botservice/_meta.json b/services/botservice/mgmt/2021-03-01/botservice/_meta.json index 20585b4cf012..65f4d24f79bd 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/_meta.json +++ b/services/botservice/mgmt/2021-03-01/botservice/_meta.json @@ -1,5 +1,5 @@ { - "commit": "e6ee3d4f6a29f081eddada399bd1cb373133af02", + "commit": "0ea2274010bb36b78d04d49b460cb6349ef62780", "readme": "/_/azure-rest-api-specs/specification/botservice/resource-manager/readme.md", "tag": "package-2021-03-01", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/botservice/mgmt/2021-03-01/botservice/botserviceapi/interfaces.go b/services/botservice/mgmt/2021-03-01/botservice/botserviceapi/interfaces.go index 1e8b1b01957b..20746d983d17 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/botserviceapi/interfaces.go +++ b/services/botservice/mgmt/2021-03-01/botservice/botserviceapi/interfaces.go @@ -34,7 +34,7 @@ type ChannelsClientAPI interface { Get(ctx context.Context, resourceGroupName string, resourceName string, channelName string) (result botservice.BotChannel, err error) ListByResourceGroup(ctx context.Context, resourceGroupName string, resourceName string) (result botservice.ChannelResponseListPage, err error) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, resourceName string) (result botservice.ChannelResponseListIterator, err error) - ListWithKeys(ctx context.Context, resourceGroupName string, resourceName string, channelName botservice.ChannelName) (result botservice.BotChannel, err error) + ListWithKeys(ctx context.Context, resourceGroupName string, resourceName string, channelName botservice.ChannelName) (result botservice.ListChannelWithKeysResponse, err error) Update(ctx context.Context, resourceGroupName string, resourceName string, channelName botservice.ChannelName, parameters botservice.BotChannel) (result botservice.BotChannel, err error) } diff --git a/services/botservice/mgmt/2021-03-01/botservice/channels.go b/services/botservice/mgmt/2021-03-01/botservice/channels.go index 729c76d49c3d..d70077ba60e1 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/channels.go +++ b/services/botservice/mgmt/2021-03-01/botservice/channels.go @@ -446,7 +446,7 @@ func (client ChannelsClient) ListByResourceGroupComplete(ctx context.Context, re // resourceGroupName - the name of the Bot resource group in the user subscription. // resourceName - the name of the Bot resource. // channelName - the name of the Channel resource. -func (client ChannelsClient) ListWithKeys(ctx context.Context, resourceGroupName string, resourceName string, channelName ChannelName) (result BotChannel, err error) { +func (client ChannelsClient) ListWithKeys(ctx context.Context, resourceGroupName string, resourceName string, channelName ChannelName) (result ListChannelWithKeysResponse, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ChannelsClient.ListWithKeys") defer func() { @@ -521,7 +521,7 @@ func (client ChannelsClient) ListWithKeysSender(req *http.Request) (*http.Respon // ListWithKeysResponder handles the response to the ListWithKeys request. The method always // closes the http.Response Body. -func (client ChannelsClient) ListWithKeysResponder(resp *http.Response) (result BotChannel, err error) { +func (client ChannelsClient) ListWithKeysResponder(resp *http.Response) (result ListChannelWithKeysResponse, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), diff --git a/services/botservice/mgmt/2021-03-01/botservice/enums.go b/services/botservice/mgmt/2021-03-01/botservice/enums.go index 45d3754d325e..fd65262606df 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/enums.go +++ b/services/botservice/mgmt/2021-03-01/botservice/enums.go @@ -118,6 +118,38 @@ func PossibleKindValues() []Kind { return []Kind{KindAzurebot, KindBot, KindDesigner, KindFunction, KindSdk} } +// MsaAppType enumerates the values for msa app type. +type MsaAppType string + +const ( + // MsaAppTypeMultiTenant ... + MsaAppTypeMultiTenant MsaAppType = "MultiTenant" + // MsaAppTypeSingleTenant ... + MsaAppTypeSingleTenant MsaAppType = "SingleTenant" + // MsaAppTypeUserAssignedMSI ... + MsaAppTypeUserAssignedMSI MsaAppType = "UserAssignedMSI" +) + +// PossibleMsaAppTypeValues returns an array of possible values for the MsaAppType const type. +func PossibleMsaAppTypeValues() []MsaAppType { + return []MsaAppType{MsaAppTypeMultiTenant, MsaAppTypeSingleTenant, MsaAppTypeUserAssignedMSI} +} + +// PublicNetworkAccess enumerates the values for public network access. +type PublicNetworkAccess string + +const ( + // PublicNetworkAccessDisabled ... + PublicNetworkAccessDisabled PublicNetworkAccess = "Disabled" + // PublicNetworkAccessEnabled ... + PublicNetworkAccessEnabled PublicNetworkAccess = "Enabled" +) + +// PossiblePublicNetworkAccessValues returns an array of possible values for the PublicNetworkAccess const type. +func PossiblePublicNetworkAccessValues() []PublicNetworkAccess { + return []PublicNetworkAccess{PublicNetworkAccessDisabled, PublicNetworkAccessEnabled} +} + // RegenerateKeysChannelName enumerates the values for regenerate keys channel name. type RegenerateKeysChannelName string diff --git a/services/botservice/mgmt/2021-03-01/botservice/models.go b/services/botservice/mgmt/2021-03-01/botservice/models.go index 7384a0da5e7a..6d03b418b661 100644 --- a/services/botservice/mgmt/2021-03-01/botservice/models.go +++ b/services/botservice/mgmt/2021-03-01/botservice/models.go @@ -22,6 +22,12 @@ const fqdn = "github.com/Azure/azure-sdk-for-go/services/botservice/mgmt/2021-03 type AlexaChannel struct { // Properties - The set of properties specific to Alexa channel resource Properties *AlexaChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -33,6 +39,12 @@ func (ac AlexaChannel) MarshalJSON() ([]byte, error) { if ac.Properties != nil { objectMap["properties"] = ac.Properties } + if ac.Etag != nil { + objectMap["etag"] = ac.Etag + } + if ac.Location != nil { + objectMap["location"] = ac.Location + } if ac.ChannelName != "" { objectMap["channelName"] = ac.ChannelName } @@ -159,6 +171,8 @@ type Bot struct { Kind Kind `json:"kind,omitempty"` // Etag - Entity Tag Etag *string `json:"etag,omitempty"` + // Zones - READ-ONLY; Entity zones + Zones *[]string `json:"zones,omitempty"` } // MarshalJSON is the custom marshaler for Bot. @@ -206,6 +220,8 @@ type BotChannel struct { Kind Kind `json:"kind,omitempty"` // Etag - Entity Tag Etag *string `json:"etag,omitempty"` + // Zones - READ-ONLY; Entity zones + Zones *[]string `json:"zones,omitempty"` } // MarshalJSON is the custom marshaler for BotChannel. @@ -319,6 +335,15 @@ func (bc *BotChannel) UnmarshalJSON(body []byte) error { } bc.Etag = &etag } + case "zones": + if v != nil { + var zones []string + err = json.Unmarshal(*v, &zones) + if err != nil { + return err + } + bc.Zones = &zones + } } } @@ -337,8 +362,20 @@ type BotProperties struct { Endpoint *string `json:"endpoint,omitempty"` // EndpointVersion - READ-ONLY; The bot's endpoint version EndpointVersion *string `json:"endpointVersion,omitempty"` + // AllSettings - Contains resource all settings defined as key/value pairs. + AllSettings map[string]*string `json:"allSettings"` + // Parameters - Contains resource parameters defined as key/value pairs. + Parameters map[string]*string `json:"parameters"` + // ManifestURL - The bot's manifest url + ManifestURL *string `json:"manifestUrl,omitempty"` + // MsaAppType - Microsoft App Type for the bot. Possible values include: 'MsaAppTypeUserAssignedMSI', 'MsaAppTypeSingleTenant', 'MsaAppTypeMultiTenant' + MsaAppType MsaAppType `json:"msaAppType,omitempty"` // MsaAppID - Microsoft App Id for the bot MsaAppID *string `json:"msaAppId,omitempty"` + // MsaAppTenantID - Microsoft App Tenant Id for the bot + MsaAppTenantID *string `json:"msaAppTenantId,omitempty"` + // MsaAppMSIResourceID - Microsoft App Managed Identity Resource Id for the bot + MsaAppMSIResourceID *string `json:"msaAppMSIResourceId,omitempty"` // ConfiguredChannels - READ-ONLY; Collection of channels for which the bot is configured ConfiguredChannels *[]string `json:"configuredChannels,omitempty"` // EnabledChannels - READ-ONLY; Collection of channels for which the bot is enabled @@ -357,10 +394,30 @@ type BotProperties struct { IsCmekEnabled *bool `json:"isCmekEnabled,omitempty"` // CmekKeyVaultURL - The CMK Url CmekKeyVaultURL *string `json:"cmekKeyVaultUrl,omitempty"` - // IsIsolated - Whether the bot is in an isolated network - IsIsolated *bool `json:"isIsolated,omitempty"` + // CmekEncryptionStatus - READ-ONLY; The CMK encryption status + CmekEncryptionStatus *string `json:"cmekEncryptionStatus,omitempty"` + // PublicNetworkAccess - Whether the bot is in an isolated network. Possible values include: 'PublicNetworkAccessEnabled', 'PublicNetworkAccessDisabled' + PublicNetworkAccess PublicNetworkAccess `json:"publicNetworkAccess,omitempty"` + // IsStreamingSupported - Whether the bot is streaming supported + IsStreamingSupported *bool `json:"isStreamingSupported,omitempty"` + // IsDeveloperAppInsightsAPIKeySet - READ-ONLY; Whether the bot is developerAppInsightsApiKey set + IsDeveloperAppInsightsAPIKeySet *bool `json:"isDeveloperAppInsightsApiKeySet,omitempty"` + // MigrationToken - READ-ONLY; Token used to migrate non Azure bot to azure subscription + MigrationToken *string `json:"migrationToken,omitempty"` + // DisableLocalAuth - Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication. + DisableLocalAuth *bool `json:"disableLocalAuth,omitempty"` // SchemaTransformationVersion - The channel schema transformation version for the bot SchemaTransformationVersion *string `json:"schemaTransformationVersion,omitempty"` + // StorageResourceID - The storage resourceId for the bot + StorageResourceID *string `json:"storageResourceId,omitempty"` + // OpenWithHint - The hint to browser (e.g. protocol handler) on how to open the bot for authoring + OpenWithHint *string `json:"openWithHint,omitempty"` + // AppPasswordHint - The hint (e.g. keyVault secret resourceId) on how to fetch the app secret + AppPasswordHint *string `json:"appPasswordHint,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // PublishingCredentials - Publishing credentials of the resource + PublishingCredentials *string `json:"publishingCredentials,omitempty"` } // MarshalJSON is the custom marshaler for BotProperties. @@ -378,9 +435,27 @@ func (bp BotProperties) MarshalJSON() ([]byte, error) { if bp.Endpoint != nil { objectMap["endpoint"] = bp.Endpoint } + if bp.AllSettings != nil { + objectMap["allSettings"] = bp.AllSettings + } + if bp.Parameters != nil { + objectMap["parameters"] = bp.Parameters + } + if bp.ManifestURL != nil { + objectMap["manifestUrl"] = bp.ManifestURL + } + if bp.MsaAppType != "" { + objectMap["msaAppType"] = bp.MsaAppType + } if bp.MsaAppID != nil { objectMap["msaAppId"] = bp.MsaAppID } + if bp.MsaAppTenantID != nil { + objectMap["msaAppTenantId"] = bp.MsaAppTenantID + } + if bp.MsaAppMSIResourceID != nil { + objectMap["msaAppMSIResourceId"] = bp.MsaAppMSIResourceID + } if bp.DeveloperAppInsightKey != nil { objectMap["developerAppInsightKey"] = bp.DeveloperAppInsightKey } @@ -402,12 +477,30 @@ func (bp BotProperties) MarshalJSON() ([]byte, error) { if bp.CmekKeyVaultURL != nil { objectMap["cmekKeyVaultUrl"] = bp.CmekKeyVaultURL } - if bp.IsIsolated != nil { - objectMap["isIsolated"] = bp.IsIsolated + if bp.PublicNetworkAccess != "" { + objectMap["publicNetworkAccess"] = bp.PublicNetworkAccess + } + if bp.IsStreamingSupported != nil { + objectMap["isStreamingSupported"] = bp.IsStreamingSupported + } + if bp.DisableLocalAuth != nil { + objectMap["disableLocalAuth"] = bp.DisableLocalAuth } if bp.SchemaTransformationVersion != nil { objectMap["schemaTransformationVersion"] = bp.SchemaTransformationVersion } + if bp.StorageResourceID != nil { + objectMap["storageResourceId"] = bp.StorageResourceID + } + if bp.OpenWithHint != nil { + objectMap["openWithHint"] = bp.OpenWithHint + } + if bp.AppPasswordHint != nil { + objectMap["appPasswordHint"] = bp.AppPasswordHint + } + if bp.PublishingCredentials != nil { + objectMap["publishingCredentials"] = bp.PublishingCredentials + } return json.Marshal(objectMap) } @@ -599,6 +692,12 @@ type BasicChannel interface { // Channel channel definition type Channel struct { + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -692,6 +791,12 @@ func unmarshalBasicChannelArray(body []byte) ([]BasicChannel, error) { func (c Channel) MarshalJSON() ([]byte, error) { c.ChannelName = ChannelNameBasicChannelChannelNameChannel objectMap := make(map[string]interface{}) + if c.Etag != nil { + objectMap["etag"] = c.Etag + } + if c.Location != nil { + objectMap["location"] = c.Location + } if c.ChannelName != "" { objectMap["channelName"] = c.ChannelName } @@ -941,6 +1046,28 @@ func NewChannelResponseListPage(cur ChannelResponseList, getNextPage func(contex } } +// ChannelSettings channel settings definition +type ChannelSettings struct { + // ExtensionKey1 - The extensionKey1 + ExtensionKey1 *string `json:"extensionKey1,omitempty"` + // ExtensionKey2 - The extensionKey2 + ExtensionKey2 *string `json:"extensionKey2,omitempty"` + // Sites - The list of sites + Sites *[]Site `json:"sites,omitempty"` + // ChannelID - The channel id + ChannelID *string `json:"channelId,omitempty"` + // ChannelDisplayName - The channel display name + ChannelDisplayName *string `json:"channelDisplayName,omitempty"` + // BotID - The bot id + BotID *string `json:"botId,omitempty"` + // BotIconURL - The bot icon url + BotIconURL *string `json:"botIconUrl,omitempty"` + // IsEnabled - Whether this channel is enabled for the bot + IsEnabled *bool `json:"isEnabled,omitempty"` + // DisableLocalAuth - Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication. + DisableLocalAuth *bool `json:"disableLocalAuth,omitempty"` +} + // CheckNameAvailabilityRequestBody the request body for a request to Bot Service Management to check // availability of a bot name. type CheckNameAvailabilityRequestBody struct { @@ -993,6 +1120,8 @@ type ConnectionSetting struct { Kind Kind `json:"kind,omitempty"` // Etag - Entity Tag Etag *string `json:"etag,omitempty"` + // Zones - READ-ONLY; Entity zones + Zones *[]string `json:"zones,omitempty"` } // MarshalJSON is the custom marshaler for ConnectionSetting. @@ -1030,6 +1159,10 @@ type ConnectionSettingParameter struct { // ConnectionSettingProperties properties for a Connection Setting Item type ConnectionSettingProperties struct { + // ID - Id associated with the Connection Setting. + ID *string `json:"id,omitempty"` + // Name - Name associated with the Connection Setting. + Name *string `json:"name,omitempty"` // ClientID - Client Id associated with the Connection Setting. ClientID *string `json:"clientId,omitempty"` // SettingID - READ-ONLY; Setting Id set by the service for the Connection Setting. @@ -1044,11 +1177,19 @@ type ConnectionSettingProperties struct { ServiceProviderDisplayName *string `json:"serviceProviderDisplayName,omitempty"` // Parameters - Service Provider Parameters associated with the Connection Setting Parameters *[]ConnectionSettingParameter `json:"parameters,omitempty"` + // ProvisioningState - Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` } // MarshalJSON is the custom marshaler for ConnectionSettingProperties. func (csp ConnectionSettingProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) + if csp.ID != nil { + objectMap["id"] = csp.ID + } + if csp.Name != nil { + objectMap["name"] = csp.Name + } if csp.ClientID != nil { objectMap["clientId"] = csp.ClientID } @@ -1067,6 +1208,9 @@ func (csp ConnectionSettingProperties) MarshalJSON() ([]byte, error) { if csp.Parameters != nil { objectMap["parameters"] = csp.Parameters } + if csp.ProvisioningState != nil { + objectMap["provisioningState"] = csp.ProvisioningState + } return json.Marshal(objectMap) } @@ -1242,6 +1386,12 @@ func NewConnectionSettingResponseListPage(cur ConnectionSettingResponseList, get type DirectLineChannel struct { // Properties - The set of properties specific to Direct Line channel resource Properties *DirectLineChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1253,6 +1403,12 @@ func (dlc DirectLineChannel) MarshalJSON() ([]byte, error) { if dlc.Properties != nil { objectMap["properties"] = dlc.Properties } + if dlc.Etag != nil { + objectMap["etag"] = dlc.Etag + } + if dlc.Location != nil { + objectMap["location"] = dlc.Location + } if dlc.ChannelName != "" { objectMap["channelName"] = dlc.ChannelName } @@ -1338,6 +1494,8 @@ func (dlc DirectLineChannel) AsBasicChannel() (BasicChannel, bool) { type DirectLineChannelProperties struct { // Sites - The list of Direct Line sites Sites *[]DirectLineSite `json:"sites,omitempty"` + // DirectLineEmbedCode - Direct Line embed code of the resource + DirectLineEmbedCode *string `json:"DirectLineEmbedCode,omitempty"` } // DirectLineSite a site for the Direct Line channel @@ -1358,6 +1516,8 @@ type DirectLineSite struct { IsV3Enabled *bool `json:"isV3Enabled,omitempty"` // IsSecureSiteEnabled - Whether this site is enabled for authentication with Bot Framework. IsSecureSiteEnabled *bool `json:"isSecureSiteEnabled,omitempty"` + // IsBlockUserUploadEnabled - Whether this site is enabled for block user upload. + IsBlockUserUploadEnabled *bool `json:"isBlockUserUploadEnabled,omitempty"` // TrustedOrigins - List of Trusted Origin URLs for this site. This field is applicable only if isSecureSiteEnabled is True. TrustedOrigins *[]string `json:"trustedOrigins,omitempty"` } @@ -1380,6 +1540,9 @@ func (dls DirectLineSite) MarshalJSON() ([]byte, error) { if dls.IsSecureSiteEnabled != nil { objectMap["isSecureSiteEnabled"] = dls.IsSecureSiteEnabled } + if dls.IsBlockUserUploadEnabled != nil { + objectMap["isBlockUserUploadEnabled"] = dls.IsBlockUserUploadEnabled + } if dls.TrustedOrigins != nil { objectMap["trustedOrigins"] = dls.TrustedOrigins } @@ -1390,6 +1553,12 @@ func (dls DirectLineSite) MarshalJSON() ([]byte, error) { type DirectLineSpeechChannel struct { // Properties - The set of properties specific to DirectLine Speech channel resource Properties *DirectLineSpeechChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1401,6 +1570,12 @@ func (dlsc DirectLineSpeechChannel) MarshalJSON() ([]byte, error) { if dlsc.Properties != nil { objectMap["properties"] = dlsc.Properties } + if dlsc.Etag != nil { + objectMap["etag"] = dlsc.Etag + } + if dlsc.Location != nil { + objectMap["location"] = dlsc.Location + } if dlsc.ChannelName != "" { objectMap["channelName"] = dlsc.ChannelName } @@ -1502,6 +1677,12 @@ type DirectLineSpeechChannelProperties struct { type EmailChannel struct { // Properties - The set of properties specific to email channel resource Properties *EmailChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1513,6 +1694,12 @@ func (ec EmailChannel) MarshalJSON() ([]byte, error) { if ec.Properties != nil { objectMap["properties"] = ec.Properties } + if ec.Etag != nil { + objectMap["etag"] = ec.Etag + } + if ec.Location != nil { + objectMap["location"] = ec.Location + } if ec.ChannelName != "" { objectMap["channelName"] = ec.ChannelName } @@ -1622,6 +1809,12 @@ type ErrorBody struct { type FacebookChannel struct { // Properties - The set of properties specific to bot facebook channel Properties *FacebookChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1633,6 +1826,12 @@ func (fc FacebookChannel) MarshalJSON() ([]byte, error) { if fc.Properties != nil { objectMap["properties"] = fc.Properties } + if fc.Etag != nil { + objectMap["etag"] = fc.Etag + } + if fc.Location != nil { + objectMap["location"] = fc.Location + } if fc.ChannelName != "" { objectMap["channelName"] = fc.ChannelName } @@ -1782,6 +1981,12 @@ type HostSettingsResponse struct { type KikChannel struct { // Properties - The set of properties specific to Kik channel resource Properties *KikChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1793,6 +1998,12 @@ func (kc KikChannel) MarshalJSON() ([]byte, error) { if kc.Properties != nil { objectMap["properties"] = kc.Properties } + if kc.Etag != nil { + objectMap["etag"] = kc.Etag + } + if kc.Location != nil { + objectMap["location"] = kc.Location + } if kc.ChannelName != "" { objectMap["channelName"] = kc.ChannelName } @@ -1890,6 +2101,12 @@ type KikChannelProperties struct { type LineChannel struct { // Properties - The set of properties specific to line channel resource Properties *LineChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -1901,6 +2118,12 @@ func (lc LineChannel) MarshalJSON() ([]byte, error) { if lc.Properties != nil { objectMap["properties"] = lc.Properties } + if lc.Etag != nil { + objectMap["etag"] = lc.Etag + } + if lc.Location != nil { + objectMap["location"] = lc.Location + } if lc.ChannelName != "" { objectMap["channelName"] = lc.ChannelName } @@ -2023,10 +2246,234 @@ func (lr LineRegistration) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// ListChannelWithKeysResponse the ARM channel of list channel with keys operation response. +type ListChannelWithKeysResponse struct { + autorest.Response `json:"-"` + // Resource - The set of properties specific to bot channel resource + Resource BasicChannel `json:"resource,omitempty"` + // Setting - Channel settings + Setting *ChannelSettings `json:"setting,omitempty"` + // ProvisioningState - Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // EntityTag - Entity tag of the resource + EntityTag *string `json:"entityTag,omitempty"` + // ChangedTime - Changed time of the resource + ChangedTime *string `json:"changedTime,omitempty"` + // Properties - The set of properties specific to bot channel resource + Properties BasicChannel `json:"properties,omitempty"` + // ID - READ-ONLY; Specifies the resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Specifies the name of the resource. + Name *string `json:"name,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` + // Type - READ-ONLY; Specifies the type of the resource. + Type *string `json:"type,omitempty"` + // Tags - Contains resource tags defined as key/value pairs. + Tags map[string]*string `json:"tags"` + // Sku - Gets or sets the SKU of the resource. + Sku *Sku `json:"sku,omitempty"` + // Kind - Required. Gets or sets the Kind of the resource. Possible values include: 'KindSdk', 'KindDesigner', 'KindBot', 'KindFunction', 'KindAzurebot' + Kind Kind `json:"kind,omitempty"` + // Etag - Entity Tag + Etag *string `json:"etag,omitempty"` + // Zones - READ-ONLY; Entity zones + Zones *[]string `json:"zones,omitempty"` +} + +// MarshalJSON is the custom marshaler for ListChannelWithKeysResponse. +func (lcwkr ListChannelWithKeysResponse) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + objectMap["resource"] = lcwkr.Resource + if lcwkr.Setting != nil { + objectMap["setting"] = lcwkr.Setting + } + if lcwkr.ProvisioningState != nil { + objectMap["provisioningState"] = lcwkr.ProvisioningState + } + if lcwkr.EntityTag != nil { + objectMap["entityTag"] = lcwkr.EntityTag + } + if lcwkr.ChangedTime != nil { + objectMap["changedTime"] = lcwkr.ChangedTime + } + objectMap["properties"] = lcwkr.Properties + if lcwkr.Location != nil { + objectMap["location"] = lcwkr.Location + } + if lcwkr.Tags != nil { + objectMap["tags"] = lcwkr.Tags + } + if lcwkr.Sku != nil { + objectMap["sku"] = lcwkr.Sku + } + if lcwkr.Kind != "" { + objectMap["kind"] = lcwkr.Kind + } + if lcwkr.Etag != nil { + objectMap["etag"] = lcwkr.Etag + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ListChannelWithKeysResponse struct. +func (lcwkr *ListChannelWithKeysResponse) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "resource": + if v != nil { + resource, err := unmarshalBasicChannel(*v) + if err != nil { + return err + } + lcwkr.Resource = resource + } + case "setting": + if v != nil { + var setting ChannelSettings + err = json.Unmarshal(*v, &setting) + if err != nil { + return err + } + lcwkr.Setting = &setting + } + case "provisioningState": + if v != nil { + var provisioningState string + err = json.Unmarshal(*v, &provisioningState) + if err != nil { + return err + } + lcwkr.ProvisioningState = &provisioningState + } + case "entityTag": + if v != nil { + var entityTag string + err = json.Unmarshal(*v, &entityTag) + if err != nil { + return err + } + lcwkr.EntityTag = &entityTag + } + case "changedTime": + if v != nil { + var changedTime string + err = json.Unmarshal(*v, &changedTime) + if err != nil { + return err + } + lcwkr.ChangedTime = &changedTime + } + case "properties": + if v != nil { + properties, err := unmarshalBasicChannel(*v) + if err != nil { + return err + } + lcwkr.Properties = properties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + lcwkr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + lcwkr.Name = &name + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + lcwkr.Location = &location + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + lcwkr.Type = &typeVar + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + lcwkr.Tags = tags + } + case "sku": + if v != nil { + var sku Sku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + lcwkr.Sku = &sku + } + case "kind": + if v != nil { + var kind Kind + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + lcwkr.Kind = kind + } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + lcwkr.Etag = &etag + } + case "zones": + if v != nil { + var zones []string + err = json.Unmarshal(*v, &zones) + if err != nil { + return err + } + lcwkr.Zones = &zones + } + } + } + + return nil +} + // MsTeamsChannel microsoft Teams channel definition type MsTeamsChannel struct { // Properties - The set of properties specific to Microsoft Teams channel resource Properties *MsTeamsChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2038,6 +2485,12 @@ func (mtc MsTeamsChannel) MarshalJSON() ([]byte, error) { if mtc.Properties != nil { objectMap["properties"] = mtc.Properties } + if mtc.Etag != nil { + objectMap["etag"] = mtc.Etag + } + if mtc.Location != nil { + objectMap["location"] = mtc.Location + } if mtc.ChannelName != "" { objectMap["channelName"] = mtc.ChannelName } @@ -2127,6 +2580,12 @@ type MsTeamsChannelProperties struct { CallingWebHook *string `json:"callingWebHook,omitempty"` // IsEnabled - Whether this channel is enabled for the bot IsEnabled *bool `json:"isEnabled,omitempty"` + // IncomingCallRoute - Webhook for Microsoft Teams channel calls + IncomingCallRoute *string `json:"incomingCallRoute,omitempty"` + // DeploymentEnvironment - Deployment environment for Microsoft Teams channel calls + DeploymentEnvironment *string `json:"deploymentEnvironment,omitempty"` + // AcceptedTerms - Whether this channel accepted terms + AcceptedTerms *bool `json:"acceptedTerms,omitempty"` } // OperationDisplayInfo the operation supported by Bot Service Management. @@ -2330,6 +2789,8 @@ type Resource struct { Kind Kind `json:"kind,omitempty"` // Etag - Entity Tag Etag *string `json:"etag,omitempty"` + // Zones - READ-ONLY; Entity zones + Zones *[]string `json:"zones,omitempty"` } // MarshalJSON is the custom marshaler for Resource. @@ -2373,6 +2834,8 @@ type ServiceProviderParameter struct { HelpURL *string `json:"helpUrl,omitempty"` // Default - READ-ONLY; Default Name for the Service Provider Default *string `json:"default,omitempty"` + // Metadata - READ-ONLY; Meta data for the Service Provider + Metadata *ServiceProviderParameterMetadata `json:"metadata,omitempty"` } // MarshalJSON is the custom marshaler for ServiceProviderParameter. @@ -2381,6 +2844,18 @@ func (spp ServiceProviderParameter) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// ServiceProviderParameterMetadata meta data for the Service Provider +type ServiceProviderParameterMetadata struct { + // Constraints - the constraints of the bot meta data. + Constraints *ServiceProviderParameterMetadataConstraints `json:"constraints,omitempty"` +} + +// ServiceProviderParameterMetadataConstraints the constraints of the bot meta data. +type ServiceProviderParameterMetadataConstraints struct { + // Required - Whether required the constraints of the bot meta data. + Required *bool `json:"required,omitempty"` +} + // ServiceProviderProperties the Object used to describe a Service Provider supported by Bot Service type ServiceProviderProperties struct { // ID - READ-ONLY; Id for Service Provider @@ -2424,6 +2899,72 @@ func (sprl ServiceProviderResponseList) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Site a site for the channel +type Site struct { + // SiteID - READ-ONLY; Site Id + SiteID *string `json:"siteId,omitempty"` + // SiteName - Site name + SiteName *string `json:"siteName,omitempty"` + // Key - READ-ONLY; Primary key. Value only returned through POST to the action Channel List API, otherwise empty. + Key *string `json:"key,omitempty"` + // Key2 - READ-ONLY; Secondary key. Value only returned through POST to the action Channel List API, otherwise empty. + Key2 *string `json:"key2,omitempty"` + // IsEnabled - Whether this site is enabled for DirectLine channel + IsEnabled *bool `json:"isEnabled,omitempty"` + // IsWebchatPreviewEnabled - Whether this site is enabled for preview versions of Webchat + IsWebchatPreviewEnabled *bool `json:"isWebchatPreviewEnabled,omitempty"` + // IsV1Enabled - Whether this site is enabled for Bot Framework V1 protocol. + IsV1Enabled *bool `json:"isV1Enabled,omitempty"` + // IsV3Enabled - Whether this site is enabled for Bot Framework V1 protocol. + IsV3Enabled *bool `json:"isV3Enabled,omitempty"` + // IsSecureSiteEnabled - Whether this site is enabled for authentication with Bot Framework. + IsSecureSiteEnabled *bool `json:"isSecureSiteEnabled,omitempty"` + // IsBlockUserUploadEnabled - Whether this site is enabled for block user upload. + IsBlockUserUploadEnabled *bool `json:"isBlockUserUploadEnabled,omitempty"` + // TrustedOrigins - List of Trusted Origin URLs for this site. This field is applicable only if isSecureSiteEnabled is True. + TrustedOrigins *[]string `json:"trustedOrigins,omitempty"` + // IsTokenEnabled - Whether this site is token enabled for channel + IsTokenEnabled *bool `json:"isTokenEnabled,omitempty"` + // ETag - Entity Tag + ETag *string `json:"eTag,omitempty"` +} + +// MarshalJSON is the custom marshaler for Site. +func (s Site) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if s.SiteName != nil { + objectMap["siteName"] = s.SiteName + } + if s.IsEnabled != nil { + objectMap["isEnabled"] = s.IsEnabled + } + if s.IsWebchatPreviewEnabled != nil { + objectMap["isWebchatPreviewEnabled"] = s.IsWebchatPreviewEnabled + } + if s.IsV1Enabled != nil { + objectMap["isV1Enabled"] = s.IsV1Enabled + } + if s.IsV3Enabled != nil { + objectMap["isV3Enabled"] = s.IsV3Enabled + } + if s.IsSecureSiteEnabled != nil { + objectMap["isSecureSiteEnabled"] = s.IsSecureSiteEnabled + } + if s.IsBlockUserUploadEnabled != nil { + objectMap["isBlockUserUploadEnabled"] = s.IsBlockUserUploadEnabled + } + if s.TrustedOrigins != nil { + objectMap["trustedOrigins"] = s.TrustedOrigins + } + if s.IsTokenEnabled != nil { + objectMap["isTokenEnabled"] = s.IsTokenEnabled + } + if s.ETag != nil { + objectMap["eTag"] = s.ETag + } + return json.Marshal(objectMap) +} + // SiteInfo site information for WebChat or DirectLine Channels to identify which site to regenerate keys // for. type SiteInfo struct { @@ -2454,6 +2995,12 @@ func (s Sku) MarshalJSON() ([]byte, error) { type SkypeChannel struct { // Properties - The set of properties specific to Skype channel resource Properties *SkypeChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2465,6 +3012,12 @@ func (sc SkypeChannel) MarshalJSON() ([]byte, error) { if sc.Properties != nil { objectMap["properties"] = sc.Properties } + if sc.Etag != nil { + objectMap["etag"] = sc.Etag + } + if sc.Location != nil { + objectMap["location"] = sc.Location + } if sc.ChannelName != "" { objectMap["channelName"] = sc.ChannelName } @@ -2564,6 +3117,8 @@ type SkypeChannelProperties struct { GroupsMode *string `json:"groupsMode,omitempty"` // CallingWebHook - Calling web hook for Skype channel CallingWebHook *string `json:"callingWebHook,omitempty"` + // IncomingCallRoute - Incoming call route for Skype channel + IncomingCallRoute *string `json:"incomingCallRoute,omitempty"` // IsEnabled - Whether this channel is enabled for the bot IsEnabled *bool `json:"isEnabled,omitempty"` } @@ -2572,6 +3127,12 @@ type SkypeChannelProperties struct { type SlackChannel struct { // Properties - The set of properties specific to Slack channel resource Properties *SlackChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2583,6 +3144,12 @@ func (sc SlackChannel) MarshalJSON() ([]byte, error) { if sc.Properties != nil { objectMap["properties"] = sc.Properties } + if sc.Etag != nil { + objectMap["etag"] = sc.Etag + } + if sc.Location != nil { + objectMap["location"] = sc.Location + } if sc.ChannelName != "" { objectMap["channelName"] = sc.ChannelName } @@ -2716,6 +3283,12 @@ func (scp SlackChannelProperties) MarshalJSON() ([]byte, error) { type SmsChannel struct { // Properties - The set of properties specific to Sms channel resource Properties *SmsChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2727,6 +3300,12 @@ func (sc SmsChannel) MarshalJSON() ([]byte, error) { if sc.Properties != nil { objectMap["properties"] = sc.Properties } + if sc.Etag != nil { + objectMap["etag"] = sc.Etag + } + if sc.Location != nil { + objectMap["location"] = sc.Location + } if sc.ChannelName != "" { objectMap["channelName"] = sc.ChannelName } @@ -2826,6 +3405,12 @@ type SmsChannelProperties struct { type TelegramChannel struct { // Properties - The set of properties specific to Telegram channel resource Properties *TelegramChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2837,6 +3422,12 @@ func (tc TelegramChannel) MarshalJSON() ([]byte, error) { if tc.Properties != nil { objectMap["properties"] = tc.Properties } + if tc.Etag != nil { + objectMap["etag"] = tc.Etag + } + if tc.Location != nil { + objectMap["location"] = tc.Location + } if tc.ChannelName != "" { objectMap["channelName"] = tc.ChannelName } @@ -2932,6 +3523,12 @@ type TelegramChannelProperties struct { type WebChatChannel struct { // Properties - The set of properties specific to Web Chat channel resource Properties *WebChatChannelProperties `json:"properties,omitempty"` + // Etag - Entity Tag of the resource + Etag *string `json:"etag,omitempty"` + // ProvisioningState - READ-ONLY; Provisioning state of the resource + ProvisioningState *string `json:"provisioningState,omitempty"` + // Location - Specifies the location of the resource. + Location *string `json:"location,omitempty"` // ChannelName - Possible values include: 'ChannelNameBasicChannelChannelNameChannel', 'ChannelNameBasicChannelChannelNameAlexaChannel', 'ChannelNameBasicChannelChannelNameFacebookChannel', 'ChannelNameBasicChannelChannelNameEmailChannel', 'ChannelNameBasicChannelChannelNameMsTeamsChannel', 'ChannelNameBasicChannelChannelNameSkypeChannel', 'ChannelNameBasicChannelChannelNameKikChannel', 'ChannelNameBasicChannelChannelNameWebChatChannel', 'ChannelNameBasicChannelChannelNameDirectLineChannel', 'ChannelNameBasicChannelChannelNameTelegramChannel', 'ChannelNameBasicChannelChannelNameSmsChannel', 'ChannelNameBasicChannelChannelNameSlackChannel', 'ChannelNameBasicChannelChannelNameLineChannel', 'ChannelNameBasicChannelChannelNameDirectLineSpeechChannel' ChannelName ChannelNameBasicChannel `json:"channelName,omitempty"` } @@ -2943,6 +3540,12 @@ func (wcc WebChatChannel) MarshalJSON() ([]byte, error) { if wcc.Properties != nil { objectMap["properties"] = wcc.Properties } + if wcc.Etag != nil { + objectMap["etag"] = wcc.Etag + } + if wcc.Location != nil { + objectMap["location"] = wcc.Location + } if wcc.ChannelName != "" { objectMap["channelName"] = wcc.ChannelName } @@ -3053,8 +3656,8 @@ type WebChatSite struct { Key2 *string `json:"key2,omitempty"` // IsEnabled - Whether this site is enabled for DirectLine channel IsEnabled *bool `json:"isEnabled,omitempty"` - // EnablePreview - Whether this site is enabled for preview versions of Webchat - EnablePreview *bool `json:"enablePreview,omitempty"` + // IsWebchatPreviewEnabled - Whether this site is enabled for preview versions of Webchat + IsWebchatPreviewEnabled *bool `json:"isWebchatPreviewEnabled,omitempty"` } // MarshalJSON is the custom marshaler for WebChatSite. @@ -3066,8 +3669,8 @@ func (wcs WebChatSite) MarshalJSON() ([]byte, error) { if wcs.IsEnabled != nil { objectMap["isEnabled"] = wcs.IsEnabled } - if wcs.EnablePreview != nil { - objectMap["enablePreview"] = wcs.EnablePreview + if wcs.IsWebchatPreviewEnabled != nil { + objectMap["isWebchatPreviewEnabled"] = wcs.IsWebchatPreviewEnabled } return json.Marshal(objectMap) } diff --git a/services/preview/botservice/mgmt/2017-12-01/botservice/CHANGELOG.md b/services/preview/botservice/mgmt/2017-12-01/botservice/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/botservice/mgmt/2017-12-01/botservice/CHANGELOG.md +++ b/services/preview/botservice/mgmt/2017-12-01/botservice/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/botservice/mgmt/2017-12-01/botservice/_meta.json b/services/preview/botservice/mgmt/2017-12-01/botservice/_meta.json index b311a1547ca6..7cda2fdde8c4 100644 --- a/services/preview/botservice/mgmt/2017-12-01/botservice/_meta.json +++ b/services/preview/botservice/mgmt/2017-12-01/botservice/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "0ea2274010bb36b78d04d49b460cb6349ef62780", "readme": "/_/azure-rest-api-specs/specification/botservice/resource-manager/readme.md", "tag": "package-2017-12-01", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/preview/botservice/mgmt/2018-07-12/botservice/CHANGELOG.md b/services/preview/botservice/mgmt/2018-07-12/botservice/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/botservice/mgmt/2018-07-12/botservice/CHANGELOG.md +++ b/services/preview/botservice/mgmt/2018-07-12/botservice/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/botservice/mgmt/2018-07-12/botservice/_meta.json b/services/preview/botservice/mgmt/2018-07-12/botservice/_meta.json index 8b3e17dbe79a..e982ccfbcab7 100644 --- a/services/preview/botservice/mgmt/2018-07-12/botservice/_meta.json +++ b/services/preview/botservice/mgmt/2018-07-12/botservice/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "0ea2274010bb36b78d04d49b460cb6349ef62780", "readme": "/_/azure-rest-api-specs/specification/botservice/resource-manager/readme.md", "tag": "package-2018-07-12", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/CHANGELOG.md b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/CHANGELOG.md index c57e1603a319..a1ecf841edb0 100644 --- a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/CHANGELOG.md +++ b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/CHANGELOG.md @@ -1,15 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Constants - -1. ChannelName.ChannelNameOutlookChannel - -### Struct Changes - -#### New Struct Fields - -1. ListChannelWithKeysResponse.ChangedTime -1. ListChannelWithKeysResponse.EntityTag -1. ListChannelWithKeysResponse.ProvisioningState diff --git a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/_meta.json b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/_meta.json index e36643ccc43b..aca66bc26c8c 100644 --- a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/_meta.json +++ b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/_meta.json @@ -1,5 +1,5 @@ { - "commit": "9d8640319ef481ae301b67b033d6ae0bd30422c3", + "commit": "0ea2274010bb36b78d04d49b460cb6349ef62780", "readme": "/_/azure-rest-api-specs/specification/botservice/resource-manager/readme.md", "tag": "package-preview-2021-05", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/models.go b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/models.go index c124da72e028..3e5880c6f1ea 100644 --- a/services/preview/botservice/mgmt/2021-05-01-preview/botservice/models.go +++ b/services/preview/botservice/mgmt/2021-05-01-preview/botservice/models.go @@ -3542,7 +3542,7 @@ type SlackChannelProperties struct { RedirectAction *string `json:"redirectAction,omitempty"` // LastSubmissionID - READ-ONLY; The Sms auth token LastSubmissionID *string `json:"lastSubmissionId,omitempty"` - // RegisterBeforeOAuthFlow - READ-ONLY; Whether to register the settings before OAuth validation is performed. Recommended to True. + // RegisterBeforeOAuthFlow - Whether to register the settings before OAuth validation is performed. Recommended to True. RegisterBeforeOAuthFlow *bool `json:"registerBeforeOAuthFlow,omitempty"` // IsValidated - READ-ONLY; Whether this channel is validated for the bot IsValidated *bool `json:"IsValidated,omitempty"` @@ -3570,6 +3570,9 @@ func (scp SlackChannelProperties) MarshalJSON() ([]byte, error) { if scp.LandingPageURL != nil { objectMap["landingPageUrl"] = scp.LandingPageURL } + if scp.RegisterBeforeOAuthFlow != nil { + objectMap["registerBeforeOAuthFlow"] = scp.RegisterBeforeOAuthFlow + } if scp.SigningSecret != nil { objectMap["signingSecret"] = scp.SigningSecret }