From 0029568a1e8a2d2aff7d7f200836fafbf227f208 Mon Sep 17 00:00:00 2001 From: Wendy Chang Date: Tue, 10 Aug 2021 11:36:30 -0700 Subject: [PATCH 1/2] correct sku request body schema --- .../examples/Skus_CreateOrUpdate.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeFirst.json | 36 ++++++++++--------- ...reateOrUpdateNestedResourceTypeSecond.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeThird.json | 36 ++++++++++--------- .../stable/2020-11-20/providerhub.json | 8 ++--- 5 files changed, 80 insertions(+), 72 deletions(-) diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdate.json index 2f51630de904..be2ec1721c32 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdate.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdate.json @@ -6,23 +6,25 @@ "resourceType": "testResourceType", "sku": "testSku", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json index 27ce14f785b1..651a1ca01828 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json @@ -7,23 +7,25 @@ "sku": "testSku", "nestedResourceTypeFirst": "nestedResourceTypeFirst", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json index 0860d5adff6c..582e67c7f860 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json @@ -8,23 +8,25 @@ "nestedResourceTypeFirst": "nestedResourceTypeFirst", "nestedResourceTypeSecond": "nestedResourceTypeSecond", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json index 374773bb23ab..04f649043d1b 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json @@ -9,23 +9,25 @@ "nestedResourceTypeSecond": "nestedResourceTypeSecond", "nestedResourceTypeThird": "nestedResourceTypeThird", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json index c3c23e46a2ca..d279ec402ff7 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json @@ -1350,7 +1350,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1505,7 +1505,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1669,7 +1669,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1842,7 +1842,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, From 6105d11f817cf3daffb613ca5ce54c140c01e923 Mon Sep 17 00:00:00 2001 From: Wendy Chang Date: Wed, 8 Sep 2021 12:08:59 -0700 Subject: [PATCH 2/2] Correct Sku resource type request body schema --- .../examples/Skus_CreateOrUpdate.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeFirst.json | 36 ++++++++++--------- ...reateOrUpdateNestedResourceTypeSecond.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeThird.json | 36 ++++++++++--------- .../2021-05-01-preview/providerhub.json | 8 ++--- .../examples/Skus_CreateOrUpdate.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeFirst.json | 36 ++++++++++--------- ...reateOrUpdateNestedResourceTypeSecond.json | 36 ++++++++++--------- ...CreateOrUpdateNestedResourceTypeThird.json | 36 ++++++++++--------- .../2021-06-01-preview/providerhub.json | 8 ++--- 10 files changed, 160 insertions(+), 144 deletions(-) diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdate.json index 533c9cb6f3a5..032c9ea18982 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdate.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdate.json @@ -6,23 +6,25 @@ "resourceType": "testResourceType", "sku": "testSku", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json index 5d7547cc8635..88263b39b0eb 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json @@ -7,23 +7,25 @@ "sku": "testSku", "nestedResourceTypeFirst": "nestedResourceTypeFirst", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json index b9cf4a378af2..b9836d682bef 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json @@ -8,23 +8,25 @@ "nestedResourceTypeFirst": "nestedResourceTypeFirst", "nestedResourceTypeSecond": "nestedResourceTypeSecond", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json index d9b98accd3a3..05a2a27cc2d7 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json @@ -9,23 +9,25 @@ "nestedResourceTypeSecond": "nestedResourceTypeSecond", "nestedResourceTypeThird": "nestedResourceTypeThird", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/providerhub.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/providerhub.json index 9ae7b2354f13..515e08f3afff 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/providerhub.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/providerhub.json @@ -1350,7 +1350,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1505,7 +1505,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1669,7 +1669,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1842,7 +1842,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json index 9962b47bacb4..61c4554085d7 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json @@ -6,23 +6,25 @@ "resourceType": "testResourceType", "sku": "testSku", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json index 144031b9da8f..db56a55bd1cc 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json @@ -7,23 +7,25 @@ "sku": "testSku", "nestedResourceTypeFirst": "nestedResourceTypeFirst", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json index c9bbd2a2e45a..17b1308be651 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json @@ -8,23 +8,25 @@ "nestedResourceTypeFirst": "nestedResourceTypeFirst", "nestedResourceTypeSecond": "nestedResourceTypeSecond", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json index fbb79b66259b..b95472072e07 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json @@ -9,23 +9,25 @@ "nestedResourceTypeSecond": "nestedResourceTypeSecond", "nestedResourceTypeThird": "nestedResourceTypeThird", "properties": { - "skuSettings": [ - { - "name": "freeSku", - "tier": "Tier1", - "kind": "Standard" - }, - { - "name": "premiumSku", - "tier": "Tier2", - "kind": "Premium", - "costs": [ - { - "meterId": "xxx" - } - ] - } - ] + "properties": { + "skuSettings": [ + { + "name": "freeSku", + "tier": "Tier1", + "kind": "Standard" + }, + { + "name": "premiumSku", + "tier": "Tier2", + "kind": "Premium", + "costs": [ + { + "meterId": "xxx" + } + ] + } + ] + } } }, "responses": { diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json index 4695d71164b8..fdc8fe63601a 100644 --- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json +++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json @@ -1350,7 +1350,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1505,7 +1505,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1669,7 +1669,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." }, @@ -1842,7 +1842,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ResourceTypeSku" + "$ref": "#/definitions/SkuResource" }, "description": "The required body parameters supplied to the resource sku operation." },