Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hub Generated] Review request for Microsoft.Marketplace to add version stable/2020-01-01 #9123

Merged
merged 8 commits into from
Apr 23, 2020
Merged

[Hub Generated] Review request for Microsoft.Marketplace to add version stable/2020-01-01 #9123

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5c1229
addinfg input for swagger to sdk
olrakovs Apr 18, 2020
ff67ecd
Fixing lint errors
olrakovs Apr 19, 2020
9db0dee
fixing model validation
olrakovs Apr 19, 2020
508a3db
R3021 - PathResrouceTypeNameCamelCase
olrakovs Apr 19, 2020
6ef6ccd
fixing semantic
olrakovs Apr 19, 2020
f1d12c9
changing name
olrakovs Apr 19, 2020
8b52caa
removing plans from offer
olrakovs Apr 20, 2020
d8ed1c5
response to arm comments
olrakovs Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 73 additions & 44 deletions ...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"https"
],
"paths": {
"/providers/Microsoft.Marketplace/privateStores/{PrivateStoreId}/offers": {
"/providers/Microsoft.Marketplace/privateStores/{privateStoreId}/offers": {
"parameters": [
{
"$ref": "#/parameters/PrivateStoreIdParameter"
Expand Down Expand Up @@ -52,13 +52,13 @@
}
}
},
"/providers/Microsoft.Marketplace/privateStores/{PrivateStoreId}/offers/{OfferId}": {
"/providers/Microsoft.Marketplace/privateStores/{privateStoreId}/offers/{offerId}": {
"parameters": [
{
"$ref": "#/parameters/OfferIdPathParameter"
"$ref": "#/parameters/PrivateStoreIdParameter"
},
{
"$ref": "#/parameters/PrivateStoreIdParameter"
"$ref": "#/parameters/OfferIdPathParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
Expand Down Expand Up @@ -133,7 +133,7 @@
"in": "body",
"name": "payload",
"schema": {
"$ref": "#/definitions/Offer"
"$ref": "#/definitions/OfferProperties"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you using OfferProperties instead of Offer on the PUT? This doesn't appear to adhere to the ARM resource contract - we expect the PUT to contain a resource body (name/type/id, properties wrapped in "properties").

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anthony-c-martin , changes were made, please review

}
}
],
Expand Down Expand Up @@ -191,7 +191,7 @@
}
}
},
"/providers/Microsoft.Marketplace/privateStores/{PrivateStoreId}": {
"/providers/Microsoft.Marketplace/privateStores/{privateStoreId}": {
"parameters": [
{
"$ref": "#/parameters/PrivateStoreIdParameter"
Expand All @@ -213,7 +213,7 @@
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/PrivateStoreProperties"
"$ref": "#/definitions/PrivateStore"
}
},
"default": {
Expand Down Expand Up @@ -325,10 +325,11 @@
},
"parameters": {
"PrivateStoreIdParameter": {
"name": "PrivateStoreId",
"name": "privateStoreId",
"in": "path",
"required": true,
"type": "string",
"x-ms-parameter-location": "method",
"description": "The store ID - must use the tenant ID"
},
"ApiVersionParameter": {
Expand All @@ -340,42 +341,14 @@
},
"OfferIdPathParameter": {
"in": "path",
"name": "OfferId",
"name": "offerId",
"type": "string",
"x-ms-parameter-location": "method",
"required": true,
"description": "The offer ID to update or delete"
},
"offerObjectParameter": {
"in": "body",
"name": "offerObject",
"schema": {
"$ref": "#/definitions/offerSkuObject"
}
}
},
"definitions": {
"offerSkuObject": {
"type": "object",
"required": [
"isAvailable"
],
"properties": {
"isAvailable": {
"type": "boolean"
}
}
},
"offerObject": {
"type": "object",
"required": [
"isAvailable"
],
"properties": {
"isAvailable": {
"type": "boolean"
}
}
},
"ErrorResponse": {
"description": "Error response indicates Microsoft.Marketplace service is not able to process the incoming request. The reason is provided in the error message.",
"type": "object",
Expand Down Expand Up @@ -404,7 +377,7 @@
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/PrivateStoreProperties"
"$ref": "#/definitions/PrivateStore"
}
},
"nextLink": {
Expand All @@ -413,6 +386,22 @@
}
}
},
"PrivateStore": {
"description": "The PrivateStore data structure.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/PrivateStoreProperties",
"description": "The PrivateStore data structure.",
"x-ms-client-flatten": true
}
}
},
"PrivateStoreProperties": {
"description": "Describes the json payload on whether or not the private store is enabled for a given tenant",
"type": "object",
Expand Down Expand Up @@ -455,6 +444,22 @@
}
},
"Offer": {
"description": "The privateStore offer data structure.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/OfferProperties",
"description": "The privateStore offer data structure.",
"x-ms-client-flatten": true
}
}
},
"OfferProperties": {
"type": "object",
"properties": {
"uniqueOfferId": {
Expand All @@ -481,12 +486,15 @@
"description": "Private store unique id",
"type": "string"
},
"plans": {
"type": "array",
"createdBy": {
"readOnly": true,
"items": {
"$ref": "#/definitions/Plan"
}
"description": "Private store offer creator name",
"type": "string"
},
"createdDate": {
"readOnly": true,
"description": "Private store offer created date",
"type": "string"
},
"specificPlanIdsLimitation": {
"description": "Plan ids limitation for this offer",
Expand Down Expand Up @@ -560,6 +568,27 @@
"readOnly": true
}
}
},
"Resource": {
"description": "An Azure resource.",
"properties": {
"id": {
"description": "The resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "The name of the resource.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
}
},
"securityDefinitions": {
Expand Down
2 changes: 1 addition & 1 deletion ...resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"PrivateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"api-version": "2020-01-01"
},
"responses": {
Expand Down
4 changes: 2 additions & 2 deletions ...rce-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStoreOffer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"PrivateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"OfferId": "marketplacetestthirdparty.md-test-third-party-2",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"offerId": "marketplacetestthirdparty.md-test-third-party-2",
"api-version": "2020-01-01"
},
"responses": {
Expand Down
13 changes: 9 additions & 4 deletions ...ce/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
"parameters": {
"PrivateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"api-version": "2020-01-01"
},
"responses": {
"200": {
"body": {
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"availability": "enabled",
"eTag": "\"9301f4fd-0000-0100-0000-5e248b350345\""
"id": "/providers/Microsoft.Marketplace/privateStores/a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"type": "Microsoft.Marketplace/privateStores",
"name": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"properties": {
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"availability": "enabled",
"eTag": "\"9301f4fd-0000-0100-0000-5e248b350345\""
}
}
}
}
Expand Down
43 changes: 19 additions & 24 deletions ...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
{
"parameters": {
"PrivateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"OfferId": "marketplacetestthirdparty.md-test-third-party-2",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"offerId": "marketplacetestthirdparty.md-test-third-party-2",
"api-version": "2020-01-01"
},
"responses": {
"200": {
"body": {
"uniqueOfferId": "marketplacetestthirdparty.md-test-third-party-2",
"offerDisplayName": "md-test-third-party-2",
"publisherDisplayName": "Marketplace Test Third Party",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"eTag": "\"9301f4fd-0000-0100-0000-5e248b350000\"",
"specificPlanIdsLimitation": [
"0001",
"0002",
"0003"
],
"plans": [
{
"skuId": "0001",
"planId": "text-iq-deep-concept-analysis",
"planDisplayName": "Text IQ Deep Concept Analysis"
},
{
"skuId": "0002",
"planId": "new-md-sku-4",
"planDisplayName": "New Medic Solution"
}
]
"id": "/providers/Microsoft.Marketplace/privateStores/a0e28e55-90c4-41d8-8e34-bb7ef7775406/offers/marketplacetestthirdparty.md-test-third-party-2",
"type": "Microsoft.Marketplace/privateStores/offers",
"name": "marketplacetestthirdparty.md-test-third-party-2",
"properties": {
"uniqueOfferId": "marketplacetestthirdparty.md-test-third-party-2",
"offerDisplayName": "md-test-third-party-2",
"publisherDisplayName": "Marketplace Test Third Party",
"privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
"eTag": "\"9301f4fd-0000-0100-0000-5e248b350000\"",
"specificPlanIdsLimitation": [
"0001",
"0002",
"0003"
],
"createdDate": "05/29/2015 5:50",
"createdBy": "test@microsoft.com"
}
}
}
}
Expand Down
Loading