From 0c952bd89996933112a22e0ce47db67cffdb23c3 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 10 Nov 2021 08:02:12 +0000 Subject: [PATCH] CodeGen from PR 16377 in Azure/azure-rest-api-specs Review request for Microsoft.BotService to update version stable/2021-03-01 (#16377) * fix api error * update * update * update example * prettier fix --- schemas/2021-03-01/Microsoft.BotService.json | 182 +++++++++++++++++- .../Microsoft.BotService.json | 84 ++++++++ 2 files changed, 260 insertions(+), 6 deletions(-) diff --git a/schemas/2021-03-01/Microsoft.BotService.json b/schemas/2021-03-01/Microsoft.BotService.json index 7a401f04ef..582d143555 100644 --- a/schemas/2021-03-01/Microsoft.BotService.json +++ b/schemas/2021-03-01/Microsoft.BotService.json @@ -388,10 +388,29 @@ "BotProperties": { "type": "object", "properties": { + "allSettings": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource all settings defined as key/value pairs." + }, "appPasswordHint": { "type": "string", "description": "The hint (e.g. keyVault secret resourceId) on how to fetch the app secret" }, + "cmekEncryptionStatus": { + "type": "string", + "description": "The CMK encryption status" + }, "cmekKeyVaultUrl": { "type": "string", "description": "The CMK Url" @@ -412,6 +431,17 @@ "type": "string", "description": "The Application Insights App Id" }, + "disableLocalAuth": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication." + }, "displayName": { "type": "string", "description": "The Name of the bot" @@ -435,6 +465,17 @@ ], "description": "Whether Cmek is enabled" }, + "isDeveloperAppInsightsApiKeySet": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether the bot is developerAppInsightsApiKey set" + }, "isIsolated": { "oneOf": [ { @@ -446,6 +487,17 @@ ], "description": "Whether the bot is in an isolated network" }, + "isStreamingSupported": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether the bot is streaming supported" + }, "luisAppIds": { "oneOf": [ { @@ -464,14 +516,61 @@ "type": "string", "description": "The LUIS Key" }, + "manifestUrl": { + "type": "string", + "description": "The bot's manifest url" + }, "msaAppId": { "type": "string", "description": "Microsoft App Id for the bot" }, + "msaAppMSIResourceId": { + "type": "string", + "description": "Microsoft App Managed Identity Resource Id for the bot" + }, + "msaAppTenantId": { + "type": "string", + "description": "Microsoft App Tenant Id for the bot" + }, + "msaAppType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "UserAssignedMSI", + "SingleTenant", + "MultiTenant" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Microsoft App Type for the bot." + }, "openWithHint": { "type": "string", "description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring" }, + "parameters": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource parameters defined as key/value pairs." + }, + "publishingCredentials": { + "type": "string", + "description": "Publishing credentials of the resource" + }, "schemaTransformationVersion": { "type": "string", "description": "The channel schema transformation version for the bot" @@ -741,7 +840,12 @@ "$ref": "#/definitions/DirectLineSpeechChannel" } ], - "properties": {}, + "properties": { + "etag": { + "type": "string", + "description": "Entity Tag of the resource" + } + }, "description": "Channel definition" }, "ConnectionSettingParameter": { @@ -783,6 +887,10 @@ ], "description": "Service Provider Parameters associated with the Connection Setting" }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" + }, "scopes": { "type": "string", "description": "Scopes associated with the Connection Setting" @@ -807,6 +915,10 @@ "DirectLineChannel" ] }, + "location": { + "type": "string", + "description": "Location of the resource" + }, "properties": { "oneOf": [ { @@ -817,6 +929,10 @@ } ], "description": "The parameters to provide for the Direct Line channel." + }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" } }, "required": [ @@ -827,6 +943,10 @@ "DirectLineChannelProperties": { "type": "object", "properties": { + "DirectLineEmbedCode": { + "type": "string", + "description": "Direct Line embed code of the resource" + }, "sites": { "oneOf": [ { @@ -847,6 +967,17 @@ "DirectLineSite": { "type": "object", "properties": { + "isBlockUserUploadEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether this site is enabled for block user upload." + }, "isEnabled": { "oneOf": [ { @@ -1271,6 +1402,10 @@ "MsTeamsChannel" ] }, + "location": { + "type": "string", + "description": "Location of the resource" + }, "properties": { "oneOf": [ { @@ -1281,6 +1416,10 @@ } ], "description": "The parameters to provide for the Microsoft Teams channel." + }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" } }, "required": [ @@ -1291,10 +1430,25 @@ "MsTeamsChannelProperties": { "type": "object", "properties": { + "acceptedTerms": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether this channel accepted terms" + }, "callingWebHook": { "type": "string", "description": "Webhook for Microsoft Teams channel calls" }, + "deploymentEnvironment": { + "type": "string", + "description": "Deployment environment for Microsoft Teams channel calls" + }, "enableCalling": { "oneOf": [ { @@ -1306,6 +1460,10 @@ ], "description": "Enable calling for Microsoft Teams channel" }, + "incomingCallRoute": { + "type": "string", + "description": "Webhook for Microsoft Teams channel calls" + }, "isEnabled": { "oneOf": [ { @@ -1450,6 +1608,10 @@ "type": "string", "description": "Group mode for Skype channel" }, + "incomingCallRoute": { + "type": "string", + "description": "Incoming call route for Skype channel" + }, "isEnabled": { "oneOf": [ { @@ -1674,6 +1836,10 @@ "WebChatChannel" ] }, + "location": { + "type": "string", + "description": "Location of the resource" + }, "properties": { "oneOf": [ { @@ -1684,6 +1850,10 @@ } ], "description": "The parameters to provide for the Web Chat channel." + }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" } }, "required": [ @@ -1714,7 +1884,7 @@ "WebChatSite": { "type": "object", "properties": { - "enablePreview": { + "isEnabled": { "oneOf": [ { "type": "boolean" @@ -1723,9 +1893,9 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Whether this site is enabled for preview versions of Webchat" + "description": "Whether this site is enabled for DirectLine channel" }, - "isEnabled": { + "isWebchatPreviewEnabled": { "oneOf": [ { "type": "boolean" @@ -1734,7 +1904,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Whether this site is enabled for DirectLine channel" + "description": "Whether this site is enabled for preview versions of Webchat" }, "siteName": { "type": "string", @@ -1742,8 +1912,8 @@ } }, "required": [ - "enablePreview", "isEnabled", + "isWebchatPreviewEnabled", "siteName" ], "description": "A site for the Webchat channel" diff --git a/schemas/2021-05-01-preview/Microsoft.BotService.json b/schemas/2021-05-01-preview/Microsoft.BotService.json index 31b108591c..503a9b27da 100644 --- a/schemas/2021-05-01-preview/Microsoft.BotService.json +++ b/schemas/2021-05-01-preview/Microsoft.BotService.json @@ -430,10 +430,29 @@ "BotProperties": { "type": "object", "properties": { + "allSettings": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource all settings defined as key/value pairs." + }, "appPasswordHint": { "type": "string", "description": "The hint (e.g. keyVault secret resourceId) on how to fetch the app secret" }, + "cmekEncryptionStatus": { + "type": "string", + "description": "The CMK encryption status" + }, "cmekKeyVaultUrl": { "type": "string", "description": "The CMK Url" @@ -510,6 +529,17 @@ ], "description": "Whether the bot is in an isolated network" }, + "isStreamingSupported": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether the bot is streaming supported" + }, "luisAppIds": { "oneOf": [ { @@ -528,6 +558,10 @@ "type": "string", "description": "The LUIS Key" }, + "manifestUrl": { + "type": "string", + "description": "The bot's manifest url" + }, "msaAppId": { "type": "string", "description": "Microsoft App Id for the bot" @@ -560,6 +594,25 @@ "type": "string", "description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring" }, + "parameters": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource parameters defined as key/value pairs." + }, + "publishingCredentials": { + "type": "string", + "description": "Publishing credentials of the resource" + }, "schemaTransformationVersion": { "type": "string", "description": "The channel schema transformation version for the bot" @@ -915,6 +968,10 @@ ], "description": "Service Provider Parameters associated with the Connection Setting" }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" + }, "scopes": { "type": "string", "description": "Scopes associated with the Connection Setting" @@ -939,6 +996,10 @@ "DirectLineChannel" ] }, + "location": { + "type": "string", + "description": "Location of the resource" + }, "properties": { "oneOf": [ { @@ -1438,6 +1499,10 @@ "MsTeamsChannel" ] }, + "location": { + "type": "string", + "description": "Location of the resource" + }, "properties": { "oneOf": [ { @@ -1462,10 +1527,25 @@ "MsTeamsChannelProperties": { "type": "object", "properties": { + "acceptedTerms": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether this channel accepted terms" + }, "callingWebHook": { "type": "string", "description": "Webhook for Microsoft Teams channel calls" }, + "deploymentEnvironment": { + "type": "string", + "description": "Deployment environment for Microsoft Teams channel calls" + }, "enableCalling": { "oneOf": [ { @@ -1962,6 +2042,10 @@ } ], "description": "The parameters to provide for the Web Chat channel." + }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the resource" } }, "required": [