Update the swagger with ACS prefix (#10566)

vikrampraveen · Vikram Praveen Kumar · web-flow · commit ae55ba1f6923 · 2020-08-24T11:34:57.000-07:00
* Update the swagger with ACS prefix and add a field to SMSDeliveryReportReceivedEventData

* Add ACS prefix to referenced objects

* Update refs

* Add ACSSMS to custom words

Co-authored-by: Vikram Praveen Kumar &lt;vipravee@microsoft.com&gt;
diff --git a/custom-words.txt b/custom-words.txt
@@ -1872,5 +1872,6 @@ watchlists
 Watchlists
 watchlist
 Watchlist
+ACSSMS
 Mibps
 ntfs
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
@@ -7,11 +7,11 @@
   },
   "paths": {},
   "definitions": {
-    "ChatMessageReceivedEventData": {
+    "ACSChatMessageReceivedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceived event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatMessageEventBaseProperties"
+          "$ref": "#/definitions/ACSChatMessageEventBaseProperties"
         }
       ],
       "properties": {
@@ -21,11 +21,11 @@
         }
       }
     },
-    "ChatMessageEditedEventData": {
+    "ACSChatMessageEditedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEdited event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatMessageEventBaseProperties"
+          "$ref": "#/definitions/ACSChatMessageEventBaseProperties"
         }
       ],
       "properties": {
@@ -40,11 +40,11 @@
         }
       }
     },
-    "ChatMessageDeletedEventData": {
+    "ACSChatMessageDeletedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeleted event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatMessageEventBaseProperties"
+          "$ref": "#/definitions/ACSChatMessageEventBaseProperties"
         }
       ],
       "properties": {
@@ -55,11 +55,11 @@
         }
       }
     },
-    "ChatThreadCreatedWithUserEventData": {
+    "ACSChatThreadCreatedWithUserEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatThreadEventBaseProperties"
+          "$ref": "#/definitions/ACSChatThreadEventBaseProperties"
         }
       ],
       "properties": {
@@ -82,16 +82,16 @@
           "description": "The list of properties of users who are part of the thread",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ChatThreadMemberProperties"
+            "$ref": "#/definitions/ACSChatThreadMemberProperties"
           }
         }
       }
     },
-    "ChatThreadWithUserDeletedEventData": {
+    "ACSChatThreadWithUserDeletedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadWithUserDeleted event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatThreadEventBaseProperties"
+          "$ref": "#/definitions/ACSChatThreadEventBaseProperties"
         }
       ],
       "properties": {
@@ -106,11 +106,11 @@
         }
       }
     },
-    "ChatThreadPropertiesUpdatedPerUserEventData": {
+    "ACSChatThreadPropertiesUpdatedPerUserEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatThreadEventBaseProperties"
+          "$ref": "#/definitions/ACSChatThreadEventBaseProperties"
         }
       ],
       "properties": {
@@ -132,11 +132,11 @@
         }
       }
     },
-    "ChatMemberAddedToThreadWithUserEventData": {
+    "ACSChatMemberAddedToThreadWithUserEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberAddedToThreadWithUser event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatThreadEventBaseProperties"
+          "$ref": "#/definitions/ACSChatThreadEventBaseProperties"
         }
       ],
       "properties": {
@@ -151,15 +151,15 @@
         },
         "member": {
           "description": "The details of the user who was added",
-          "$ref": "#/definitions/ChatThreadMemberProperties"
+          "$ref": "#/definitions/ACSChatThreadMemberProperties"
         }
       }
     },
-    "ChatMemberRemovedFromThreadForWithUserEventData": {
-      "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThreadForWithUser event.",
+    "ACSChatMemberRemovedFromThreadWithUserEventData": {
+      "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThreadWithUser event.",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatThreadEventBaseProperties"
+          "$ref": "#/definitions/ACSChatThreadEventBaseProperties"
         }
       ],
       "properties": {
@@ -174,15 +174,15 @@
         },
         "member": {
           "description": "The details of the user who was removed",
-          "$ref": "#/definitions/ChatThreadMemberProperties"
+          "$ref": "#/definitions/ACSChatThreadMemberProperties"
         }
       }
     },
