From 8e4e3058fe99ad60910be23703914bb900b39216 Mon Sep 17 00:00:00 2001 From: saviesacov <96383178+saviesacov@users.noreply.github.com> Date: Thu, 14 Jul 2022 08:56:51 +0300 Subject: [PATCH] Marketplace - fix swagger (#19663) * SingleOperation - add id prop * fix approveAllItems & approveAllItemsModifiedAt * fix examples --- .../stable/2022-03-01/Marketplace.json | 8 ++++++-- .../stable/2022-03-01/examples/ApproveAllItems.json | 4 ++-- .../2022-03-01/examples/CreatePrivateStoreCollection.json | 4 ++-- .../2022-03-01/examples/DisableApproveAllItems.json | 4 ++-- .../2022-03-01/examples/GetPrivateStoreCollection.json | 4 ++-- .../examples/GetPrivateStoreCollectionsList.json | 8 ++++---- .../2022-03-01/examples/UpsertOfferWithMultiContext.json | 4 +++- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/Marketplace.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/Marketplace.json index a806c4bf48dd..6e49b508f058 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/Marketplace.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/Marketplace.json @@ -1925,12 +1925,12 @@ "description": "Indicating whether all subscriptions are selected (=true) or not (=false).", "type": "boolean" }, - "allItemsApproved": { + "approveAllItems": { "description": "Indicating whether all items are approved for this collection (=true) or not (=false).", "type": "boolean", "readOnly": true }, - "allItemsApprovedModifiedAt": { + "approveAllItemsModifiedAt": { "description": "Gets the modified date of all items approved.", "format": "date-time", "type": "string", @@ -3230,6 +3230,10 @@ "description": "Microsoft.Marketplace REST API operation", "type": "object", "properties": { + "id": { + "description": "Operation ID", + "type": "string" + }, "name": { "description": "Operation name: {provider}/{resource}/{operation}", "type": "string" diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/ApproveAllItems.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/ApproveAllItems.json index 45df58037775..20de4dd01598 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/ApproveAllItems.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/ApproveAllItems.json @@ -23,8 +23,8 @@ "collectionName": "Global", "claim": "", "allSubscriptions": false, - "allItemsApproved": true, - "allItemsApprovedModifiedAt": "2022-03-07T14:30:58.566Z", + "approveAllItems": true, + "approveAllItemsModifiedAt": "2022-03-07T14:30:58.566Z", "subscriptionsList": [ "57a5024d-2b80-4434-a37a-445e74a032bb", "c4b603f7-4449-4b98-8077-571e17a661c1" diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/CreatePrivateStoreCollection.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/CreatePrivateStoreCollection.json index 0a414c06bdf0..460f4f0712a0 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/CreatePrivateStoreCollection.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/CreatePrivateStoreCollection.json @@ -25,8 +25,8 @@ "collectionName": "Test Collection", "claim": "", "allSubscriptions": false, - "allItemsApproved": false, - "allItemsApprovedModifiedAt": null, + "approveAllItems": false, + "approveAllItemsModifiedAt": null, "subscriptionsList": [ "b340914e-353d-453a-85fb-8f9b65b51f91", "f2baa04d-5bfc-461b-b6d8-61b403c9ec48" diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/DisableApproveAllItems.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/DisableApproveAllItems.json index b6566e6f12dd..80970f8f6073 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/DisableApproveAllItems.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/DisableApproveAllItems.json @@ -23,8 +23,8 @@ "collectionName": "Global", "claim": "", "allSubscriptions": false, - "allItemsApproved": false, - "allItemsApprovedModifiedAt": "2022-03-07T14:30:58.566Z", + "approveAllItems": false, + "approveAllItemsModifiedAt": "2022-03-07T14:30:58.566Z", "subscriptionsList": [ "57a5024d-2b80-4434-a37a-445e74a032bb", "c4b603f7-4449-4b98-8077-571e17a661c1" diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollection.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollection.json index cc9b27c99c8c..f674dfcdda7f 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollection.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollection.json @@ -15,8 +15,8 @@ "collectionName": "Default Collection", "claim": "", "allSubscriptions": true, - "allItemsApproved": false, - "allItemsApprovedModifiedAt": null, + "approveAllItems": false, + "approveAllItemsModifiedAt": null, "subscriptionsList": [], "enabled": true, "numberOfOffers": 1 diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollectionsList.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollectionsList.json index d7098a449b01..5bc6bd920e42 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollectionsList.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/GetPrivateStoreCollectionsList.json @@ -17,8 +17,8 @@ "collectionName": "Default Collection", "claim": "", "allSubscriptions": true, - "allItemsApproved": false, - "allItemsApprovedModifiedAt": null, + "approveAllItems": false, + "approveAllItemsModifiedAt": null, "subscriptionsList": [], "enabled": true, "numberOfOffers": 2 @@ -41,8 +41,8 @@ "collectionName": "Dev collection", "claim": "", "allSubscriptions": false, - "allItemsApproved": true, - "allItemsApprovedModifiedAt": "2022-04-25T07:53:01.9685921Z", + "approveAllItems": true, + "approveAllItemsModifiedAt": "2022-04-25T07:53:01.9685921Z", "subscriptionsList": [ "7c927b63-59cf-4a0f-9d13-41e11f1ddf76" ], diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/UpsertOfferWithMultiContext.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/UpsertOfferWithMultiContext.json index 30d5bb77fecf..2e7525e02df4 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/UpsertOfferWithMultiContext.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2022-03-01/examples/UpsertOfferWithMultiContext.json @@ -41,7 +41,9 @@ "createdAt": "2022-03-05T13:55:33.351Z", "modifiedAt": "2021-04-22T14:17:41.8520203Z", "specificPlanIdsLimitation": [ - "log4file" + "log4db", + "log4file", + "log4web" ], "updateSuppressedDueIdempotence": true, "iconFileUris": {