Skip to content

Commit 2d92207

Browse files
author
msftbot[bot]
authored
[ReleasePR botservice] Review request for Microsoft.BotService to update version stable/2021-03-01 (#2043)
Create to sync Azure/azure-rest-api-specs#16377 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...AzureSDKAutomation:sdkAuto/botservice?expand=1)
2 parents a639719 + 0c952bd commit 2d92207

File tree

2 files changed

+260
-6
lines changed

2 files changed

+260
-6
lines changed

‎schemas/2021-03-01/Microsoft.BotService.json‎

Lines changed: 176 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,29 @@
388388
"BotProperties": {
389389
"type": "object",
390390
"properties": {
391+
"allSettings": {
392+
"oneOf": [
393+
{
394+
"type": "object",
395+
"additionalProperties": {
396+
"type": "string"
397+
},
398+
"properties": {}
399+
},
400+
{
401+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
402+
}
403+
],
404+
"description": "Contains resource all settings defined as key/value pairs."
405+
},
391406
"appPasswordHint": {
392407
"type": "string",
393408
"description": "The hint (e.g. keyVault secret resourceId) on how to fetch the app secret"
394409
},
410+
"cmekEncryptionStatus": {
411+
"type": "string",
412+
"description": "The CMK encryption status"
413+
},
395414
"cmekKeyVaultUrl": {
396415
"type": "string",
397416
"description": "The CMK Url"
@@ -412,6 +431,17 @@
412431
"type": "string",
413432
"description": "The Application Insights App Id"
414433
},
434+
"disableLocalAuth": {
435+
"oneOf": [
436+
{
437+
"type": "boolean"
438+
},
439+
{
440+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
441+
}
442+
],
443+
"description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication."
444+
},
415445
"displayName": {
416446
"type": "string",
417447
"description": "The Name of the bot"
@@ -435,6 +465,17 @@
435465
],
436466
"description": "Whether Cmek is enabled"
437467
},
468+
"isDeveloperAppInsightsApiKeySet": {
469+
"oneOf": [
470+
{
471+
"type": "boolean"
472+
},
473+
{
474+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
475+
}
476+
],
477+
"description": "Whether the bot is developerAppInsightsApiKey set"
478+
},
438479
"isIsolated": {
439480
"oneOf": [
440481
{
@@ -446,6 +487,17 @@
446487
],
447488
"description": "Whether the bot is in an isolated network"
448489
},
490+
"isStreamingSupported": {
491+
"oneOf": [
492+
{
493+
"type": "boolean"
494+
},
495+
{
496+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
497+
}
498+
],
499+
"description": "Whether the bot is streaming supported"
500+
},
449501
"luisAppIds": {
450502
"oneOf": [
451503
{
@@ -464,14 +516,61 @@
464516
"type": "string",
465517
"description": "The LUIS Key"
466518
},
519+
"manifestUrl": {
520+
"type": "string",
521+
"description": "The bot's manifest url"
522+
},
467523
"msaAppId": {
468524
"type": "string",
469525
"description": "Microsoft App Id for the bot"
470526
},
527+
"msaAppMSIResourceId": {
528+
"type": "string",
529+
"description": "Microsoft App Managed Identity Resource Id for the bot"
530+
},
531+
"msaAppTenantId": {
532+
"type": "string",
533+
"description": "Microsoft App Tenant Id for the bot"
534+
},
535+
"msaAppType": {
536+
"oneOf": [
537+
{
538+
"type": "string",
539+
"enum": [
540+
"UserAssignedMSI",
541+
"SingleTenant",
542+
"MultiTenant"
543+
]
544+
},
545+
{
546+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
547+
}
548+
],
549+
"description": "Microsoft App Type for the bot."
550+
},
471551
"openWithHint": {
472552
"type": "string",
473553
"description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring"
474554
},
555+
"parameters": {
556+
"oneOf": [
557+
{
558+
"type": "object",
559+
"additionalProperties": {
560+
"type": "string"
561+
},
562+
"properties": {}
563+
},
564+
{
565+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
566+
}
567+
],
568+
"description": "Contains resource parameters defined as key/value pairs."
569+
},
570+
"publishingCredentials": {
571+
"type": "string",
572+
"description": "Publishing credentials of the resource"
573+
},
475574
"schemaTransformationVersion": {
476575
"type": "string",
477576
"description": "The channel schema transformation version for the bot"
@@ -741,7 +840,12 @@
741840
"$ref": "#/definitions/DirectLineSpeechChannel"
742841
}
743842
],
744-
"properties": {},
843+
"properties": {
844+
"etag": {
845+
"type": "string",
846+
"description": "Entity Tag of the resource"
847+
}
848+
},
745849
"description": "Channel definition"
746850
},
747851
"ConnectionSettingParameter": {
@@ -783,6 +887,10 @@
783887
],
784888
"description": "Service Provider Parameters associated with the Connection Setting"
785889
},
890+
"provisioningState": {
891+
"type": "string",
892+
"description": "Provisioning state of the resource"
893+
},
786894
"scopes": {
787895
"type": "string",
788896
"description": "Scopes associated with the Connection Setting"
@@ -807,6 +915,10 @@
807915
"DirectLineChannel"
808916
]
809917
},
918+
"location": {
919+
"type": "string",
920+
"description": "Location of the resource"
921+
},
810922
"properties": {
811923
"oneOf": [
812924
{
@@ -817,6 +929,10 @@
817929
}
818930
],
819931
"description": "The parameters to provide for the Direct Line channel."
932+
},
933+
"provisioningState": {
934+
"type": "string",
935+
"description": "Provisioning state of the resource"
820936
}
821937
},
822938
"required": [
@@ -827,6 +943,10 @@
827943
"DirectLineChannelProperties": {
828944
"type": "object",
829945
"properties": {
946+
"DirectLineEmbedCode": {
947+
"type": "string",
948+
"description": "Direct Line embed code of the resource"
949+
},
830950
"sites": {
831951
"oneOf": [
832952
{
@@ -847,6 +967,17 @@
847967
"DirectLineSite": {
848968
"type": "object",
849969
"properties": {
970+
"isBlockUserUploadEnabled": {
971+
"oneOf": [
972+
{
973+
"type": "boolean"
974+
},
975+
{
976+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
977+
}
978+
],
979+
"description": "Whether this site is enabled for block user upload."
980+
},
850981
"isEnabled": {
851982
"oneOf": [
852983
{
@@ -1271,6 +1402,10 @@
12711402
"MsTeamsChannel"
12721403
]
12731404
},
1405+
"location": {
1406+
"type": "string",
1407+
"description": "Location of the resource"
1408+
},
12741409
"properties": {
12751410
"oneOf": [
12761411
{
@@ -1281,6 +1416,10 @@
12811416
}
12821417
],
12831418
"description": "The parameters to provide for the Microsoft Teams channel."
1419+
},
1420+
"provisioningState": {
1421+
"type": "string",
1422+
"description": "Provisioning state of the resource"
12841423
}
12851424
},
12861425
"required": [
@@ -1291,10 +1430,25 @@
12911430
"MsTeamsChannelProperties": {
12921431
"type": "object",
12931432
"properties": {
1433+
"acceptedTerms": {
1434+
"oneOf": [
1435+
{
1436+
"type": "boolean"
1437+
},
1438+
{
1439+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1440+
}
1441+
],
1442+
"description": "Whether this channel accepted terms"
1443+
},
12941444
"callingWebHook": {
12951445
"type": "string",
12961446
"description": "Webhook for Microsoft Teams channel calls"
12971447
},
1448+
"deploymentEnvironment": {
1449+
"type": "string",
1450+
"description": "Deployment environment for Microsoft Teams channel calls"
1451+
},
12981452
"enableCalling": {
12991453
"oneOf": [
13001454
{
@@ -1306,6 +1460,10 @@
13061460
],
13071461
"description": "Enable calling for Microsoft Teams channel"
13081462
},
1463+
"incomingCallRoute": {
1464+
"type": "string",
1465+
"description": "Webhook for Microsoft Teams channel calls"
1466+
},
13091467
"isEnabled": {
13101468
"oneOf": [
13111469
{
@@ -1450,6 +1608,10 @@
14501608
"type": "string",
14511609
"description": "Group mode for Skype channel"
14521610
},
1611+
"incomingCallRoute": {
1612+
"type": "string",
1613+
"description": "Incoming call route for Skype channel"
1614+
},
14531615
"isEnabled": {
14541616
"oneOf": [
14551617
{
@@ -1674,6 +1836,10 @@
16741836
"WebChatChannel"
16751837
]
16761838
},
1839+
"location": {
1840+
"type": "string",
1841+
"description": "Location of the resource"
1842+
},
16771843
"properties": {
16781844
"oneOf": [
16791845
{
@@ -1684,6 +1850,10 @@
16841850
}
16851851
],
16861852
"description": "The parameters to provide for the Web Chat channel."
1853+
},
1854+
"provisioningState": {
1855+
"type": "string",
1856+
"description": "Provisioning state of the resource"
16871857
}
16881858
},
16891859
"required": [
@@ -1714,7 +1884,7 @@
17141884
"WebChatSite": {
17151885
"type": "object",
17161886
"properties": {
1717-
"enablePreview": {
1887+
"isEnabled": {
17181888
"oneOf": [
17191889
{
17201890
"type": "boolean"
@@ -1723,9 +1893,9 @@
17231893
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17241894
}
17251895
],
1726-
"description": "Whether this site is enabled for preview versions of Webchat"
1896+
"description": "Whether this site is enabled for DirectLine channel"
17271897
},
1728-
"isEnabled": {
1898+
"isWebchatPreviewEnabled": {
17291899
"oneOf": [
17301900
{
17311901
"type": "boolean"
@@ -1734,16 +1904,16 @@
17341904
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17351905
}
17361906
],
1737-
"description": "Whether this site is enabled for DirectLine channel"
1907+
"description": "Whether this site is enabled for preview versions of Webchat"
17381908
},
17391909
"siteName": {
17401910
"type": "string",
17411911
"description": "Site name"
17421912
}
17431913
},
17441914
"required": [
1745-
"enablePreview",
17461915
"isEnabled",
1916+
"isWebchatPreviewEnabled",
17471917
"siteName"
17481918
],
17491919
"description": "A site for the Webchat channel"

0 commit comments

Comments
 (0)