fixing some cosmetic issues (Azure#12952)

* fixing some cosmetic issues * Fix: change Operation to SingleOperation * adding lenient-model-deduplication to fix deplication schema issue
mkarmark · Jul 20, 2021 · e048c1e · e048c1e
1 parent f65d821
commit e048c1e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 85 deletions.
diff --git a/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json b/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json
@@ -31,9 +31,6 @@
         ],
         "operationId": "PrivateStoreOffers_List",
         "description": "Get a list of all private offers in the given private store",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "OK",
@@ -76,9 +73,6 @@
         ],
         "operationId": "PrivateStorePrivateOffers_List",
         "description": "Get a list of all private offers in the given private store",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "OK",
@@ -144,9 +138,6 @@
         ],
         "operationId": "PrivateStoreOffer_Get",
         "description": "Gets information about a specific offer.",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "Offer information retrieved",
@@ -173,12 +164,6 @@
         ],
         "operationId": "PrivateStoreOffer_CreateOrUpdate",
         "description": "Update or add an offer to the default collection of the private store.",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "in": "body",
@@ -203,8 +188,8 @@
           }
         },
         "x-ms-examples": {
-          "UpdatePrivateStoreOffer": {
-            "$ref": "./examples/UpdatePrivateStoreOffer.json"
+          "PrivateStoreOffer_update": {
+            "$ref": "./examples/PrivateStoreOffer_update.json"
           }
         }
       },
@@ -214,9 +199,6 @@
         ],
         "operationId": "PrivateStoreOffer_Post",
         "description": "Delete Private store offer. This is a workaround.",
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "in": "body",
@@ -265,9 +247,6 @@
         ],
         "operationId": "PrivateStorePrivateOffer_Get",
         "description": "Gets information about a specific private offer.",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "Private offer information retrieved",
@@ -294,12 +273,6 @@
         ],
         "operationId": "PrivateStorePrivateOffer_CreateOrUpdate",
         "description": "Update or add a private offer to the default collection of the private store.",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "in": "body",
@@ -324,8 +297,8 @@
           }
         },
         "x-ms-examples": {
-          "UpdatePrivateStoreOffer": {
-            "$ref": "./examples/UpdatePrivateStorePrivateOffer.json"
+          "PrivateStorePrivateOffer_update": {
+            "$ref": "./examples/PrivateStorePrivateOffer_update.json"
           }
         }
       }
@@ -345,9 +318,6 @@
         ],
         "operationId": "PrivateStore_List",
         "description": "Gets the list of available private stores",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "OK. The request has succeeded.",
@@ -387,9 +357,6 @@
         ],
         "operationId": "PrivateStore_Get",
         "description": "Get information about the private store",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "OK. The request has succeeded.",
@@ -416,9 +383,6 @@
         ],
         "operationId": "PrivateStore_Delete",
         "description": "Deletes the private store. All that is not saved will be lost.",
-        "produces": [
-          "application/json"
-        ],
         "responses": {
           "200": {
             "description": "Private store was deleted successfully ."
@@ -442,12 +406,6 @@
         ],
         "operationId": "PrivateStore_CreateOrUpdate",
         "description": "Changes private store properties",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
         "parameters": [
           {
             "in": "body",
@@ -469,8 +427,8 @@
           }
         },
         "x-ms-examples": {
-          "UpdatePrivateStores": {
-            "$ref": "./examples/UpdatePrivateStore.json"
+          "PrivateStores_update": {
+            "$ref": "./examples/PrivateStores_update.json"
           }
         }
       }
@@ -807,7 +765,7 @@
         }
       }
     },
-    "Operation": {
+    "SingleOperation": {
       "description": "Microsoft.Marketplace REST API operation",
       "type": "object",
       "properties": {
@@ -840,7 +798,7 @@
         "value": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Operation"
+            "$ref": "#/definitions/SingleOperation"
           },
           "description": "List of Microsoft.Marketplace operations supported by the Microsoft.Marketplace resource provider."
         },

diff --git a/...-01/examples/UpdatePrivateStoreOffer.json → ...01/examples/PrivateStoreOffer_update.json b/...-01/examples/UpdatePrivateStoreOffer.json → ...01/examples/PrivateStoreOffer_update.json
@@ -3,15 +3,13 @@
     "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
     "offerId": "marketplacetestthirdparty.md-test-third-party-2",
     "api-version": "2020-01-01",
-    "Offer": {
-      "parameters": {
-        "properties": {
-          "specificPlanIdsLimitation": [
-            "0001",
-            "0002"
-          ],
-          "eTag": "\"9301f4fd-0000-0100-0000-5e248b350666\""
-        }
+    "payload": {
+      "properties": {
+        "specificPlanIdsLimitation": [
+          "0001",
+          "0002"
+        ],
+        "eTag": "\"9301f4fd-0000-0100-0000-5e248b350666\""
       }
     }
   },

diff --git a/...mples/UpdatePrivateStorePrivateOffer.json → ...ples/PrivateStorePrivateOffer_update.json b/...mples/UpdatePrivateStorePrivateOffer.json → ...ples/PrivateStorePrivateOffer_update.json
@@ -4,15 +4,13 @@
     "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
     "offerId": "marketplacetestthirdparty.md-test-third-party-pr-2",
     "api-version": "2020-01-01",
-    "Offer": {
-      "parameters": {
-        "properties": {
-          "specificPlanIdsLimitation": [
-            "0001",
-            "0002"
-          ],
-          "eTag": "\"9301f4fd-0000-0100-0000-5e248b350666\""
-        }
+    "payload": {
+      "properties": {
+        "specificPlanIdsLimitation": [
+          "0001",
+          "0002"
+        ],
+        "eTag": "\"9301f4fd-0000-0100-0000-5e248b350666\""
       }
     }
   },

diff --git a/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/PrivateStores_update.json b/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/PrivateStores_update.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "api-version": "2020-01-01",
+    "payload": {
+      "properties": {
+        "availability": "disabled",
+        "eTag": "\"9301f4fd-0000-0100-0000-5e248b350345\""
+      }
+    }
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/...resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStore.json b/...resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStore.json
diff --git a/specification/marketplace/resource-manager/readme.md b/specification/marketplace/resource-manager/readme.md
@@ -95,6 +95,8 @@ csharp:
   namespace: Microsoft.Azure.Management.Marketplace
   output-folder: $(csharp-sdks-folder)/marketplace/Microsoft.Azure.Management.Marketplace/src/Generated
   clear-output-folder: true
+  modelerfour:
+    lenient-model-deduplication: true
 ```
 
 ## AzureResourceSchema