Skip to content

Commit e564455

Browse files
authored
[Hub Generated] Review request for Microsoft.Consumption to add version stable/2019-05-01 (#13800)
* Fixed Swagger Validation Errors * Fixed Model Validation
1 parent da67205 commit e564455

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"Budgets"
333333
],
334334
"operationId": "Budgets_CreateOrUpdate",
335-
"description": "The operation to create or update a budget. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.",
335+
"description": "The operation to create or update a budget. You can optionally provide an eTag if desired as a form of concurrency control. To obtain the latest eTag for a given budget, perform a get operation prior to your put operation.",
336336
"externalDocs": {
337337
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
338338
},
@@ -1151,7 +1151,7 @@
11511151
],
11521152
"x-ms-odata": "#/definitions/Forecast",
11531153
"operationId": "Forecasts_List",
1154-
"description": "Lists the forecast charges by subscriptionId.",
1154+
"description": "Lists the forecast charges for scope defined. Please note that this API is no longer actively under development. We recommend using our new Forecast API moving forward: https://docs.microsoft.com/en-us/rest/api/cost-management/forecast/usage.",
11551155
"externalDocs": {
11561156
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
11571157
},
@@ -2360,10 +2360,10 @@
23602360
"description": "Has start and end date of the budget. The start date must be first of the month and should be less than the end date. Budget start date must be on or after June 1, 2017. Future start date should not be more than three months. Past start date should be selected within the timegrain period. There are no restrictions on the end date.",
23612361
"$ref": "#/definitions/BudgetTimePeriod"
23622362
},
2363-
"filters": {
2364-
"description": "May be used to filter budgets by resource group, resource, or meter.",
2363+
"filter": {
2364+
"description": "May be used to filter budgets by user-specified dimensions and/or tags.",
23652365
"type": "object",
2366-
"$ref": "#/definitions/Filters"
2366+
"$ref": "#/definitions/Filter"
23672367
},
23682368
"currentSpend": {
23692369
"description": "The current amount of cost which is being tracked for a budget.",
@@ -2405,8 +2405,8 @@
24052405
"startDate"
24062406
]
24072407
},
2408-
"Filters": {
2409-
"description": "May be used to filter budgets by resource group, resource, or meter.",
2408+
"Filter": {
2409+
"description": "May be used to filter budgets by user-specified dimensions and/or tags.",
24102410
"properties": {
24112411
"resourceGroups": {
24122412
"description": "The list of filters on resource groups, allowed at subscription level only.",
@@ -2492,12 +2492,12 @@
24922492
"format": "decimal"
24932493
},
24942494
"contactEmails": {
2495-
"description": "Email addresses to send the budget notification to when the threshold is exceeded.",
2495+
"description": "Email addresses to send the budget notification to when the threshold is exceeded. Must have at least one contact email or contact group specified at the Subscription or Resource Group scopes. All other scopes must have at least one contact email specified.",
24962496
"type": "array",
24972497
"items": {
24982498
"type": "string"
24992499
},
2500-
"minItems": 1,
2500+
"minItems": 0,
25012501
"maxItems": 50
25022502
},
25032503
"contactRoles": {
@@ -2508,13 +2508,25 @@
25082508
}
25092509
},
25102510
"contactGroups": {
2511-
"description": "Action groups to send the budget notification to when the threshold is exceeded.",
2511+
"description": "Action groups to send the budget notification to when the threshold is exceeded. Must be provided as a fully qualified Azure resource id. Only supported at Subscription or Resource Group scopes.",
25122512
"type": "array",
25132513
"items": {
25142514
"type": "string"
25152515
},
25162516
"minItems": 0,
25172517
"maxItems": 50
2518+
},
2519+
"thresholdType": {
2520+
"description": "The type of threshold",
2521+
"type": "string",
2522+
"enum": [
2523+
"Actual"
2524+
],
2525+
"x-ms-enum": {
2526+
"name": "ThresholdType",
2527+
"modelAsString": true
2528+
},
2529+
"default": "Actual"
25182530
}
25192531
},
25202532
"required": [
@@ -2651,7 +2663,7 @@
26512663
"readOnly": true
26522664
},
26532665
"grain": {
2654-
"description": "The granularity of forecast.",
2666+
"description": "The granularity of forecast. Please note that Yearly is not currently supported in this API. The API will provide responses in the Monthly grain if Yearly is selected. To get yearly grain data, please use our newer Forecast API.",
26552667
"type": "string",
26562668
"enum": [
26572669
"Daily",

specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"startDate": "2017-10-01T00:00:00Z",
2222
"endDate": "2018-10-31T00:00:00Z"
2323
},
24-
"filters": {
24+
"filter": {
2525
"resourceGroups": [
2626
"MPDEVTESTRG"
2727
],

specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"startDate": "2017-10-01T00:00:00Z",
2323
"endDate": "2018-10-31T00:00:00Z"
2424
},
25-
"filters": {
25+
"filter": {
2626
"resourceGroups": [
2727
"MYDEVTESTRG"
2828
],
@@ -94,7 +94,7 @@
9494
"startDate": "2017-10-01T00:00:00Z",
9595
"endDate": "2018-10-31T00:00:00Z"
9696
},
97-
"filters": {
97+
"filter": {
9898
"resourceGroups": [
9999
"MYDEVTESTRG"
100100
],

specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"startDate": "2017-10-01T00:00:00Z",
1616
"endDate": "2018-10-31T00:00:00Z"
1717
},
18-
"filters": {
18+
"filter": {
1919
"resourceGroups": [
2020
"MYDEVTESTRG"
2121
],
@@ -73,7 +73,7 @@
7373
"startDate": "2017-10-01T00:00:00Z",
7474
"endDate": "2018-10-31T00:00:00Z"
7575
},
76-
"filters": {
76+
"filter": {
7777
"resourceGroups": [
7878
"MPDEVTESTRG"
7979
],
@@ -134,7 +134,7 @@
134134
"startDate": "2017-10-01T00:00:00Z",
135135
"endDate": "2018-10-31T00:00:00Z"
136136
},
137-
"filters": {
137+
"filter": {
138138
"resourceGroups": [
139139
"MPDEVTESTRG"
140140
],

0 commit comments

Comments
 (0)