From d67b3a40f5ad5b5da94279326ee01eb7e3348619 Mon Sep 17 00:00:00 2001 From: Prema Grandhi Date: Fri, 12 Mar 2021 15:10:59 -0800 Subject: [PATCH 1/4] Adding CallRecording event to ACS Eventgrid Schema and adding tag field to SMSDeliveryReportReceived event --- .../AzureCommunicationServices.json | 85 ++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 1836a22c9559..107ee1c2e800 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -9,6 +9,7 @@ "definitions": { "AcsChatMessageReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceived event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -23,6 +24,7 @@ }, "AcsChatMessageReceivedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceivedInThread event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -37,6 +39,7 @@ }, "AcsChatMessageEditedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEdited event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -56,6 +59,7 @@ }, "AcsChatMessageEditedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEditedInThread event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -75,6 +79,7 @@ }, "AcsChatMessageDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeleted event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -90,6 +95,7 @@ }, "AcsChatMessageDeletedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeletedInThread event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -105,6 +111,7 @@ }, "AcsChatThreadCreatedWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -133,6 +140,7 @@ }, "AcsChatThreadCreatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreated event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -161,6 +169,7 @@ }, "AcsChatThreadWithUserDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadWithUserDeleted event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -180,6 +189,7 @@ }, "AcsChatThreadDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadDeleted event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -199,6 +209,7 @@ }, "AcsChatThreadPropertiesUpdatedPerUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -225,6 +236,7 @@ }, "AcsChatThreadPropertiesUpdatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdated event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -251,6 +263,7 @@ }, "AcsChatParticipantAddedToThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThreadWithUser event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -274,6 +287,7 @@ }, "AcsChatParticipantRemovedFromThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThreadWithUser event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -297,6 +311,7 @@ }, "AcsChatParticipantAddedToThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThread event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -325,6 +340,7 @@ }, "AcsChatParticipantRemovedFromThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThread event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -353,6 +369,7 @@ }, "AcsSmsDeliveryReportReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsSmsEventBaseProperties" @@ -378,11 +395,16 @@ "description": "The time at which the SMS delivery report was received", "format": "date-time", "type": "string" + }, + "tag": { + "description": "Customer Content", + "type": "string" } } }, "AcsSmsReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSReceived event.", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsSmsEventBaseProperties" @@ -400,8 +422,34 @@ } } }, + "AcsRecordingFileStatusUpdatedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.RecordingFileStatusUpdated event.", + "type": "object", + "properties": { + "recordingStorageInfo": { + "description": "The details of recording storage information", + "$ref": "#/definitions/AcsRecordingStorageInfoProperties", + "type": "object" + }, + "recordingStartTime": { + "description": "The time at which the recording started", + "format": "date-time", + "type": "string" + }, + "recordingDurationMs": { + "description": "The recording duration in milliseconds", + "format":"int64", + "type": "integer" + }, + "sessionEndReason": { + "description": "The reason for ending recording session", + "type": "string" + } + } + }, "AcsChatThreadEventBaseProperties": { "description": "Schema of common properties of all chat thread events", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventBaseProperties" @@ -422,6 +470,7 @@ }, "AcsChatThreadEventInThreadBaseProperties": { "description": "Schema of common properties of all chat thread events", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -442,6 +491,7 @@ }, "AcsChatMessageEventBaseProperties": { "description": "Schema of common properties of all chat message events", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventBaseProperties" @@ -478,6 +528,7 @@ }, "AcsChatMessageEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat message events", + "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -590,6 +641,38 @@ "type": "integer" } } - } + }, + "AcsRecordingStorageInfoProperties": { + "description": "Schema for all properties for Recording Storage Ino properties.", + "type": "object", + "properties": { + "recordingChunks": { + "description": "List of details of recording chunks information", + "type": "array", + "items": { + "$ref": "#/definitions/AcsRecordingChunkInfoProperties" + } + } + } + }, + "AcsRecordingChunkInfoProperties": { + "description": "Schema for all properties for Recording Storage Ino properties.", + "type": "object", + "properties": { + "documentId": { + "description": "The documentId of the recording chunk", + "type": "string" + }, + "index": { + "description": "The index of the recording chunk", + "type": "integer", + "format": "int64" + }, + "endReason": { + "description": "The reason for ending the recording chunk", + "type":"string" + } + } + } } } From b47c9122d721568599c1835117b32fe1cb0c026d Mon Sep 17 00:00:00 2001 From: Prema Grandhi Date: Fri, 12 Mar 2021 15:57:12 -0800 Subject: [PATCH 2/4] Prettier run fix --- .../stable/2018-01-01/AzureCommunicationServices.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 107ee1c2e800..046f3d18ab34 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -438,7 +438,7 @@ }, "recordingDurationMs": { "description": "The recording duration in milliseconds", - "format":"int64", + "format": "int64", "type": "integer" }, "sessionEndReason": { @@ -446,7 +446,7 @@ "type": "string" } } - }, + }, "AcsChatThreadEventBaseProperties": { "description": "Schema of common properties of all chat thread events", "type": "object", @@ -654,7 +654,7 @@ } } } - }, + }, "AcsRecordingChunkInfoProperties": { "description": "Schema for all properties for Recording Storage Ino properties.", "type": "object", @@ -670,9 +670,9 @@ }, "endReason": { "description": "The reason for ending the recording chunk", - "type":"string" + "type": "string" } } - } + } } } From 67555f4ab0a7936433d9d4cfb4f904719338d363 Mon Sep 17 00:00:00 2001 From: Prema Grandhi Date: Fri, 12 Mar 2021 16:13:46 -0800 Subject: [PATCH 3/4] Removing breakchanges caused by type:object --- .../AzureCommunicationServices.json | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 046f3d18ab34..50bb525a1688 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -9,7 +9,6 @@ "definitions": { "AcsChatMessageReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceived event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -24,7 +23,6 @@ }, "AcsChatMessageReceivedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceivedInThread event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -39,7 +37,6 @@ }, "AcsChatMessageEditedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEdited event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -59,7 +56,6 @@ }, "AcsChatMessageEditedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEditedInThread event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -79,7 +75,6 @@ }, "AcsChatMessageDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeleted event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventBaseProperties" @@ -95,7 +90,6 @@ }, "AcsChatMessageDeletedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeletedInThread event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" @@ -111,7 +105,6 @@ }, "AcsChatThreadCreatedWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -140,7 +133,6 @@ }, "AcsChatThreadCreatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreated event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -169,7 +161,6 @@ }, "AcsChatThreadWithUserDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadWithUserDeleted event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -189,7 +180,6 @@ }, "AcsChatThreadDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadDeleted event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -209,7 +199,6 @@ }, "AcsChatThreadPropertiesUpdatedPerUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -236,7 +225,6 @@ }, "AcsChatThreadPropertiesUpdatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdated event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" @@ -263,7 +251,6 @@ }, "AcsChatParticipantAddedToThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThreadWithUser event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -287,7 +274,6 @@ }, "AcsChatParticipantRemovedFromThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThreadWithUser event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatThreadEventBaseProperties" @@ -311,7 +297,6 @@ }, "AcsChatParticipantAddedToThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThread event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -340,7 +325,6 @@ }, "AcsChatParticipantRemovedFromThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThread event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -369,7 +353,6 @@ }, "AcsSmsDeliveryReportReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsSmsEventBaseProperties" @@ -404,7 +387,6 @@ }, "AcsSmsReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSReceived event.", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsSmsEventBaseProperties" @@ -424,7 +406,6 @@ }, "AcsRecordingFileStatusUpdatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.RecordingFileStatusUpdated event.", - "type": "object", "properties": { "recordingStorageInfo": { "description": "The details of recording storage information", @@ -449,7 +430,6 @@ }, "AcsChatThreadEventBaseProperties": { "description": "Schema of common properties of all chat thread events", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventBaseProperties" @@ -470,7 +450,6 @@ }, "AcsChatThreadEventInThreadBaseProperties": { "description": "Schema of common properties of all chat thread events", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -491,7 +470,6 @@ }, "AcsChatMessageEventBaseProperties": { "description": "Schema of common properties of all chat message events", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventBaseProperties" @@ -528,7 +506,6 @@ }, "AcsChatMessageEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat message events", - "type": "object", "allOf": [ { "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" @@ -565,7 +542,6 @@ }, "AcsChatEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat events", - "type": "object", "properties": { "threadId": { "description": "The chat thread id", @@ -575,7 +551,6 @@ }, "AcsChatEventBaseProperties": { "description": "Schema of common properties of all chat events", - "type": "object", "properties": { "recipientCommunicationIdentifier": { "description": "The communication identifier of the target user", @@ -593,7 +568,6 @@ }, "AcsChatThreadParticipantProperties": { "description": "Schema of the chat thread participant", - "type": "object", "properties": { "displayName": { "description": "The name of the user", @@ -607,7 +581,6 @@ }, "AcsSmsEventBaseProperties": { "description": "Schema of common properties of all SMS events", - "type": "object", "properties": { "messageId": { "description": "The identity of the SMS message", @@ -625,7 +598,6 @@ }, "AcsSmsDeliveryAttemptProperties": { "description": "Schema for details of a delivery attempt", - "type": "object", "properties": { "timestamp": { "description": "TimeStamp when delivery was attempted", @@ -644,7 +616,6 @@ }, "AcsRecordingStorageInfoProperties": { "description": "Schema for all properties for Recording Storage Ino properties.", - "type": "object", "properties": { "recordingChunks": { "description": "List of details of recording chunks information", @@ -657,7 +628,6 @@ }, "AcsRecordingChunkInfoProperties": { "description": "Schema for all properties for Recording Storage Ino properties.", - "type": "object", "properties": { "documentId": { "description": "The documentId of the recording chunk", From ffbba79cf85ae022bf3465d894ebab991bef5de4 Mon Sep 17 00:00:00 2001 From: Prema Grandhi Date: Fri, 12 Mar 2021 16:37:16 -0800 Subject: [PATCH 4/4] Removing breakchanges caused by type:object --- .../stable/2018-01-01/AzureCommunicationServices.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 50bb525a1688..de6017c5b246 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -542,6 +542,7 @@ }, "AcsChatEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat events", + "type": "object", "properties": { "threadId": { "description": "The chat thread id", @@ -551,6 +552,7 @@ }, "AcsChatEventBaseProperties": { "description": "Schema of common properties of all chat events", + "type": "object", "properties": { "recipientCommunicationIdentifier": { "description": "The communication identifier of the target user", @@ -568,6 +570,7 @@ }, "AcsChatThreadParticipantProperties": { "description": "Schema of the chat thread participant", + "type": "object", "properties": { "displayName": { "description": "The name of the user", @@ -581,6 +584,7 @@ }, "AcsSmsEventBaseProperties": { "description": "Schema of common properties of all SMS events", + "type": "object", "properties": { "messageId": { "description": "The identity of the SMS message", @@ -598,6 +602,7 @@ }, "AcsSmsDeliveryAttemptProperties": { "description": "Schema for details of a delivery attempt", + "type": "object", "properties": { "timestamp": { "description": "TimeStamp when delivery was attempted", @@ -615,7 +620,8 @@ } }, "AcsRecordingStorageInfoProperties": { - "description": "Schema for all properties for Recording Storage Ino properties.", + "description": "Schema for all properties of Recording Storage Information.", + "type": "object", "properties": { "recordingChunks": { "description": "List of details of recording chunks information", @@ -627,7 +633,8 @@ } }, "AcsRecordingChunkInfoProperties": { - "description": "Schema for all properties for Recording Storage Ino properties.", + "description": "Schema for all properties of Recording Chunk Information.", + "type": "object", "properties": { "documentId": { "description": "The documentId of the recording chunk",