solving s360 issues in MarketplaceOrdering swagger (#15335)

* solving s360 issues in MarketplaceOrdering swagger * Update Agreements.json * Update Agreements.json * Update Agreements.json * Update Agreements.json * Update Agreements.json * Update Agreements.json * Update Agreements.json * Update CancelMarketplaceTerms.json * Update GetAgreementMarketplaceTerms.json * Update GetMarketplaceTerms.json * Update SetMarketplaceTerms.json * Update SignMarketplaceTerms.json * Update SignMarketplaceTerms.json * Update SetMarketplaceTerms.json * Update GetMarketplaceTerms.json * Update GetAgreementMarketplaceTerms.json * Update ListMarketplaceTerms.json * Update Agreements.json * Update Agreements.json * Update readme.md * Update readme.md * Update readme.md
Azure · Aug 5, 2021 · db37dbb · db37dbb
1 parent 111fbce
commit db37dbb
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 11 deletions.
diff --git a/...ordering/resource-manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/Agreements.json b/...ordering/resource-manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/Agreements.json
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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",
@@ -407,6 +457,7 @@
       "description": "Terms properties for provided Publisher/Offer/Plan tuple"
     },
     "AgreementProperties": {
+      "type": "object",
       "properties": {
         "publisher": {
           "type": "string",
@@ -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": {
+          "type": "string",
+          "description": "The details of the error."
+        }
+      }
+    },
     "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
@@ -532,6 +593,7 @@
         },
         "display": {
           "description": "The object that represents the operation.",
+          "type": "object",
           "properties": {
             "provider": {
               "description": "Service provider: Microsoft.MarketplaceOrdering",
@@ -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"
           },
@@ -572,6 +636,7 @@
     },
     "Resource": {
       "description": "ARM resource.",
+      "type": "object",
       "properties": {
         "id": {
           "readOnly": true,

diff --git a/...ager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/CancelMarketplaceTerms.json b/...ager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/CancelMarketplaceTerms.json
@@ -21,6 +21,11 @@
           "state": "Canceled"
         }
       }
+    },
+    "415": {
+      "body": {
+        "Message": "media type unsupported"
+      }
     }
   }
 }
diff --git a/...icrosoft.MarketplaceOrdering/stable/2015-06-01/examples/GetAgreementMarketplaceTerms.json b/...icrosoft.MarketplaceOrdering/stable/2015-06-01/examples/GetAgreementMarketplaceTerms.json
@@ -21,6 +21,11 @@
           "state": "Canceled"
         }
       }
+    },
+    "415": {
+      "body": {
+        "Message": "media type unsupported"
+      }
     }
   }
 }
diff --git a/...manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/GetMarketplaceTerms.json b/...manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/GetMarketplaceTerms.json
@@ -24,6 +24,11 @@
           "accepted": true
         }
       }
+    },
+    "415": {
+      "body": {
+        "Message": "media type unsupported"
+      }
     }
   }
 }
diff --git a/...anager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/ListMarketplaceTerms.json b/...anager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/ListMarketplaceTerms.json
@@ -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"
+      }
     }
   }
 }
diff --git a/...manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/SetMarketplaceTerms.json b/...manager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/SetMarketplaceTerms.json
@@ -37,6 +37,11 @@
           "accepted": true
         }
       }
+    },
+    "415": {
+      "body": {
+        "Message": "media type unsupported"
+      }
     }
   }
 }
diff --git a/...anager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/SignMarketplaceTerms.json b/...anager/Microsoft.MarketplaceOrdering/stable/2015-06-01/examples/SignMarketplaceTerms.json
@@ -21,6 +21,11 @@
           "state": "Canceled"
         }
       }
+    },
+    "415": {
+      "body": {
+        "Message": "media type unsupported"
+      }
     }
   }
 }
diff --git a/specification/marketplaceordering/resource-manager/readme.md b/specification/marketplaceordering/resource-manager/readme.md
@@ -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
 ```