-    "SMSDeliveryReportReceivedEventData": {
+    "ACSSMSDeliveryReportReceivedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.",
       "allOf": [
         {
-          "$ref": "#/definitions/SMSEventBaseProperties"
+          "$ref": "#/definitions/ACSSMSEventBaseProperties"
         }
       ],
       "properties": {
@@ -198,16 +198,21 @@
           "description": "List of details of delivery attempts made",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/SMSDeliveryAttemptProperties"
+            "$ref": "#/definitions/ACSSMSDeliveryAttemptProperties"
           }
+        },
+        "receivedTimestamp": {
+          "description": "The time at which the SMS delivery report was received",
+          "format": "date-time",
+          "type": "string"
         }
       }
     },
-    "SMSReceivedEventData": {
+    "ACSSMSReceivedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSReceived event.",
       "allOf": [
         {
-          "$ref": "#/definitions/SMSEventBaseProperties"
+          "$ref": "#/definitions/ACSSMSEventBaseProperties"
         }
       ],
       "properties": {
@@ -222,11 +227,11 @@
         }
       }
     },
-    "ChatThreadEventBaseProperties": {
+    "ACSChatThreadEventBaseProperties": {
       "description": "Schema of common properties of all chat thread events",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatEventBaseProperties"
+          "$ref": "#/definitions/ACSChatEventBaseProperties"
         }
       ],
       "properties": {
@@ -241,11 +246,11 @@
         }
       }
     },
-    "ChatMessageEventBaseProperties": {
+    "ACSChatMessageEventBaseProperties": {
       "description": "Schema of common properties of all chat message events",
       "allOf": [
         {
-          "$ref": "#/definitions/ChatEventBaseProperties"
+          "$ref": "#/definitions/ACSChatEventBaseProperties"
         }
       ],
       "properties": {
@@ -284,7 +289,7 @@
         }
       }
     },
-    "ChatEventBaseProperties": {
+    "ACSChatEventBaseProperties": {
       "description": "Schema of common properties of all chat events",
       "type": "object",
       "properties": {
@@ -302,7 +307,7 @@
         }
       }
     },
-    "ChatThreadMemberProperties": {
+    "ACSChatThreadMemberProperties": {
       "description": "Schema of the chat thread member",
       "type": "object",
       "properties": {
@@ -316,7 +321,7 @@
         }
       }
     },
-    "SMSEventBaseProperties": {
+    "ACSSMSEventBaseProperties": {
       "description": "Schema of common properties of all SMS events",
       "type": "object",
       "properties": {
@@ -334,7 +339,7 @@
         }
       }
     },
