Skip to content

Commit

Permalink
Adding fixes made in 2019-10-01 to 2019-11-01 (#13414)
Browse files Browse the repository at this point in the history 
The PR for adding new version 2019-11-01 took longer than expected to be
approved, so some fixes made in 10-01 were not included in 2019-11-01
version.

The missing changes were the following PRs:
#12777
#12555
#13039
#13097
#12822
#13280
#12942
#13248
#13378

This PR is to add those corrections to 2019-11-01 version
  • Loading branch information
@Lira-tron
Lira-tron authored Mar 16, 2021
1 parent 8f96985 commit 7e76220
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 5 deletions.
120 changes: 117 additions & 3 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/HighCasedErrorResponse"
}
}
}
Expand Down Expand Up @@ -2350,7 +2350,7 @@
"readOnly": true
},
"productIdentifier": {
"description": "Identifier for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SKuId in partner center.",
"description": "Identifier for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SkuId in partner center.",
"type": "string",
"readOnly": true
},
Expand Down Expand Up @@ -2440,6 +2440,12 @@
"description": "Flag to indicate if partner earned credit has been applied or not.",
"type": "string",
"readOnly": true
},
"payGPrice": {
"description": "Retail price for the resource.",
"type": "number",
"format": "decimal",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -2515,6 +2521,11 @@
"type": "string",
"readOnly": true
},
"additionalInfo": {
"description": "Additional information.",
"type": "string",
"readOnly": true
},
"orderNumber": {
"description": "The order number.",
"type": "string",
Expand Down Expand Up @@ -3003,6 +3014,10 @@
"type": "string",
"description": "Resource sku"
},
"etag": {
"type": "string",
"description": "Resource etag."
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ReservationRecommendationDetailsProperties",
Expand Down Expand Up @@ -3208,6 +3223,11 @@
"description": "The link (url) to the next page of results.",
"type": "string",
"readOnly": true
},
"previousLink": {
"description": "The link (url) to the previous page of results.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -3295,6 +3315,11 @@
"format": "uuid",
"readOnly": true
},
"resourceType": {
"description": "The azure resource type.",
"type": "string",
"readOnly": true
},
"term": {
"description": "RI recommendations in one or three year terms.",
"type": "string",
Expand Down Expand Up @@ -3383,9 +3408,15 @@
"ModernReservationRecommendationProperties": {
"description": "The properties of the reservation recommendation.",
"properties": {
"location": {
"type": "string",
"description": "Resource Location.",
"readOnly": true
},
"lookBackPeriod": {
"description": "The number of days of usage to look back for recommendation.",
"type": "string",
"type": "integer",
"format": "int32",
"readOnly": true
},
"instanceFlexibilityRatio": {
Expand Down Expand Up @@ -3458,6 +3489,11 @@
"$ref": "#/definitions/SkuProperty"
},
"readOnly": true
},
"skuName": {
"description": "This is the ARM Sku name.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -3814,6 +3850,13 @@
"key": {
"description": "Tag key.",
"type": "string"
},
"value": {
"description": "Tag values.",
"type": "array",
"items": {
"type": "string"
}
}
}
},
Expand Down Expand Up @@ -3908,6 +3951,11 @@
"$ref": "#/definitions/Notification"
},
"maxItems": 5
},
"forecastSpend": {
"description": "The forecasted cost which is being tracked for a budget.",
"$ref": "#/definitions/ForecastSpend",
"readOnly": true
}
},
"required": [
Expand Down Expand Up @@ -4022,6 +4070,22 @@
}
}
},
"ForecastSpend": {
"description": "The forecasted cost which is being tracked for a budget.",
"properties": {
"amount": {
"description": "The forecasted cost for the total time period which is being tracked by the budget. This value is only provided if the budget contains a forecast alert type.",
"type": "number",
"format": "decimal",
"readOnly": true
},
"unit": {
"description": "The unit of measure for the budget amount.",
"type": "string",
"readOnly": true
}
}
},
"Notification": {
"description": "The notification associated with a budget.",
"properties": {
Expand Down Expand Up @@ -4123,6 +4187,26 @@
"description": "The link (url) to the next page of results.",
"type": "string",
"readOnly": true
},
"download": {
"description": "Pricesheet download details.",
"$ref": "#/definitions/MeterDetails",
"readOnly": true
}
}
},
"DownloadProperties": {
"description": "The properties of the price sheet download.",
"properties": {
"downloadUrl": {
"description": "The link (url) to download the pricesheet.",
"type": "string",
"readOnly": true
},
"validTill": {
"description": "Download link validity.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -4603,6 +4687,31 @@
}
}
},
"HighCasedErrorDetails": {
"description": "The details of the error.",
"properties": {
"code": {
"description": "Error code.",
"type": "string",
"readOnly": true
},
"message": {
"description": "Error message indicating why the operation failed.",
"type": "string",
"readOnly": true
}
}
},
"HighCasedErrorResponse": {
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header.",
"type": "object",
"properties": {
"error": {
"description": "The details of the error.",
"$ref": "#/definitions/HighCasedErrorDetails"
}
}
},
"ErrorResponse": {
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header.",
"type": "object",
Expand Down Expand Up @@ -4644,6 +4753,11 @@
"description": "Operation type: Read, write, delete, etc.",
"type": "string",
"readOnly": true
},
"description": {
"description": "Description of the operation.",
"type": "string",
"readOnly": true
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"firstUsageDate": "2019-07-07T00:00:00-07:00",
"scope": "Shared",
"lookBackPeriod": "Last7Days",
"lookBackPeriod": 7,
"instanceFlexibilityRatio": 1,
"instanceFlexibilityGroup": "DSv2 Series",
"normalizedSize": "Standard_DS1_v2",
Expand Down Expand Up @@ -74,7 +74,7 @@
},
"firstUsageDate": "2019-07-07T00:00:00-07:00",
"scope": "Shared",
"lookBackPeriod": "Last7Days",
"lookBackPeriod": 7,
"instanceFlexibilityRatio": 1,
"instanceFlexibilityGroup": "DSv2 Series",
"normalizedSize": "Standard_DS1",
Expand Down

0 comments on commit 7e76220

Please sign in to comment.