From a582577d91afb01d2f221f62caaec43726802496 Mon Sep 17 00:00:00 2001 From: MiriBerezin <73054714+MiriBerezin@users.noreply.github.com> Date: Thu, 29 Oct 2020 10:09:29 +0200 Subject: [PATCH] [Hub Generated] Review request for Microsoft.Marketplace to add version stable/2020-01-01 (#11279) * FIxing Privatestore ,Offer properties and examples * Fixing properties types * Fixing camel cases * Add Idempotence to custom-words.txt * prettier check changes * adding description to isGov * resolve conflicts --- custom-words.txt | 3 +- package-lock.json | 14 ++-- .../stable/2020-01-01/Marketplace.json | 81 ++++++++++++++++++- .../examples/GetPrivateStoreOffer.json | 4 +- .../examples/GetPrivateStoreOffers.json | 8 +- .../examples/GetPrivateStorePrivateOffer.json | 4 +- .../GetPrivateStorePrivateOffers.json | 8 +- .../2020-01-01/examples/GetPrivateStores.json | 18 ++++- .../examples/UpdatePrivateStoreOffer.json | 4 +- .../UpdatePrivateStorePrivateOffer.json | 4 +- 10 files changed, 118 insertions(+), 30 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index 70f4f15af657..b5488d4006e0 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1987,4 +1987,5 @@ Appxmanifest msixpackage xml Creds -ssoadfs \ No newline at end of file +ssoadfs +Idempotence \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 47e96443676a..8a7cfb56e070 100644 --- a/package-lock.json +++ b/package-lock.json @@ -382,7 +382,7 @@ "@ts-common/commonmark-to-markdown": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ts-common/commonmark-to-markdown/-/commonmark-to-markdown-1.2.0.tgz", - "integrity": "sha512-xFWpGZN1XzWN0egRs6gcT+tgYYw57us/Xr9euoaTsi9N+UR9ZxnG8Mrt4K/KlB54dNIED/LaGxReqRM5L7tKZA==", + "integrity": "sha1-Gy257ada2oNjbwcopc3sic0D08M=", "dev": true, "requires": { "@ts-common/iterator": "^0.3.0", @@ -408,7 +408,7 @@ "@ts-common/fs": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@ts-common/fs/-/fs-0.2.0.tgz", - "integrity": "sha512-ul1v4ZatcHuAzrwr/hGjSbk37pnfnLYDWC1yMEynQlnV8ndAcIVNYwQPPOYtLADPKTi3y74g5Q4BF3xPurDHLA==", + "integrity": "sha1-FMvf3smooaVjKNr1Ztm8k7iJgrk=", "dev": true, "requires": { "@ts-common/async-iterator": "^0.2.0", @@ -419,7 +419,7 @@ "@ts-common/iterator": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@ts-common/iterator/-/iterator-0.3.6.tgz", - "integrity": "sha512-nNdcleTj3qLlchH17HI/xqOc6sNgOqJ5DdRR0nOEVdJVZCo5bfqoQTu6+Q9ZwMhuETuR2d86MSlmaL2FVHnPjQ==", + "integrity": "sha1-/6FLXYkTxIMKXSMdPssHXQLKfm0=", "dev": true }, "@ts-common/json": { @@ -540,7 +540,7 @@ "@types/mocha": { "version": "5.2.7", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "integrity": "sha1-MV1XDMtWxTRS/4Y4c432BybVtuo=", "dev": true }, "@types/node": { @@ -3008,7 +3008,7 @@ "json-schema-ref-parser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz", - "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==", + "integrity": "sha1-MK80rqtb7gQx2oBdrA6yG1dL9j0=", "dev": true, "requires": { "call-me-maybe": "^1.0.1", @@ -4430,7 +4430,7 @@ "prettier": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "integrity": "sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=", "dev": true }, "process-nextick-args": { @@ -5380,7 +5380,7 @@ "typescript": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", + "integrity": "sha1-yDD2V/k/HqhGgZ6SkJL1/lmD6Xc=", "dev": true }, "uglify-js": { diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json index 03956116190d..97757371d3fa 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json @@ -313,6 +313,12 @@ "schema": { "$ref": "#/definitions/PrivateStoreList" } + }, + "default": { + "description": "Microsoft.Marketplace error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } } }, "x-ms-pageable": { @@ -575,6 +581,37 @@ "eTag": { "description": "Identifier for purposes of race condition", "type": "string" + }, + "privateStoreName": { + "description": "Private Store Name", + "type": "string" + }, + "tenantTag": { + "description": "Tenant Tag", + "type": "string" + }, + "tenantIds": { + "description": "Tenant ids", + "type": "array", + "items": { + "type": "string" + } + }, + "customerTag": { + "description": "Customer tag", + "type": "string" + }, + "hasCommercialAssociation": { + "description": "Indicating whether private store has association with Commercial's Billing Account (through billing account's customer tag retrieved from GSM for a subscription", + "type": "boolean" + }, + "hasMultiTenantAssociation": { + "description": "Indicating whether private store has association with multiple tenants (through tenant's tag retrieved from AAD", + "type": "boolean" + }, + "isGov": { + "description": "Is government", + "type": "boolean" } } }, @@ -636,14 +673,14 @@ "description": "Private store unique id", "type": "string" }, - "createdBy": { + "createdAt": { "readOnly": true, - "description": "Private store offer creator name", + "description": "Private store offer creation date", "type": "string" }, - "createdDate": { + "modifiedAt": { "readOnly": true, - "description": "Private store offer created date", + "description": "Private store offer modification date", "type": "string" }, "specificPlanIdsLimitation": { @@ -652,6 +689,42 @@ "items": { "type": "string" } + }, + "updateSuppressedDueIdempotence": { + "description": "Indicating whether the offer was not updated to db (true = not updated). If the allow list is identical to the existed one in db, the offer would not be updated.", + "type": "string" + }, + "iconFileUris": { + "description": "", + "type": "array", + "items": { + "type": "object", + "$ref": "#/definitions/icon" + } + } + } + }, + "icon": { + "type": "object", + "properties": { + "iconKind": { + "description": "Icon size", + "type": "string", + "enum": [ + "Small", + "Medium", + "Large", + "Wide", + "Hero" + ], + "x-ms-enum": { + "name": "IconKind", + "modelAsString": true + } + }, + "uri": { + "description": "Icon uri", + "type": "string" } } }, diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json index 951260a83750..55764f63f6ee 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json @@ -21,8 +21,8 @@ "0002", "0003" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } } diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json index 2805dbb00d7c..b62d52c95461 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json @@ -23,8 +23,8 @@ "0002", "0003" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } }, { @@ -41,8 +41,8 @@ "0001", "0002" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } ] diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json index fbe2f70fa1d0..fac3820c801e 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json @@ -22,8 +22,8 @@ "0002", "0003" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } } diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json index a0121c34d04d..bae8810b4efd 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json @@ -24,8 +24,8 @@ "0002", "0003" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } }, { @@ -42,8 +42,8 @@ "0001", "0002" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } ] diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json index 16988bb65256..4a05ee8af23a 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json @@ -14,7 +14,13 @@ "properties": { "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406", "availability": "enabled", - "eTag": "\"9301f4fd-0000-0100-0000-5e248b350332\"" + "eTag": "\"9301f4fd-0000-0100-0000-5e248b350332\"", + "tenantIds": [], + "tenantTag": "a02807d4-c5de-4593-b3c1-c46d4a3a56c7", + "customerTag": "", + "hasCommercialAssociation": false, + "hasMultiTenantAssociation": true, + "isGov": false } }, { @@ -24,7 +30,15 @@ "properties": { "privateStoreId": "f4528e55-98c4-4328-8e34-bb7ef7775345", "availability": "disabled", - "eTag": "\"9301f4fd-0000-0100-0000-5e234b350345\"" + "eTag": "\"9301f4fd-0000-0100-0000-5e234b350345\"", + "tenantIds": [ + "f686d426-123a-42db-81b7-ab578e110ccd" + ], + "tenantTag": "", + "customerTag": "ABC", + "hasCommercialAssociation": true, + "hasMultiTenantAssociation": false, + "isGov": false } } ] diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json index 99ce60ce0ad2..3f462c10d6a3 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json @@ -31,8 +31,8 @@ "0001", "0002" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } } diff --git a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json index f5f8f884c2b6..06287f620fe1 100644 --- a/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json +++ b/specification/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json @@ -32,8 +32,8 @@ "0001", "0002" ], - "createdDate": "05/29/2015 5:50", - "createdBy": "test@microsoft.com" + "modifiedAt": "05/29/2015 5:50", + "createdAt": "05/28/2015 5:50" } } }