-    "SMSDeliveryAttemptProperties": {
+    "ACSSMSDeliveryAttemptProperties": {
       "description": "Schema for details of a delivery attempt",
       "type": "object",
       "properties": {

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`},`
`8`	`8`	`"paths": {},`
`9`	`9`	`"definitions": {`
`10`		`- "ChatMessageReceivedEventData": {`
	`10`	`+ "ACSChatMessageReceivedEventData": {`
`11`	`11`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceived event.",`
`12`	`12`	`"allOf": [`
`13`	`13`	`{`
`14`		`- "$ref": "#/definitions/ChatMessageEventBaseProperties"`
	`14`	`+ "$ref": "#/definitions/ACSChatMessageEventBaseProperties"`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"properties": {`
`@@ -21,11 +21,11 @@`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`},`
`24`		`- "ChatMessageEditedEventData": {`
	`24`	`+ "ACSChatMessageEditedEventData": {`
`25`	`25`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEdited event.",`
`26`	`26`	`"allOf": [`
`27`	`27`	`{`
`28`		`- "$ref": "#/definitions/ChatMessageEventBaseProperties"`
	`28`	`+ "$ref": "#/definitions/ACSChatMessageEventBaseProperties"`
`29`	`29`	`}`
`30`	`30`	`],`
`31`	`31`	`"properties": {`
`@@ -40,11 +40,11 @@`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`},`
`43`		`- "ChatMessageDeletedEventData": {`
	`43`	`+ "ACSChatMessageDeletedEventData": {`
`44`	`44`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeleted event.",`
`45`	`45`	`"allOf": [`
`46`	`46`	`{`
`47`		`- "$ref": "#/definitions/ChatMessageEventBaseProperties"`
	`47`	`+ "$ref": "#/definitions/ACSChatMessageEventBaseProperties"`
`48`	`48`	`}`
`49`	`49`	`],`
`50`	`50`	`"properties": {`
`@@ -55,11 +55,11 @@`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`},`
`58`		`- "ChatThreadCreatedWithUserEventData": {`
	`58`	`+ "ACSChatThreadCreatedWithUserEventData": {`
`59`	`59`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.",`
`60`	`60`	`"allOf": [`
`61`	`61`	`{`
`62`		`- "$ref": "#/definitions/ChatThreadEventBaseProperties"`
	`62`	`+ "$ref": "#/definitions/ACSChatThreadEventBaseProperties"`
`63`	`63`	`}`
`64`	`64`	`],`
`65`	`65`	`"properties": {`
`@@ -82,16 +82,16 @@`
`82`	`82`	`"description": "The list of properties of users who are part of the thread",`
`83`	`83`	`"type": "array",`
`84`	`84`	`"items": {`
`85`		`- "$ref": "#/definitions/ChatThreadMemberProperties"`
	`85`	`+ "$ref": "#/definitions/ACSChatThreadMemberProperties"`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`},`
`90`		`- "ChatThreadWithUserDeletedEventData": {`
	`90`	`+ "ACSChatThreadWithUserDeletedEventData": {`
`91`	`91`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadWithUserDeleted event.",`
`92`	`92`	`"allOf": [`
`93`	`93`	`{`
`94`		`- "$ref": "#/definitions/ChatThreadEventBaseProperties"`
	`94`	`+ "$ref": "#/definitions/ACSChatThreadEventBaseProperties"`
`95`	`95`	`}`
`96`	`96`	`],`
`97`	`97`	`"properties": {`
`@@ -106,11 +106,11 @@`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`},`
`109`		`- "ChatThreadPropertiesUpdatedPerUserEventData": {`
	`109`	`+ "ACSChatThreadPropertiesUpdatedPerUserEventData": {`
`110`	`110`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event.",`
`111`	`111`	`"allOf": [`
`112`	`112`	`{`
`113`		`- "$ref": "#/definitions/ChatThreadEventBaseProperties"`
	`113`	`+ "$ref": "#/definitions/ACSChatThreadEventBaseProperties"`
`114`	`114`	`}`
`115`	`115`	`],`
`116`	`116`	`"properties": {`
`@@ -132,11 +132,11 @@`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`},`
`135`		`- "ChatMemberAddedToThreadWithUserEventData": {`
	`135`	`+ "ACSChatMemberAddedToThreadWithUserEventData": {`
`136`	`136`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberAddedToThreadWithUser event.",`
`137`	`137`	`"allOf": [`
`138`	`138`	`{`
`139`		`- "$ref": "#/definitions/ChatThreadEventBaseProperties"`
	`139`	`+ "$ref": "#/definitions/ACSChatThreadEventBaseProperties"`
`140`	`140`	`}`
`141`	`141`	`],`
`142`	`142`	`"properties": {`
`@@ -151,15 +151,15 @@`
`151`	`151`	`},`
`152`	`152`	`"member": {`
`153`	`153`	`"description": "The details of the user who was added",`
`154`		`- "$ref": "#/definitions/ChatThreadMemberProperties"`
	`154`	`+ "$ref": "#/definitions/ACSChatThreadMemberProperties"`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`},`
`158`		`- "ChatMemberRemovedFromThreadForWithUserEventData": {`
`159`		`- "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThreadForWithUser event.",`
	`158`	`+ "ACSChatMemberRemovedFromThreadWithUserEventData": {`
	`159`	`+ "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThreadWithUser event.",`
`160`	`160`	`"allOf": [`
`161`	`161`	`{`
`162`		`- "$ref": "#/definitions/ChatThreadEventBaseProperties"`
	`162`	`+ "$ref": "#/definitions/ACSChatThreadEventBaseProperties"`
`163`	`163`	`}`
`164`	`164`	`],`
`165`	`165`	`"properties": {`
`@@ -174,15 +174,15 @@`
`174`	`174`	`},`
`175`	`175`	`"member": {`
`176`	`176`	`"description": "The details of the user who was removed",`
`177`		`- "$ref": "#/definitions/ChatThreadMemberProperties"`
	`177`	`+ "$ref": "#/definitions/ACSChatThreadMemberProperties"`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`},`
`181`		`- "SMSDeliveryReportReceivedEventData": {`
	`181`	`+ "ACSSMSDeliveryReportReceivedEventData": {`
`182`	`182`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.",`
`183`	`183`	`"allOf": [`
`184`	`184`	`{`
`185`		`- "$ref": "#/definitions/SMSEventBaseProperties"`
	`185`	`+ "$ref": "#/definitions/ACSSMSEventBaseProperties"`
`186`	`186`	`}`
`187`	`187`	`],`
`188`	`188`	`"properties": {`
`@@ -198,16 +198,21 @@`
`198`	`198`	`"description": "List of details of delivery attempts made",`
`199`	`199`	`"type": "array",`
`200`	`200`	`"items": {`
`201`		`- "$ref": "#/definitions/SMSDeliveryAttemptProperties"`
	`201`	`+ "$ref": "#/definitions/ACSSMSDeliveryAttemptProperties"`
`202`	`202`	`}`
	`203`	`+ },`
	`204`	`+ "receivedTimestamp": {`
	`205`	`+ "description": "The time at which the SMS delivery report was received",`
	`206`	`+ "format": "date-time",`
	`207`	`+ "type": "string"`
`203`	`208`	`}`
`204`	`209`	`}`
`205`	`210`	`},`
`206`		`- "SMSReceivedEventData": {`
	`211`	`+ "ACSSMSReceivedEventData": {`
`207`	`212`	`"description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSReceived event.",`
`208`	`213`	`"allOf": [`
`209`	`214`	`{`
`210`		`- "$ref": "#/definitions/SMSEventBaseProperties"`
	`215`	`+ "$ref": "#/definitions/ACSSMSEventBaseProperties"`
`211`	`216`	`}`
`212`	`217`	`],`
`213`	`218`	`"properties": {`
`@@ -222,11 +227,11 @@`
`222`	`227`	`}`
`223`	`228`	`}`
`224`	`229`	`},`
`225`		`- "ChatThreadEventBaseProperties": {`
	`230`	`+ "ACSChatThreadEventBaseProperties": {`
`226`	`231`	`"description": "Schema of common properties of all chat thread events",`
`227`	`232`	`"allOf": [`
`228`	`233`	`{`
`229`		`- "$ref": "#/definitions/ChatEventBaseProperties"`
	`234`	`+ "$ref": "#/definitions/ACSChatEventBaseProperties"`
`230`	`235`	`}`
`231`	`236`	`],`
`232`	`237`	`"properties": {`
`@@ -241,11 +246,11 @@`
`241`	`246`	`}`
`242`	`247`	`}`
`243`	`248`	`},`
`244`		`- "ChatMessageEventBaseProperties": {`
	`249`	`+ "ACSChatMessageEventBaseProperties": {`
`245`	`250`	`"description": "Schema of common properties of all chat message events",`
`246`	`251`	`"allOf": [`
`247`	`252`	`{`
`248`		`- "$ref": "#/definitions/ChatEventBaseProperties"`
	`253`	`+ "$ref": "#/definitions/ACSChatEventBaseProperties"`
`249`	`254`	`}`
`250`	`255`	`],`
`251`	`256`	`"properties": {`
`@@ -284,7 +289,7 @@`
`284`	`289`	`}`
`285`	`290`	`}`
`286`	`291`	`},`
`287`		`- "ChatEventBaseProperties": {`
	`292`	`+ "ACSChatEventBaseProperties": {`
`288`	`293`	`"description": "Schema of common properties of all chat events",`
`289`	`294`	`"type": "object",`
`290`	`295`	`"properties": {`
`@@ -302,7 +307,7 @@`
`302`	`307`	`}`
`303`	`308`	`}`
`304`	`309`	`},`
`305`		`- "ChatThreadMemberProperties": {`
	`310`	`+ "ACSChatThreadMemberProperties": {`
`306`	`311`	`"description": "Schema of the chat thread member",`
`307`	`312`	`"type": "object",`
`308`	`313`	`"properties": {`
`@@ -316,7 +321,7 @@`
`316`	`321`	`}`
`317`	`322`	`}`
`318`	`323`	`},`
`319`		`- "SMSEventBaseProperties": {`
	`324`	`+ "ACSSMSEventBaseProperties": {`
`320`	`325`	`"description": "Schema of common properties of all SMS events",`
`321`	`326`	`"type": "object",`
`322`	`327`	`"properties": {`
`@@ -334,7 +339,7 @@`
`334`	`339`	`}`
`335`	`340`	`}`
`336`	`341`	`},`
`337`		`- "SMSDeliveryAttemptProperties": {`
	`342`	`+ "ACSSMSDeliveryAttemptProperties": {`
`338`	`343`	`"description": "Schema for details of a delivery attempt",`
`339`	`344`	`"type": "object",`
`340`	`345`	`"properties": {`