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.

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

solving s360 issues in MarketplaceOrdering swagger #15335

Merged
merged 23 commits into from
Aug 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@
"$ref": "#/definitions/AgreementTerms"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -122,6 +129,13 @@
"$ref": "#/definitions/AgreementTerms"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -150,6 +164,13 @@
"$ref": "#/definitions/OperationListResult"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -195,6 +216,13 @@
"$ref": "#/definitions/OldAgreementTerms"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -237,6 +265,13 @@
"$ref": "#/definitions/OldAgreementTerms"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -279,6 +314,13 @@
"$ref": "#/definitions/OldAgreementTerms"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -312,6 +354,13 @@
"$ref": "#/definitions/AgreementTermsList"
}
},
"415": {
"description": "Unsupported Media Type",
"x-ms-error-response": true,
"schema": {
"$ref": "#/definitions/UnsupportedMediaTypeErrorResponse"
}
},
"default": {
"description": "Microsoft.MarketplaceOrdering error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -386,12 +435,13 @@
"description": "The value of the array.",
"type": "array",
"items": {
"$ref": "#/definitions/AgreementTerms"
"$ref": "#/definitions/OldAgreementTerms"
}
}
}
},
"AgreementTerms": {
"type": "object",
"properties": {
"properties": {
"$ref": "#/definitions/AgreementProperties",
Expand All @@ -407,6 +457,7 @@
"description": "Terms properties for provided Publisher/Offer/Plan tuple"
},
"AgreementProperties": {
"type": "object",
"properties": {
"publisher": {
"type": "string",
Expand Down Expand Up @@ -500,20 +551,30 @@
},
"description": "Old Agreement Terms definition"
},
"UnsupportedMediaTypeErrorResponse": {
"description": "Error response that indicates the media type in the request is unsupported.",
"type": "object",
"properties": {
"Message": {
alkigel marked this conversation as resolved.
Show resolved Hide resolved
"type": "string",
"description": "The details of the error."
}
}
},
alkigel marked this conversation as resolved.
Show resolved Hide resolved
"ErrorResponse": {
"description": "Error response indicates Microsoft.MarketplaceOrdering service is not able to process the incoming request. The reason is provided in the error message.",
"type": "object",
"properties": {
"Error": {
"error": {
"type": "object",
"description": "The details of the error.",
"properties": {
"Code": {
"code": {
"description": "Error code.",
"type": "string",
"readOnly": true
},
"Message": {
"message": {
"description": "Error message indicating why the operation failed.",
"type": "string",
"readOnly": true
Expand All @@ -532,6 +593,7 @@
},
"display": {
"description": "The object that represents the operation.",
"type": "object",
"properties": {
"provider": {
"description": "Service provider: Microsoft.MarketplaceOrdering",
Expand All @@ -555,9 +617,11 @@
},
"OperationListResult": {
"description": "Result of the request to list MarketplaceOrdering operations. It contains a list of operations and a URL link to get the next set of results.",
"type": "object",
"properties": {
"value": {
"type": "array",
"uniqueItems": false,
"items": {
"$ref": "#/definitions/Operation"
},
Expand All @@ -572,6 +636,7 @@
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"state": "Canceled"
}
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"state": "Canceled"
}
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"accepted": true
}
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,19 @@
"type": "Microsoft.MarketplaceOrdering/offertypes",
"properties": {
"publisher": "pubid",
"product": "offid",
"plan": "planid",
"licenseTextLink": "test.licenseLink",
"privacyPolicyLink": "test.privacyPolicyLink",
"retrieveDatetime": "2017-08-15T11:33:07.12132Z",
"signature": "ASDFSDAFWEFASDGWERLWER",
"accepted": true
"offer": "offid",
"signDate": "2019-04-26T05:57:25.3013164Z",
"cancelDate": "2019-04-27T05:57:25.3013164Z",
"state": "Active"
}
}
]
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
"accepted": true
}
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"state": "Canceled"
}
}
},
"415": {
"body": {
"Message": "media type unsupported"
}
}
}
}
5 changes: 5 additions & 0 deletions specification/marketplaceordering/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ These settings apply only when `--tag=package-2015-06-01` is specified on the co
``` yaml $(tag) == 'package-2015-06-01'
input-file:
- Microsoft.MarketplaceOrdering/stable/2015-06-01/Agreements.json
directive:
# suppress each RPC 3016 error
- where: $.definitions.UnsupportedMediaTypeErrorResponse.properties.Message
suppress: R3016
reason: This requires a change in code thats in production for several years
```


Expand Down