Skip to content

Commit 9063c52

Browse files
wwendycWendy Chang
authored and
Leiwang3SQL
committed
Providerhub Correct Sku resource type request body schema (Azure#15964)
* correct sku request body schema * Correct Sku resource type request body schema Co-authored-by: Wendy Chang <wendychang@gmail.com>
1 parent f615a4e commit 9063c52

10 files changed

+160
-144
lines changed

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdate.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
"resourceType": "testResourceType",
77
"sku": "testSku",
88
"properties": {
9-
"skuSettings": [
10-
{
11-
"name": "freeSku",
12-
"tier": "Tier1",
13-
"kind": "Standard"
14-
},
15-
{
16-
"name": "premiumSku",
17-
"tier": "Tier2",
18-
"kind": "Premium",
19-
"costs": [
20-
{
21-
"meterId": "xxx"
22-
}
23-
]
24-
}
25-
]
9+
"properties": {
10+
"skuSettings": [
11+
{
12+
"name": "freeSku",
13+
"tier": "Tier1",
14+
"kind": "Standard"
15+
},
16+
{
17+
"name": "premiumSku",
18+
"tier": "Tier2",
19+
"kind": "Premium",
20+
"costs": [
21+
{
22+
"meterId": "xxx"
23+
}
24+
]
25+
}
26+
]
27+
}
2628
}
2729
},
2830
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,25 @@
77
"sku": "testSku",
88
"nestedResourceTypeFirst": "nestedResourceTypeFirst",
99
"properties": {
10-
"skuSettings": [
11-
{
12-
"name": "freeSku",
13-
"tier": "Tier1",
14-
"kind": "Standard"
15-
},
16-
{
17-
"name": "premiumSku",
18-
"tier": "Tier2",
19-
"kind": "Premium",
20-
"costs": [
21-
{
22-
"meterId": "xxx"
23-
}
24-
]
25-
}
26-
]
10+
"properties": {
11+
"skuSettings": [
12+
{
13+
"name": "freeSku",
14+
"tier": "Tier1",
15+
"kind": "Standard"
16+
},
17+
{
18+
"name": "premiumSku",
19+
"tier": "Tier2",
20+
"kind": "Premium",
21+
"costs": [
22+
{
23+
"meterId": "xxx"
24+
}
25+
]
26+
}
27+
]
28+
}
2729
}
2830
},
2931
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@
88
"nestedResourceTypeFirst": "nestedResourceTypeFirst",
99
"nestedResourceTypeSecond": "nestedResourceTypeSecond",
1010
"properties": {
11-
"skuSettings": [
12-
{
13-
"name": "freeSku",
14-
"tier": "Tier1",
15-
"kind": "Standard"
16-
},
17-
{
18-
"name": "premiumSku",
19-
"tier": "Tier2",
20-
"kind": "Premium",
21-
"costs": [
22-
{
23-
"meterId": "xxx"
24-
}
25-
]
26-
}
27-
]
11+
"properties": {
12+
"skuSettings": [
13+
{
14+
"name": "freeSku",
15+
"tier": "Tier1",
16+
"kind": "Standard"
17+
},
18+
{
19+
"name": "premiumSku",
20+
"tier": "Tier2",
21+
"kind": "Premium",
22+
"costs": [
23+
{
24+
"meterId": "xxx"
25+
}
26+
]
27+
}
28+
]
29+
}
2830
}
2931
},
3032
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,25 @@
99
"nestedResourceTypeSecond": "nestedResourceTypeSecond",
1010
"nestedResourceTypeThird": "nestedResourceTypeThird",
1111
"properties": {
12-
"skuSettings": [
13-
{
14-
"name": "freeSku",
15-
"tier": "Tier1",
16-
"kind": "Standard"
17-
},
18-
{
19-
"name": "premiumSku",
20-
"tier": "Tier2",
21-
"kind": "Premium",
22-
"costs": [
23-
{
24-
"meterId": "xxx"
25-
}
26-
]
27-
}
28-
]
12+
"properties": {
13+
"skuSettings": [
14+
{
15+
"name": "freeSku",
16+
"tier": "Tier1",
17+
"kind": "Standard"
18+
},
19+
{
20+
"name": "premiumSku",
21+
"tier": "Tier2",
22+
"kind": "Premium",
23+
"costs": [
24+
{
25+
"meterId": "xxx"
26+
}
27+
]
28+
}
29+
]
30+
}
2931
}
3032
},
3133
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-05-01-preview/providerhub.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@
13501350
"in": "body",
13511351
"required": true,
13521352
"schema": {
1353-
"$ref": "#/definitions/ResourceTypeSku"
1353+
"$ref": "#/definitions/SkuResource"
13541354
},
13551355
"description": "The required body parameters supplied to the resource sku operation."
13561356
},
@@ -1505,7 +1505,7 @@
15051505
"in": "body",
15061506
"required": true,
15071507
"schema": {
1508-
"$ref": "#/definitions/ResourceTypeSku"
1508+
"$ref": "#/definitions/SkuResource"
15091509
},
15101510
"description": "The required body parameters supplied to the resource sku operation."
15111511
},
@@ -1669,7 +1669,7 @@
16691669
"in": "body",
16701670
"required": true,
16711671
"schema": {
1672-
"$ref": "#/definitions/ResourceTypeSku"
1672+
"$ref": "#/definitions/SkuResource"
16731673
},
16741674
"description": "The required body parameters supplied to the resource sku operation."
16751675
},
@@ -1842,7 +1842,7 @@
18421842
"in": "body",
18431843
"required": true,
18441844
"schema": {
1845-
"$ref": "#/definitions/ResourceTypeSku"
1845+
"$ref": "#/definitions/SkuResource"
18461846
},
18471847
"description": "The required body parameters supplied to the resource sku operation."
18481848
},

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
"resourceType": "testResourceType",
77
"sku": "testSku",
88
"properties": {
9-
"skuSettings": [
10-
{
11-
"name": "freeSku",
12-
"tier": "Tier1",
13-
"kind": "Standard"
14-
},
15-
{
16-
"name": "premiumSku",
17-
"tier": "Tier2",
18-
"kind": "Premium",
19-
"costs": [
20-
{
21-
"meterId": "xxx"
22-
}
23-
]
24-
}
25-
]
9+
"properties": {
10+
"skuSettings": [
11+
{
12+
"name": "freeSku",
13+
"tier": "Tier1",
14+
"kind": "Standard"
15+
},
16+
{
17+
"name": "premiumSku",
18+
"tier": "Tier2",
19+
"kind": "Premium",
20+
"costs": [
21+
{
22+
"meterId": "xxx"
23+
}
24+
]
25+
}
26+
]
27+
}
2628
}
2729
},
2830
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,25 @@
77
"sku": "testSku",
88
"nestedResourceTypeFirst": "nestedResourceTypeFirst",
99
"properties": {
10-
"skuSettings": [
11-
{
12-
"name": "freeSku",
13-
"tier": "Tier1",
14-
"kind": "Standard"
15-
},
16-
{
17-
"name": "premiumSku",
18-
"tier": "Tier2",
19-
"kind": "Premium",
20-
"costs": [
21-
{
22-
"meterId": "xxx"
23-
}
24-
]
25-
}
26-
]
10+
"properties": {
11+
"skuSettings": [
12+
{
13+
"name": "freeSku",
14+
"tier": "Tier1",
15+
"kind": "Standard"
16+
},
17+
{
18+
"name": "premiumSku",
19+
"tier": "Tier2",
20+
"kind": "Premium",
21+
"costs": [
22+
{
23+
"meterId": "xxx"
24+
}
25+
]
26+
}
27+
]
28+
}
2729
}
2830
},
2931
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@
88
"nestedResourceTypeFirst": "nestedResourceTypeFirst",
99
"nestedResourceTypeSecond": "nestedResourceTypeSecond",
1010
"properties": {
11-
"skuSettings": [
12-
{
13-
"name": "freeSku",
14-
"tier": "Tier1",
15-
"kind": "Standard"
16-
},
17-
{
18-
"name": "premiumSku",
19-
"tier": "Tier2",
20-
"kind": "Premium",
21-
"costs": [
22-
{
23-
"meterId": "xxx"
24-
}
25-
]
26-
}
27-
]
11+
"properties": {
12+
"skuSettings": [
13+
{
14+
"name": "freeSku",
15+
"tier": "Tier1",
16+
"kind": "Standard"
17+
},
18+
{
19+
"name": "premiumSku",
20+
"tier": "Tier2",
21+
"kind": "Premium",
22+
"costs": [
23+
{
24+
"meterId": "xxx"
25+
}
26+
]
27+
}
28+
]
29+
}
2830
}
2931
},
3032
"responses": {

‎specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,25 @@
99
"nestedResourceTypeSecond": "nestedResourceTypeSecond",
1010
"nestedResourceTypeThird": "nestedResourceTypeThird",
1111
"properties": {
12-
"skuSettings": [
13-
{
14-
"name": "freeSku",
15-
"tier": "Tier1",
16-
"kind": "Standard"
17-
},
18-
{
19-
"name": "premiumSku",
20-
"tier": "Tier2",
21-
"kind": "Premium",
22-
"costs": [
23-
{
24-
"meterId": "xxx"
25-
}
26-
]
27-
}
28-
]
12+
"properties": {
13+
"skuSettings": [
14+
{
15+
"name": "freeSku",
16+
"tier": "Tier1",
17+
"kind": "Standard"
18+
},
19+
{
20+
"name": "premiumSku",
21+
"tier": "Tier2",
22+
"kind": "Premium",
23+
"costs": [
24+
{
25+
"meterId": "xxx"
26+
}
27+
]
28+
}
29+
]
30+
}
2931
}
3032
},
3133
"responses": {

0 commit comments

Comments
 (0)