From 04faa0dda5d0c187b9fb485e3b8068e778cfccaf Mon Sep 17 00:00:00 2001 From: DorothySun216 <55454966+DorothySun216@users.noreply.github.com> Date: Tue, 17 Nov 2020 11:19:53 -0800 Subject: [PATCH 1/4] draft for schema changes --- .../stable/2018-01-01/ServiceBus.json | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json index aff94fc9f773..7e2b2d52f5d6 100644 --- a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +++ b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json @@ -1,7 +1,7 @@ { - "swagger": "2.0", + "swagger": "3.0", "info": { - "version": "2018-01-01", + "version": "2020-11-01", "title": "Schema of Azure ServiceBus Messaging events published to Azure Event Grid", "description": "Describes the schema of the Azure ServiceBus Messaging events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent." }, @@ -66,6 +66,66 @@ "type": "string" } } + }, + "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + }, + "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } } } } From 179ff1dd17eea2f27c73b2a6d89662a93323ecde Mon Sep 17 00:00:00 2001 From: DorothySun216 <55454966+DorothySun216@users.noreply.github.com> Date: Tue, 17 Nov 2020 11:25:33 -0800 Subject: [PATCH 2/4] Revert "draft for schema changes" This reverts commit 04faa0dda5d0c187b9fb485e3b8068e778cfccaf. --- .../stable/2018-01-01/ServiceBus.json | 64 +------------------ 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json index 7e2b2d52f5d6..aff94fc9f773 100644 --- a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +++ b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json @@ -1,7 +1,7 @@ { - "swagger": "3.0", + "swagger": "2.0", "info": { - "version": "2020-11-01", + "version": "2018-01-01", "title": "Schema of Azure ServiceBus Messaging events published to Azure Event Grid", "description": "Describes the schema of the Azure ServiceBus Messaging events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent." }, @@ -66,66 +66,6 @@ "type": "string" } } - }, - "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } - }, - "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } } } } From 549a175356936b49f0d310dd45259e10ac320a55 Mon Sep 17 00:00:00 2001 From: DorothySun216 <55454966+DorothySun216@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:26:24 -0800 Subject: [PATCH 3/4] schema change --- .../stable/2020-12-03/ServiceBus.json | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json diff --git a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json new file mode 100644 index 000000000000..d33cf55f2b81 --- /dev/null +++ b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json @@ -0,0 +1,131 @@ +{ + "swagger": "3.0", + "info": { + "version": "2020-12-03", + "title": "Schema of Azure ServiceBus Messaging events published to Azure Event Grid", + "description": "Describes the schema of the Azure ServiceBus Messaging events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent." + }, + "paths": {}, + "definitions": { + "ServiceBusActiveMessagesAvailableWithNoListenersEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailableWithNoListeners event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + }, + "ServiceBusDeadletterMessagesAvailableWithNoListenersEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListenersEvent event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + }, + "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + }, + "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + } + } +} From a3fd91391efd1cea30545d2218ea983c3e868cc8 Mon Sep 17 00:00:00 2001 From: DorothySun216 <55454966+DorothySun216@users.noreply.github.com> Date: Thu, 3 Dec 2020 15:31:19 -0800 Subject: [PATCH 4/4] modify existing swagger --- .../stable/2018-01-01/ServiceBus.json | 60 ++++++++ .../stable/2020-12-03/ServiceBus.json | 131 ------------------ 2 files changed, 60 insertions(+), 131 deletions(-) delete mode 100644 specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json diff --git a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json index aff94fc9f773..241997f6d1cd 100644 --- a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +++ b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json @@ -66,6 +66,66 @@ "type": "string" } } + }, + "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } + }, + "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData": { + "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event.", + "type": "object", + "properties": { + "namespaceName": { + "description": "The namespace name of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "requestUri": { + "description": "The endpoint of the Microsoft.ServiceBus resource.", + "type": "string" + }, + "entityType": { + "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", + "type": "string" + }, + "queueName": { + "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", + "type": "string" + }, + "topicName": { + "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + }, + "subscriptionName": { + "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", + "type": "string" + } + } } } } diff --git a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json b/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json deleted file mode 100644 index d33cf55f2b81..000000000000 --- a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2020-12-03/ServiceBus.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "swagger": "3.0", - "info": { - "version": "2020-12-03", - "title": "Schema of Azure ServiceBus Messaging events published to Azure Event Grid", - "description": "Describes the schema of the Azure ServiceBus Messaging events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent." - }, - "paths": {}, - "definitions": { - "ServiceBusActiveMessagesAvailableWithNoListenersEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailableWithNoListeners event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } - }, - "ServiceBusDeadletterMessagesAvailableWithNoListenersEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListenersEvent event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } - }, - "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } - }, - "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData": { - "description": "Schema of the Data property of an EventGridEvent for a Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications event.", - "type": "object", - "properties": { - "namespaceName": { - "description": "The namespace name of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "requestUri": { - "description": "The endpoint of the Microsoft.ServiceBus resource.", - "type": "string" - }, - "entityType": { - "description": "The entity type of the Microsoft.ServiceBus resource. Could be one of 'queue' or 'subscriber'.", - "type": "string" - }, - "queueName": { - "description": "The name of the Microsoft.ServiceBus queue. If the entity type is of type 'subscriber', then this value will be null.", - "type": "string" - }, - "topicName": { - "description": "The name of the Microsoft.ServiceBus topic. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - }, - "subscriptionName": { - "description": "The name of the Microsoft.ServiceBus topic's subscription. If the entity type is of type 'queue', then this value will be null.", - "type": "string" - } - } - } - } -}