From 5ab77f1910ed9eb18a18ac65e48064524e50e85d Mon Sep 17 00:00:00 2001 From: Sasha Shahdoost rad Date: Wed, 12 Aug 2020 11:07:28 -0700 Subject: [PATCH 1/3] removed unsupported field "grouping" from forecast --- .../stable/2019-11-01/costmanagement.json | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 2f0fc9a8dc97..4ca094b54a39 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2488,7 +2488,7 @@ }, "dataset": { "description": "Has definition for data in this forecast.", - "$ref": "#/definitions/QueryDataset" + "$ref": "#/definitions/ForecastDataset" }, "includeActualCost": { "description": "a boolean determining if actualCost will be included", @@ -2504,6 +2504,40 @@ "timeframe" ] }, + "ForecastDataset": { + "description": "The definition of data present in the query.", + "properties": { + "granularity": { + "description": "The granularity of rows in the query.", + "type": "string", + "enum": [ + "Daily" + ], + "x-ms-enum": { + "name": "GranularityType", + "modelAsString": true + } + }, + "configuration": { + "description": "Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided.", + "$ref": "#/definitions/QueryDatasetConfiguration" + }, + "aggregation": { + "type": "object", + "description": "Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the alias for the aggregated column. Query can have up to 2 aggregation clauses.", + "additionalProperties": { + "type": "object", + "$ref": "#/definitions/QueryAggregation" + }, + "maxItems": 2 + }, + "filter": { + "type": "object", + "description": "Has filter expression to use in the query.", + "$ref": "#/definitions/QueryFilter" + } + } + }, "QueryDefinition": { "description": "The definition of a query.", "properties": { From 24ee7c95483e2361cd6e3d8f29adda631c990e35 Mon Sep 17 00:00:00 2001 From: Sasha Shahdoost rad Date: Tue, 18 Aug 2020 11:25:01 -0700 Subject: [PATCH 2/3] Revert "removed unsupported field "grouping" from forecast" This reverts commit 5ab77f1910ed9eb18a18ac65e48064524e50e85d. --- .../stable/2019-11-01/costmanagement.json | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 4ca094b54a39..2f0fc9a8dc97 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2488,7 +2488,7 @@ }, "dataset": { "description": "Has definition for data in this forecast.", - "$ref": "#/definitions/ForecastDataset" + "$ref": "#/definitions/QueryDataset" }, "includeActualCost": { "description": "a boolean determining if actualCost will be included", @@ -2504,40 +2504,6 @@ "timeframe" ] }, - "ForecastDataset": { - "description": "The definition of data present in the query.", - "properties": { - "granularity": { - "description": "The granularity of rows in the query.", - "type": "string", - "enum": [ - "Daily" - ], - "x-ms-enum": { - "name": "GranularityType", - "modelAsString": true - } - }, - "configuration": { - "description": "Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided.", - "$ref": "#/definitions/QueryDatasetConfiguration" - }, - "aggregation": { - "type": "object", - "description": "Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the alias for the aggregated column. Query can have up to 2 aggregation clauses.", - "additionalProperties": { - "type": "object", - "$ref": "#/definitions/QueryAggregation" - }, - "maxItems": 2 - }, - "filter": { - "type": "object", - "description": "Has filter expression to use in the query.", - "$ref": "#/definitions/QueryFilter" - } - } - }, "QueryDefinition": { "description": "The definition of a query.", "properties": { From 378268d4da7efb7214d72325784ade5692a32c3d Mon Sep 17 00:00:00 2001 From: Sasha Shahdoost rad Date: Tue, 18 Aug 2020 11:26:54 -0700 Subject: [PATCH 3/3] moved forecastDataset addition to correct version --- .../stable/2020-06-01/costmanagement.json | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2020-06-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2020-06-01/costmanagement.json index 456686294225..c5c4bcd69b4e 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2020-06-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2020-06-01/costmanagement.json @@ -2502,7 +2502,7 @@ }, "dataset": { "description": "Has definition for data in this forecast.", - "$ref": "#/definitions/QueryDataset" + "$ref": "#/definitions/ForecastDataset" }, "includeActualCost": { "description": "a boolean determining if actualCost will be included", @@ -2518,6 +2518,40 @@ "timeframe" ] }, + "ForecastDataset": { + "description": "The definition of data present in the forecast.", + "properties": { + "granularity": { + "description": "The granularity of rows in the forecast.", + "type": "string", + "enum": [ + "Daily" + ], + "x-ms-enum": { + "name": "GranularityType", + "modelAsString": true + } + }, + "configuration": { + "description": "Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided.", + "$ref": "#/definitions/QueryDatasetConfiguration" + }, + "aggregation": { + "type": "object", + "description": "Dictionary of aggregation expression to use in the forecast. The key of each item in the dictionary is the alias for the aggregated column. forecast can have up to 2 aggregation clauses.", + "additionalProperties": { + "type": "object", + "$ref": "#/definitions/QueryAggregation" + }, + "maxItems": 2 + }, + "filter": { + "type": "object", + "description": "Has filter expression to use in the forecast.", + "$ref": "#/definitions/QueryFilter" + } + } + }, "QueryDefinition": { "description": "The definition of a query.", "properties": {