[Hub Generated] Review request for Microsoft.Marketplace to add versi…

…on stable/2020-01-01 (#9123) * addinfg input for swagger to sdk * Fixing lint errors * fixing model validation * R3021 - PathResrouceTypeNameCamelCase fix * fixing semantic * changing name * removing plans from offer * response to arm comments
Azure · Apr 23, 2020 · 24ae6fd · 24ae6fd
1 parent eb16e3b
commit 24ae6fd
Show file tree

Hide file tree

Showing 10 changed files with 196 additions and 163 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
@@ -10,7 +10,7 @@
     "https"
   ],
   "paths": {
-    "/providers/Microsoft.Marketplace/privateStores/{PrivateStoreId}/offers": {
+    "/providers/Microsoft.Marketplace/privateStores/{privateStoreId}/offers": {
       "parameters": [
         {
           "$ref": "#/parameters/PrivateStoreIdParameter"
@@ -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"
@@ -191,7 +191,7 @@
         }
       }
     },
-    "/providers/Microsoft.Marketplace/privateStores/{PrivateStoreId}": {
+    "/providers/Microsoft.Marketplace/privateStores/{privateStoreId}": {
       "parameters": [
         {
           "$ref": "#/parameters/PrivateStoreIdParameter"
@@ -213,7 +213,7 @@
           "200": {
             "description": "OK. The request has succeeded.",
             "schema": {
-              "$ref": "#/definitions/PrivateStoreProperties"
+              "$ref": "#/definitions/PrivateStore"
             }
           },
           "default": {
@@ -272,7 +272,7 @@
             "in": "body",
             "name": "payload",
             "schema": {
-              "$ref": "#/definitions/PrivateStoreProperties"
+              "$ref": "#/definitions/PrivateStore"
             }
           }
         ],
@@ -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": {
@@ -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",
@@ -404,7 +377,7 @@
         "value": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PrivateStoreProperties"
+            "$ref": "#/definitions/PrivateStore"
           }
         },
         "nextLink": {
@@ -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",
@@ -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": {
@@ -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",
@@ -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": {

diff --git a/...resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStore.json b/...resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStore.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "PrivateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
     "api-version": "2020-01-01"
   },
   "responses": {

diff --git a/...rce-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStoreOffer.json b/...rce-manager/Microsoft.Marketplace/stable/2020-01-01/examples/DeletePrivateStoreOffer.json
@@ -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": {

diff --git a/...ce/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStore.json b/...ce/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStore.json
@@ -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\""
+        }
       }
     }
   }

diff --git a/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json b/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json
@@ -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"
+        }
       }
     }
   }