Skip to content

Fix s360 in reservation and scheduled action APIs #21677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 2, 2022
Merged

Fix s360 in reservation and scheduled action APIs #21677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eafc73d
Fix s360 in reservation and scheduled action APIs
pednekarpraj Nov 28, 2022
d686b38
Fix lint errors
pednekarpraj Nov 28, 2022
f98d191
Fix linter error in RI recommendation example
pednekarpraj Nov 28, 2022
cada74c
Fix lint errors
pednekarpraj Dec 1, 2022
58fd3c4
Review comment - changed suppression rule name
pednekarpraj Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3632,6 +3632,8 @@
},
"ModernReservationRecommendationProperties": {
"description": "The properties of the reservation recommendation.",
"type": "object",
"discriminator": "scope",
"properties": {
"location": {
"type": "string",
Expand Down Expand Up @@ -3709,8 +3711,7 @@
},
"scope": {
"description": "Shared or single recommendation.",
"type": "string",
"readOnly": true
"type": "string"
},
"skuProperties": {
"description": "List of sku properties",
Expand All @@ -3727,14 +3728,39 @@
"description": "This is the ARM Sku name.",
"type": "string",
"readOnly": true
},
}
},
"required": [
"scope"
]
},
"ModernSingleScopeReservationRecommendationProperties": {
"description": "The properties of the modern reservation recommendation for single scope.",
"type": "object",
"x-ms-discriminator-value": "Single",
"properties": {
"subscriptionId": {
"description": "Subscription ID",
"description": "Subscription ID associated with single scoped recommendation.",
"type": "string",
"format": "uuid",
"readOnly": true
}
}
},
"allOf": [
{
"$ref": "#/definitions/ModernReservationRecommendationProperties"
}
]
},
"ModernSharedScopeReservationRecommendationProperties": {
"description": "The properties of the modern reservation recommendation for shared scope.",
"type": "object",
"x-ms-discriminator-value": "Shared",
"allOf": [
{
"$ref": "#/definitions/ModernReservationRecommendationProperties"
}
]
},
"ModernReservationTransactionProperties": {
"description": "The properties of a modern reservation transaction.",
Expand Down
4 changes: 2 additions & 2 deletions ...ft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"currency": "USD",
"value": 279881.9457795231
},
"firstUsageDate": "2022-08-22T00:00:00",
"firstUsageDate": "2022-08-22T00:00:00Z",
"instanceFlexibilityGroup": "NA",
"instanceFlexibilityRatio": 1,
"location": "westus2",
Expand Down Expand Up @@ -52,7 +52,7 @@
"currency": "USD",
"value": 93208.8596802244
},
"firstUsageDate": "2022-08-22T00:00:00",
"firstUsageDate": "2022-08-22T00:00:00Z",
"instanceFlexibilityGroup": "NA",
"instanceFlexibilityRatio": 1,
"location": "westus2",
Expand Down
5 changes: 4 additions & 1 deletion specification/consumption/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,10 @@ generate-interface: true
directive:
- suppress: R4009
from: consumption.json
reason: SystemData properties does not fit into the consumption RP APIs as they dont really create any actual resources.
reason: SystemData properties does not fit into the consumption RP APIs as they dont really create any actual resources.
- suppress: GuidUsage
from: consumption.json
reason: Usage of Guid in the consumption RP APIs is signed off from the ARM team.
```

## AzureResourceSchema
Expand Down
30 changes: 30 additions & 0 deletions ...-management/resource-manager/Microsoft.CostManagement/stable/2022-10-01/common-types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,36 @@
}
}
},
"ErrorDetailsWithNestedDetails": {
"description": "The details of the error.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ErrorDetails"
}
],
"properties": {
"details": {
"type": "array",
"readOnly": true,
"description": "The additional details of the error.",
"items": {
"$ref": "#/definitions/ErrorDetails"
},
"x-ms-identifiers": []
}
}
},
"ErrorResponseWithNestedDetails": {
"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/ErrorDetailsWithNestedDetails"
}
}
},
"CostManagementOperation": {
"description": "A Cost management REST API operation.",
"type": "object",
Expand Down
24 changes: 12 additions & 12 deletions ...agement/resource-manager/Microsoft.CostManagement/stable/2022-10-01/scheduledActions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
},
Expand Down Expand Up @@ -125,7 +125,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
},
Expand Down Expand Up @@ -179,7 +179,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -216,7 +216,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -253,7 +253,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -310,7 +310,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -350,7 +350,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -390,7 +390,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -423,7 +423,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -459,7 +459,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -501,7 +501,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down Expand Up @@ -546,7 +546,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "common-types.json#/definitions/ErrorResponse"
"$ref": "common-types.json#/definitions/ErrorResponseWithNestedDetails"
}
}
}
Expand Down