From b9693fc9be6e0d27441d06257e5db0c65b260195 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 10 Nov 2020 23:46:32 -0800 Subject: [PATCH 01/21] fix example --- ...ons_CreateOrUpdateForCustomTopic_WebhookDestination.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/EventSubscriptions_CreateOrUpdateForCustomTopic_WebhookDestination.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/EventSubscriptions_CreateOrUpdateForCustomTopic_WebhookDestination.json index 2fbdb457220b..8ff82a8abfab 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/EventSubscriptions_CreateOrUpdateForCustomTopic_WebhookDestination.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/EventSubscriptions_CreateOrUpdateForCustomTopic_WebhookDestination.json @@ -6,9 +6,9 @@ "eventSubscriptionInfo": { "properties": { "destination": { - "endpointType": "EventHub", + "endpointType": "WebHook", "properties": { - "resourceId": "/subscriptions/55f3dcd4-cac7-43b4-990b-a139d62a1eb2/resourceGroups/TestRG/providers/Microsoft.EventHub/namespaces/ContosoNamespace/eventhubs/EH1" + "endpointUrl": "https://azurefunctionexample.azurewebsites.net/runtime/webhooks/EventGrid?functionName=EventGridTrigger1&code=PASSWORDCODE" } }, "filter": { @@ -25,7 +25,7 @@ "properties": { "destination": { "properties": { - "endpointBaseUrl": "https://requestb.in/15ksip71" + "endpointBaseUrl": "https://azurefunctionexample.azurewebsites.net/runtime/webhooks/EventGrid" }, "endpointType": "WebHook" }, From 69b51d3a1db29398561c3e51444469c01330823e Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 15:21:31 -0800 Subject: [PATCH 02/21] Fix multiple linter and swagger correctness/completeness issues for latest preview and stable api version --- .../preview/2020-04-01-preview/EventGrid.json | 108 +++++++++++++++--- .../preview/2020-10-15-preview/EventGrid.json | 69 ++++++++--- .../stable/2020-06-01/EventGrid.json | 38 ++++-- 3 files changed, 175 insertions(+), 40 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json index 0d0acaba28cb..ef4362f77a8d 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json @@ -163,6 +163,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -619,6 +622,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -1382,6 +1388,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -1816,6 +1825,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -2811,6 +2823,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -4444,6 +4459,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -5176,6 +5194,9 @@ "schema": { "$ref": "#/definitions/ExtensionTopic" } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." } }, "x-ms-examples": { @@ -5378,10 +5399,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -5501,12 +5524,12 @@ "readOnly": true }, "name": { - "description": "Name of the resource", + "description": "Name of the resource.", "type": "string", "readOnly": true }, "type": { - "description": "Type of the resource", + "description": "Type of the resource.", "type": "string", "readOnly": true } @@ -5725,7 +5748,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain." + "description": "The Sku pricing tier for the domain.", + "default": "Basic" }, "identity": { "$ref": "#/definitions/IdentityInfo", @@ -5755,7 +5779,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain." + "description": "The Sku pricing tier for the domain.", + "default": "Basic" } } }, @@ -5773,7 +5798,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -6251,6 +6277,12 @@ "$ref": "#/definitions/EventChannelProperties", "description": "Properties of the EventChannel.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Event Channel resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -6324,6 +6356,7 @@ }, "eventDeliverySchema": { "description": "The event delivery schema for the event subscription.", + "default": "EventGridSchema", "enum": [ "EventGridSchema", "CustomInputSchema", @@ -6337,7 +6370,11 @@ }, "retryPolicy": { "$ref": "#/definitions/RetryPolicy", - "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events." + "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events.", + "default": { + "maxDeliveryAttempts": 30, + "eventTimeToLiveInMinutes": 1440 + } }, "deadLetterDestination": { "$ref": "#/definitions/DeadLetterDestination", @@ -6454,7 +6491,8 @@ "properties": { "endpointUrl": { "description": "The URL that represents the endpoint of the destination of an event subscription.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "endpointBaseUrl": { "description": "The base URL that represents the endpoint of the destination of an event subscription.", @@ -6464,11 +6502,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" }, "azureActiveDirectoryTenantId": { @@ -6700,11 +6740,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" } } @@ -6766,6 +6808,12 @@ "$ref": "#/definitions/EventSubscriptionProperties", "description": "Properties of the event subscription.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Event Subscription resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -6954,6 +7002,12 @@ "$ref": "#/definitions/PartnerNamespaceProperties", "description": "Properties of the partner namespace.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Partner Namespace resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -7110,6 +7164,12 @@ "$ref": "#/definitions/PartnerRegistrationProperties", "description": "Properties of the partner registration.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Partner Registration resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -7300,6 +7360,12 @@ "$ref": "#/definitions/PartnerTopicProperties", "description": "Properties of the partner topic.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Partner Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -7432,11 +7498,11 @@ "type": "string" }, "name": { - "description": "Name of the resource", + "description": "Name of the resource.", "type": "string" }, "type": { - "description": "Type of the resource", + "description": "Type of the resource.", "type": "string" } } @@ -7530,6 +7596,12 @@ "$ref": "#/definitions/SystemTopicProperties", "description": "Properties of the system topic.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to System Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -7628,10 +7700,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -7655,7 +7729,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic." + "description": "The Sku pricing tier for the topic.", + "default": "Basic" }, "identity": { "$ref": "#/definitions/IdentityInfo", @@ -7685,7 +7760,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic." + "description": "The Sku pricing tier for the topic.", + "default": "Basic" } } }, @@ -7703,7 +7779,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -7904,6 +7981,7 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", + "format": "int32", "x-ms-parameter-location": "method" } }, @@ -7918,4 +7996,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index e15fc9d85507..17f56b03a2f2 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -163,6 +163,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -619,6 +622,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -5250,7 +5256,7 @@ } }, "202": { - "description": "Topic regenerate key request accepted." + "description": "Accepted" }, "default": { "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." @@ -5568,10 +5574,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -5915,7 +5923,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain." + "description": "The Sku pricing tier for the domain.", + "default": "Basic" }, "identity": { "$ref": "#/definitions/IdentityInfo", @@ -5945,7 +5954,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain." + "description": "The Sku pricing tier for the domain.", + "default": "Basic" } } }, @@ -5963,7 +5973,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -6579,7 +6590,8 @@ "x-ms-client-flatten": true }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to Event Channel resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -6655,6 +6667,7 @@ }, "eventDeliverySchema": { "description": "The event delivery schema for the event subscription.", + "default": "EventGridSchema", "enum": [ "EventGridSchema", "CustomInputSchema", @@ -6668,7 +6681,11 @@ }, "retryPolicy": { "$ref": "#/definitions/RetryPolicy", - "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events." + "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events.", + "default": { + "maxDeliveryAttempts": 30, + "eventTimeToLiveInMinutes": 1440 + } }, "deadLetterDestination": { "$ref": "#/definitions/DeadLetterDestination", @@ -6789,7 +6806,8 @@ "properties": { "endpointUrl": { "description": "The URL that represents the endpoint of the destination of an event subscription.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "endpointBaseUrl": { "description": "The base URL that represents the endpoint of the destination of an event subscription.", @@ -6799,11 +6817,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" }, "azureActiveDirectoryTenantId": { @@ -7159,11 +7179,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" }, "deliveryAttributeMappings": { @@ -7234,7 +7256,8 @@ "x-ms-client-flatten": true }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to Event Subscription resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -7440,7 +7463,8 @@ "x-ms-client-flatten": true }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to Partner Namespace resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -7601,7 +7625,8 @@ "x-ms-client-flatten": true }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to Partner Registration resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -7800,7 +7825,8 @@ "description": "Identity information for the resource." }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to Partner Topic resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -8039,7 +8065,8 @@ "description": "Identity information for the resource." }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to System Topic resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -8144,10 +8171,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -8185,7 +8214,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic." + "description": "The Sku pricing tier for the topic.", + "default": "Basic" }, "identity": { "$ref": "#/definitions/IdentityInfo", @@ -8231,7 +8261,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic." + "description": "The Sku pricing tier for the topic.", + "default": "Basic" } } }, @@ -8249,7 +8280,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -8462,6 +8494,7 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", + "format": "int32", "x-ms-parameter-location": "method" } }, @@ -8476,4 +8509,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 7a2d45b3710e..1d1afba3cd75 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -163,6 +163,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -619,6 +622,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -1812,6 +1818,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -2804,10 +2813,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -3116,7 +3127,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -3852,11 +3864,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" } } @@ -3918,6 +3932,12 @@ "$ref": "#/definitions/EventSubscriptionProperties", "description": "Properties of the event subscription.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Event Subscription resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -4084,11 +4104,11 @@ "type": "string" }, "name": { - "description": "Name of the resource", + "description": "Name of the resource.", "type": "string" }, "type": { - "description": "Type of the resource", + "description": "Type of the resource.", "type": "string" } } @@ -4198,10 +4218,12 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", + "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -4257,7 +4279,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -4479,6 +4502,7 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", + "format": "int32", "x-ms-parameter-location": "method" } }, @@ -4493,4 +4517,4 @@ } } } -} +} \ No newline at end of file From 6cdf8992f237b899b0098573475d43e43c4a492f Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 15:34:36 -0800 Subject: [PATCH 03/21] Fix format --- .../preview/2020-04-01-preview/EventGrid.json | 4 ++-- .../preview/2020-10-15-preview/EventGrid.json | 2 +- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json index ef4362f77a8d..4d503680915a 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json @@ -7981,7 +7981,7 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", - "format": "int32", + "format": "int32", "x-ms-parameter-location": "method" } }, @@ -7996,4 +7996,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 17f56b03a2f2..9e7f1c78a357 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -8509,4 +8509,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 1d1afba3cd75..67412e8cdae3 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -4517,4 +4517,4 @@ } } } -} \ No newline at end of file +} From 0ad8a2b49beadc7145647a06c64fe4e996da2801 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 15:44:41 -0800 Subject: [PATCH 04/21] fix examples --- .../preview/2020-04-01-preview/examples/DomainTopics_Delete.json | 1 + .../preview/2020-04-01-preview/examples/Domains_Delete.json | 1 + .../examples/PrivateEndpointConnections_Delete.json | 1 + .../preview/2020-04-01-preview/examples/SystemTopics_Delete.json | 1 + .../preview/2020-04-01-preview/examples/Topics_Delete.json | 1 + .../preview/2020-10-15-preview/examples/DomainTopics_Delete.json | 1 + .../preview/2020-10-15-preview/examples/Domains_Delete.json | 1 + .../preview/2020-10-15-preview/examples/Topics_Delete.json | 1 + .../stable/2020-06-01/examples/DomainTopics_Delete.json | 1 + .../stable/2020-06-01/examples/Domains_Delete.json | 1 + .../2020-06-01/examples/PrivateEndpointConnections_Delete.json | 1 + .../stable/2020-06-01/examples/Topics_Delete.json | 1 + 12 files changed, 12 insertions(+) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/DomainTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/DomainTopics_Delete.json index 2f7779e09554..5be4e21b3bfe 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/DomainTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/DomainTopics_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Domains_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Domains_Delete.json index a963710c69a0..3712305de1f9 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Domains_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Domains_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json index 0b9b52011235..36d43209a66c 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json @@ -8,6 +8,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopics_Delete.json index 2bab4abe8b38..606afc866672 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopics_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json index 8ad5954e6073..a4ec2fa6ff08 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/DomainTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/DomainTopics_Delete.json index 89d58d738ea7..0613729b83f6 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/DomainTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/DomainTopics_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-10-15-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Domains_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Domains_Delete.json index 4719e9db481e..ae3239e3feee 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Domains_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Domains_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-10-15-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json index 6789edce1a7c..eb4ebb848ecb 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-10-15-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json index 2f7779e09554..5be4e21b3bfe 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json index a963710c69a0..3712305de1f9 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json index 0b9b52011235..36d43209a66c 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json @@ -8,6 +8,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json index 8ad5954e6073..a4ec2fa6ff08 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } From 2b135a091c69ad7b7cca07ec2ad7bb9e143ea555 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 16:01:30 -0800 Subject: [PATCH 05/21] fix validation model errors --- .../2020-04-01-preview/examples/PartnerNamespaces_Delete.json | 1 + .../examples/PartnerTopicEventSubscriptions_Delete.json | 1 + .../examples/PrivateEndpointConnections_Delete.json | 1 - .../examples/SystemTopicEventSubscriptions_Delete.json | 1 + .../preview/2020-04-01-preview/examples/Topics_Delete.json | 1 - .../2020-06-01/examples/PrivateEndpointConnections_Delete.json | 1 - .../stable/2020-06-01/examples/Topics_Delete.json | 1 - 7 files changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerNamespaces_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerNamespaces_Delete.json index 0705701a6575..4aa99e8d5351 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerNamespaces_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerNamespaces_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerTopicEventSubscriptions_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerTopicEventSubscriptions_Delete.json index 542fabb75ef6..625919571387 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerTopicEventSubscriptions_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PartnerTopicEventSubscriptions_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json index 36d43209a66c..0b9b52011235 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/PrivateEndpointConnections_Delete.json @@ -8,7 +8,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopicEventSubscriptions_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopicEventSubscriptions_Delete.json index 2c6bf3ea129c..f595913a4e04 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopicEventSubscriptions_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/SystemTopicEventSubscriptions_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json index a4ec2fa6ff08..8ad5954e6073 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/examples/Topics_Delete.json @@ -6,7 +6,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json index 36d43209a66c..0b9b52011235 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/PrivateEndpointConnections_Delete.json @@ -8,7 +8,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json index a4ec2fa6ff08..8ad5954e6073 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json @@ -6,7 +6,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } From a35eabb8437ac20aab4fc8ecf2742574de70973e Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 16:10:16 -0800 Subject: [PATCH 06/21] fix validation model errors --- .../stable/2020-06-01/examples/Topics_Delete.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json index 8ad5954e6073..a4ec2fa6ff08 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } From ca308175687886d8043b2269dca67913de3b5511 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 16:38:02 -0800 Subject: [PATCH 07/21] fix example --- .../preview/2020-10-15-preview/examples/Topics_Delete.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json index eb4ebb848ecb..6789edce1a7c 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/examples/Topics_Delete.json @@ -6,7 +6,6 @@ "api-version": "2020-10-15-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } From abdb2eab6c8e07c228875f457d76cf13f4d4ba73 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 17:41:00 -0800 Subject: [PATCH 08/21] remove default --- .../preview/2020-04-01-preview/EventGrid.json | 2 -- .../preview/2020-10-15-preview/EventGrid.json | 2 -- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 2 -- 3 files changed, 6 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json index 4d503680915a..6601e5d2c990 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json @@ -5404,7 +5404,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -7705,7 +7704,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 9e7f1c78a357..7891605a8202 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -5579,7 +5579,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -8176,7 +8175,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 67412e8cdae3..99fd00843c39 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -2818,7 +2818,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" @@ -4223,7 +4222,6 @@ }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", - "default": [], "type": "array", "items": { "$ref": "#/definitions/InboundIpRule" From 633673474aafc219fef0c6481bb6076427496072 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Mon, 1 Feb 2021 18:02:00 -0800 Subject: [PATCH 09/21] revert 2020-06 changes --- .../stable/2020-06-01/EventGrid.json | 34 ++++--------------- .../examples/DomainTopics_Delete.json | 1 - .../2020-06-01/examples/Domains_Delete.json | 1 - .../2020-06-01/examples/Topics_Delete.json | 1 - 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 99fd00843c39..7a2d45b3710e 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -163,9 +163,6 @@ } ], "responses": { - "200": { - "description": "OK" - }, "202": { "description": "Accepted" }, @@ -622,9 +619,6 @@ } ], "responses": { - "200": { - "description": "OK" - }, "202": { "description": "Accepted" }, @@ -1818,9 +1812,6 @@ } ], "responses": { - "200": { - "description": "OK" - }, "202": { "description": "Accepted" }, @@ -2813,8 +2804,7 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - }, - "default": "Enabled" + } }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -3126,8 +3116,7 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - }, - "default": "Enabled" + } }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -3863,13 +3852,11 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", - "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", - "default": 64, "type": "integer" } } @@ -3931,12 +3918,6 @@ "$ref": "#/definitions/EventSubscriptionProperties", "description": "Properties of the event subscription.", "x-ms-client-flatten": true - }, - "systemData": { - "description": "The system metadata relating to Event Subscription resource.", - "type": "object", - "readOnly": true, - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -4103,11 +4084,11 @@ "type": "string" }, "name": { - "description": "Name of the resource.", + "description": "Name of the resource", "type": "string" }, "type": { - "description": "Type of the resource.", + "description": "Type of the resource", "type": "string" } } @@ -4217,8 +4198,7 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - }, - "default": "Enabled" + } }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -4277,8 +4257,7 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - }, - "default": "Enabled" + } }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -4500,7 +4479,6 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", - "format": "int32", "x-ms-parameter-location": "method" } }, diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json index 5be4e21b3bfe..2f7779e09554 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json @@ -7,7 +7,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json index 3712305de1f9..a963710c69a0 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json @@ -6,7 +6,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json index a4ec2fa6ff08..8ad5954e6073 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Topics_Delete.json @@ -6,7 +6,6 @@ "api-version": "2020-04-01-preview" }, "responses": { - "200": {}, "202": {}, "204": {} } From 4ffba9d2a15683afbbcdabd407c0abd31ca4fcc4 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 19:19:17 -0800 Subject: [PATCH 10/21] fix eventgrid swagger file with multiple linter and correctness fixes --- .../preview/2020-10-15-preview/EventGrid.json | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 7891605a8202..2c7401d65d12 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -2076,9 +2076,9 @@ "EventSubscriptions_ListGlobalBySubscription": { "$ref": "./examples/EventSubscriptions_ListGlobalBySubscription.json" } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + "x-ms-pageable": { + "nextLinkName": "nextLink" + } } } }, @@ -5928,6 +5928,12 @@ "identity": { "$ref": "#/definitions/IdentityInfo", "description": "Identity information for the resource." + }, + "systemData": { + "description": "The system metadata relating to Domain resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -6063,6 +6069,12 @@ "$ref": "#/definitions/DomainTopicProperties", "description": "Properties of the Domain Topic.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Domain Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -6680,11 +6692,7 @@ }, "retryPolicy": { "$ref": "#/definitions/RetryPolicy", - "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events.", - "default": { - "maxDeliveryAttempts": 30, - "eventTimeToLiveInMinutes": 1440 - } + "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events." }, "deadLetterDestination": { "$ref": "#/definitions/DeadLetterDestination", @@ -6754,11 +6762,13 @@ "maxDeliveryAttempts": { "format": "int32", "description": "Maximum number of delivery retry attempts for events.", + "default": 30, "type": "integer" }, "eventTimeToLiveInMinutes": { "format": "int32", "description": "Time To Live (in minutes) for events.", + "default": 1440, "type": "integer" } } @@ -8064,8 +8074,7 @@ "description": "Identity information for the resource." }, "systemData": { - "description": "The system metadata relating to System Topic resource.", - "type": "object", + "description": "The system metadata relating to this resource.", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -8234,6 +8243,12 @@ "extendedLocation": { "$ref": "#/definitions/ExtendedLocation", "description": "Extended location of the resource." + }, + "systemData": { + "description": "The system metadata relating to Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -8507,4 +8522,4 @@ } } } -} +} \ No newline at end of file From a4d76efec90c81a13ae6dbeed30fd58baa1f3c63 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 20:31:59 -0800 Subject: [PATCH 11/21] fix 2020-06-01 stable swagger --- .../stable/2020-06-01/EventGrid.json | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 7a2d45b3710e..d4f56ca92371 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -163,6 +163,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -619,6 +622,9 @@ } ], "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted" }, @@ -1774,6 +1780,9 @@ "x-ms-examples": { "Topics_CreateOrUpdate": { "$ref": "./examples/Topics_CreateOrUpdate.json" + }, + "Topics_CreateOrUpdateForAzureArc": { + "$ref": "./examples/Topics_CreateOrUpdateForAzureArc.json" } }, "x-ms-long-running-operation": true @@ -2100,6 +2109,9 @@ "$ref": "#/definitions/TopicSharedAccessKeys" } }, + "202": { + "description": "Accepted" + }, "default": { "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." } @@ -2108,7 +2120,8 @@ "Topics_RegenerateKey": { "$ref": "./examples/Topics_RegenerateKey.json" } - } + }, + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/{parentType}/{parentName}/privateEndpointConnections/{privateEndpointConnectionName}": { @@ -2601,13 +2614,13 @@ "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." } }, - "x-ms-pageable": { - "nextLinkName": null - }, "x-ms-examples": { "Topics_ListEventTypes": { "$ref": "./examples/Topics_ListEventTypes.json" } + }, + "x-ms-pageable": { + "nextLinkName": null } } }, @@ -2804,7 +2817,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -3081,6 +3095,12 @@ "$ref": "#/definitions/DomainProperties", "description": "Properties of the domain.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Domain resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -3116,7 +3136,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -3206,6 +3227,12 @@ "$ref": "#/definitions/DomainTopicProperties", "description": "Properties of the Domain Topic.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Domain Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -3275,6 +3302,7 @@ }, "eventDeliverySchema": { "description": "The event delivery schema for the event subscription.", + "default": "EventGridSchema", "enum": [ "EventGridSchema", "CustomInputSchema", @@ -3336,11 +3364,13 @@ "maxDeliveryAttempts": { "format": "int32", "description": "Maximum number of delivery retry attempts for events.", + "default": 30, "type": "integer" }, "eventTimeToLiveInMinutes": { "format": "int32", "description": "Time To Live (in minutes) for events.", + "default": 1440, "type": "integer" } } @@ -3351,7 +3381,8 @@ "properties": { "endpointUrl": { "description": "The URL that represents the endpoint of the destination of an event subscription.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "endpointBaseUrl": { "description": "The base URL that represents the endpoint of the destination of an event subscription.", @@ -3361,11 +3392,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" }, "azureActiveDirectoryTenantId": { @@ -3852,11 +3885,13 @@ "maxEventsPerBatch": { "format": "int32", "description": "Maximum number of events per batch.", + "default": 1, "type": "integer" }, "preferredBatchSizeInKilobytes": { "format": "int32", "description": "Preferred batch size in Kilobytes.", + "default": 64, "type": "integer" } } @@ -3918,6 +3953,12 @@ "$ref": "#/definitions/EventSubscriptionProperties", "description": "Properties of the event subscription.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Event Subscription resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, @@ -4084,11 +4125,11 @@ "type": "string" }, "name": { - "description": "Name of the resource", + "description": "Name of the resource.", "type": "string" }, "type": { - "description": "Type of the resource", + "description": "Type of the resource.", "type": "string" } } @@ -4198,7 +4239,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -4222,6 +4264,12 @@ "$ref": "#/definitions/TopicProperties", "description": "Properties of the topic.", "x-ms-client-flatten": true + }, + "systemData": { + "description": "The system metadata relating to Topic resource.", + "type": "object", + "readOnly": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } }, From 73fdf74b2915f19b45b635b5304cb67a1fd00c65 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 20:35:14 -0800 Subject: [PATCH 12/21] fix 2020-06-01 stable swagger -- part 2 --- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index d4f56ca92371..fd6b8d130285 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -4305,7 +4305,8 @@ "x-ms-enum": { "name": "PublicNetworkAccess", "modelAsString": true - } + }, + "default": "Enabled" }, "inboundIpRules": { "description": "This can be used to restrict traffic from specific IPs instead of all IPs. Note: These are considered only if PublicNetworkAccess is enabled.", @@ -4527,6 +4528,7 @@ "description": "The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page.", "required": false, "type": "integer", + "format": "int32", "x-ms-parameter-location": "method" } }, From 95330367cbfdc2499774575958192ada1fe69bf8 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 20:40:25 -0800 Subject: [PATCH 13/21] fix format --- .../preview/2020-10-15-preview/EventGrid.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 2c7401d65d12..a1c6a6d1f4e6 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -2075,7 +2075,7 @@ "x-ms-examples": { "EventSubscriptions_ListGlobalBySubscription": { "$ref": "./examples/EventSubscriptions_ListGlobalBySubscription.json" - } + }, "x-ms-pageable": { "nextLinkName": "nextLink" } From a9183e28becd44a9a30175a336e049e52d159e5e Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 20:52:06 -0800 Subject: [PATCH 14/21] fix prettier check --- .../preview/2020-10-15-preview/EventGrid.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index a1c6a6d1f4e6..4d3aa29c97e7 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -8522,4 +8522,4 @@ } } } -} \ No newline at end of file +} From db1705fce3f25fbfde6ab60565dd4b41b06e6419 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 21:01:58 -0800 Subject: [PATCH 15/21] additional format fix --- .../preview/2020-10-15-preview/EventGrid.json | 6 +++--- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 4d3aa29c97e7..26f15c99ca60 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -2075,10 +2075,10 @@ "x-ms-examples": { "EventSubscriptions_ListGlobalBySubscription": { "$ref": "./examples/EventSubscriptions_ListGlobalBySubscription.json" - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index fd6b8d130285..fd16aa6c7a9e 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -1780,9 +1780,6 @@ "x-ms-examples": { "Topics_CreateOrUpdate": { "$ref": "./examples/Topics_CreateOrUpdate.json" - }, - "Topics_CreateOrUpdateForAzureArc": { - "$ref": "./examples/Topics_CreateOrUpdateForAzureArc.json" } }, "x-ms-long-running-operation": true From 588bfc0ed9c5cd5005467651ab374a130082d420 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 16 Feb 2021 22:48:52 -0800 Subject: [PATCH 16/21] fix examples and wrong response code --- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 3 --- .../stable/2020-06-01/examples/DomainTopics_Delete.json | 1 + .../stable/2020-06-01/examples/Domains_Delete.json | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index fd16aa6c7a9e..28cfb574780c 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -2106,9 +2106,6 @@ "$ref": "#/definitions/TopicSharedAccessKeys" } }, - "202": { - "description": "Accepted" - }, "default": { "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json index 2f7779e09554..5be4e21b3bfe 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/DomainTopics_Delete.json @@ -7,6 +7,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json index a963710c69a0..3712305de1f9 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/examples/Domains_Delete.json @@ -6,6 +6,7 @@ "api-version": "2020-04-01-preview" }, "responses": { + "200": {}, "202": {}, "204": {} } From cc1be5bb4dd0eed51fe9ee8360253cbeaf50fa4b Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Wed, 17 Feb 2021 09:52:29 -0800 Subject: [PATCH 17/21] fix validator --- .../preview/2020-04-01-preview/EventGrid.json | 6 +----- .../preview/2020-10-15-preview/EventGrid.json | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json index 6601e5d2c990..eed457c77241 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json @@ -6369,11 +6369,7 @@ }, "retryPolicy": { "$ref": "#/definitions/RetryPolicy", - "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events.", - "default": { - "maxDeliveryAttempts": 30, - "eventTimeToLiveInMinutes": 1440 - } + "description": "The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events." }, "deadLetterDestination": { "$ref": "#/definitions/DeadLetterDestination", diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 26f15c99ca60..36956f7dd4fd 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -5959,8 +5959,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain.", - "default": "Basic" + "description": "The Sku pricing tier for the domain." } } }, @@ -8274,8 +8273,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic.", - "default": "Basic" + "description": "The Sku pricing tier for the topic." } } }, From 109ed6d84b83890fc24936a506cbb1c1316b367e Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Wed, 17 Feb 2021 10:01:23 -0800 Subject: [PATCH 18/21] fix validator --- .../preview/2020-04-01-preview/EventGrid.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json index eed457c77241..be2a6d7513ab 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json @@ -5778,8 +5778,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain.", - "default": "Basic" + "description": "The Sku pricing tier for the domain." } } }, @@ -7754,8 +7753,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic.", - "default": "Basic" + "description": "The Sku pricing tier for the topic." } } }, From 8c0b7fc9730b2454ed924928a7cf7629d2adfcdd Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 2 Mar 2021 12:24:05 -0800 Subject: [PATCH 19/21] fix remaining swagger correctness issues --- .../preview/2020-10-15-preview/EventGrid.json | 19 ++++++++++++------- .../stable/2020-06-01/EventGrid.json | 5 ++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index 36956f7dd4fd..e1967a6139b7 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -5959,7 +5959,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain." + "description": "The Sku pricing tier for the domain.", + "default": "Basic" } } }, @@ -6048,6 +6049,7 @@ "Failed" ], "type": "string", + "readOnly": true, "x-ms-enum": { "name": "DomainTopicProvisioningState", "modelAsString": true @@ -6067,6 +6069,7 @@ "properties": { "$ref": "#/definitions/DomainTopicProperties", "description": "Properties of the Domain Topic.", + "readOnly": true, "x-ms-client-flatten": true }, "systemData": { @@ -6078,18 +6081,18 @@ } }, "DomainTopicsListResult": { - "description": "Result of the List Domain Topics operation", + "description": "Result of the List Domain Topics operation.", "type": "object", "properties": { "value": { - "description": "A collection of Domain Topics", + "description": "A collection of Domain Topics.", "type": "array", "items": { "$ref": "#/definitions/DomainTopic" } }, "nextLink": { - "description": "A link for the next page of domain topics", + "description": "A link for the next page of domain topics.", "type": "string" } } @@ -8073,7 +8076,8 @@ "description": "Identity information for the resource." }, "systemData": { - "description": "The system metadata relating to this resource.", + "description": "The system metadata relating to System Topic resource.", + "type": "object", "readOnly": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } @@ -8273,7 +8277,8 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic." + "description": "The Sku pricing tier for the topic.", + "default": "Basic" } } }, @@ -8520,4 +8525,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 28cfb574780c..64e81227cbb6 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -3189,6 +3189,7 @@ "DomainTopicProperties": { "description": "Properties of the Domain Topic.", "type": "object", + "readOnly": true, "properties": { "provisioningState": { "description": "Provisioning state of the domain topic.", @@ -3201,6 +3202,7 @@ "Failed" ], "type": "string", + "readOnly": true, "x-ms-enum": { "name": "DomainTopicProvisioningState", "modelAsString": true @@ -3220,6 +3222,7 @@ "properties": { "$ref": "#/definitions/DomainTopicProperties", "description": "Properties of the Domain Topic.", + "readOnly": true, "x-ms-client-flatten": true }, "systemData": { @@ -4537,4 +4540,4 @@ } } } -} +} \ No newline at end of file From 2dbc1a542a758c8be3d529b4505931df41f8b2ae Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 2 Mar 2021 12:26:49 -0800 Subject: [PATCH 20/21] fix end of file --- .../preview/2020-10-15-preview/EventGrid.json | 2 +- .../Microsoft.EventGrid/stable/2020-06-01/EventGrid.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index e1967a6139b7..caf0574d7edd 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -8525,4 +8525,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json index 64e81227cbb6..1d4ce90c5b95 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json @@ -4540,4 +4540,4 @@ } } } -} \ No newline at end of file +} From 70c0dc500901caf75709da80b17a1177f4233b89 Mon Sep 17 00:00:00 2001 From: Ashraf Hamad Date: Tue, 2 Mar 2021 13:16:39 -0800 Subject: [PATCH 21/21] fix lintter --- .../preview/2020-10-15-preview/EventGrid.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json index caf0574d7edd..04ca2960b7c1 100644 --- a/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json +++ b/specification/eventgrid/resource-manager/Microsoft.EventGrid/preview/2020-10-15-preview/EventGrid.json @@ -5959,8 +5959,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the domain.", - "default": "Basic" + "description": "The Sku pricing tier for the domain." } } }, @@ -8277,8 +8276,7 @@ }, "sku": { "$ref": "#/definitions/ResourceSku", - "description": "The Sku pricing tier for the topic.", - "default": "Basic" + "description": "The Sku pricing tier for the topic." } } },