Skip to content
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.

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

[AutoRelease] t2-costmanagement-2021-07-27-84467 #19949

Merged
merged 2 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions sdk/costmanagement/azure-mgmt-costmanagement/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Release History

## 3.0.0 (2021-07-27)

**Breaking changes**

- Parameter dataset of model QueryDefinition is now required
- Parameter dataset of model ForecastDefinition is now required

## 2.0.0 (2021-06-08)

**Features**
Expand Down
8 changes: 4 additions & 4 deletions sdk/costmanagement/azure-mgmt-costmanagement/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"autorest": "3.4.2",
"autorest": "3.4.5",
"use": [
"@autorest/[email protected].0",
"@autorest/[email protected].4",
"@autorest/[email protected]"
],
"commit": "67528b3e539b96ccaaf82c360f5715184e467e21",
"commit": "74efe54fbc55c91a1d9213afbb2723747acfddf9",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/cost-management/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected].0 --use=@autorest/[email protected] --version=3.4.2",
"autorest_command": "autorest specification/cost-management/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected].4 --use=@autorest/[email protected] --version=3.4.5",
"readme": "specification/cost-management/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "2.0.0"
VERSION = "3.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ class FunctionType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
"""The name of the aggregation function to use.
"""

AVG = "Avg"
MAX = "Max"
MIN = "Min"
SUM = "Sum"

class GranularityType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ class ForecastDefinition(msrest.serialization.Model):
:type timeframe: str or ~azure.mgmt.costmanagement.models.ForecastTimeframeType
:param time_period: Has time period for pulling data for the forecast.
:type time_period: ~azure.mgmt.costmanagement.models.QueryTimePeriod
:param dataset: Has definition for data in this forecast.
:param dataset: Required. Has definition for data in this forecast.
:type dataset: ~azure.mgmt.costmanagement.models.QueryDataset
:param include_actual_cost: a boolean determining if actualCost will be included.
:type include_actual_cost: bool
Expand All @@ -1023,6 +1023,7 @@ class ForecastDefinition(msrest.serialization.Model):
_validation = {
'type': {'required': True},
'timeframe': {'required': True},
'dataset': {'required': True},
}

_attribute_map = {
Expand All @@ -1042,7 +1043,7 @@ def __init__(
self.type = kwargs['type']
self.timeframe = kwargs['timeframe']
self.time_period = kwargs.get('time_period', None)
self.dataset = kwargs.get('dataset', None)
self.dataset = kwargs['dataset']
self.include_actual_cost = kwargs.get('include_actual_cost', None)
self.include_fresh_partial_cost = kwargs.get('include_fresh_partial_cost', None)

Expand Down Expand Up @@ -1267,7 +1268,7 @@ class QueryAggregation(msrest.serialization.Model):
:param name: Required. The name of the column to aggregate.
:type name: str
:param function: Required. The name of the aggregation function to use. Possible values
include: "Sum".
include: "Avg", "Max", "Min", "Sum".
:type function: str or ~azure.mgmt.costmanagement.models.FunctionType
"""

Expand Down Expand Up @@ -1364,7 +1365,8 @@ class QueryDataset(msrest.serialization.Model):
:param grouping: Array of group by expression to use in the query. Query can have up to 2 group
by clauses.
:type grouping: list[~azure.mgmt.costmanagement.models.QueryGrouping]
:param filter: Has filter expression to use in the query.
:param filter: The filter expression to use in the query. Please reference our Query API REST
documentation for how to properly format the filter.
:type filter: ~azure.mgmt.costmanagement.models.QueryFilter
"""

Expand Down Expand Up @@ -1407,7 +1409,8 @@ class QueryDatasetAutoGenerated(msrest.serialization.Model):
:param grouping: Array of group by expression to use in the query. Query can have up to 2 group
by clauses.
:type grouping: list[~azure.mgmt.costmanagement.models.QueryGrouping]
:param filter: Has filter expression to use in the query.
:param filter: The filter expression to use in the query. Please reference our Query API REST
documentation for how to properly format the filter.
:type filter: ~azure.mgmt.costmanagement.models.QueryFilterAutoGenerated
"""

Expand Down Expand Up @@ -1469,13 +1472,14 @@ class QueryDefinition(msrest.serialization.Model):
:type timeframe: str or ~azure.mgmt.costmanagement.models.TimeframeType
:param time_period: Has time period for pulling data for the query.
:type time_period: ~azure.mgmt.costmanagement.models.QueryTimePeriod
:param dataset: Has definition for data in this query.
:param dataset: Required. Has definition for data in this query.
:type dataset: ~azure.mgmt.costmanagement.models.QueryDataset
"""

_validation = {
'type': {'required': True},
'timeframe': {'required': True},
'dataset': {'required': True},
}

_attribute_map = {
Expand All @@ -1493,7 +1497,7 @@ def __init__(
self.type = kwargs['type']
self.timeframe = kwargs['timeframe']
self.time_period = kwargs.get('time_period', None)
self.dataset = kwargs.get('dataset', None)
self.dataset = kwargs['dataset']


class QueryFilter(msrest.serialization.Model):
Expand Down Expand Up @@ -1700,7 +1704,7 @@ class ReportConfigAggregation(msrest.serialization.Model):
:param name: Required. The name of the column to aggregate.
:type name: str
:param function: Required. The name of the aggregation function to use. Possible values
include: "Sum".
include: "Avg", "Max", "Min", "Sum".
:type function: str or ~azure.mgmt.costmanagement.models.FunctionType
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ class ForecastDefinition(msrest.serialization.Model):
:type timeframe: str or ~azure.mgmt.costmanagement.models.ForecastTimeframeType
:param time_period: Has time period for pulling data for the forecast.
:type time_period: ~azure.mgmt.costmanagement.models.QueryTimePeriod
:param dataset: Has definition for data in this forecast.
:param dataset: Required. Has definition for data in this forecast.
:type dataset: ~azure.mgmt.costmanagement.models.QueryDataset
:param include_actual_cost: a boolean determining if actualCost will be included.
:type include_actual_cost: bool
Expand All @@ -1128,6 +1128,7 @@ class ForecastDefinition(msrest.serialization.Model):
_validation = {
'type': {'required': True},
'timeframe': {'required': True},
'dataset': {'required': True},
}

_attribute_map = {
Expand All @@ -1144,8 +1145,8 @@ def __init__(
*,
type: Union[str, "ForecastType"],
timeframe: Union[str, "ForecastTimeframeType"],
dataset: "QueryDataset",
time_period: Optional["QueryTimePeriod"] = None,
dataset: Optional["QueryDataset"] = None,
include_actual_cost: Optional[bool] = None,
include_fresh_partial_cost: Optional[bool] = None,
**kwargs
Expand Down Expand Up @@ -1392,7 +1393,7 @@ class QueryAggregation(msrest.serialization.Model):
:param name: Required. The name of the column to aggregate.
:type name: str
:param function: Required. The name of the aggregation function to use. Possible values
include: "Sum".
include: "Avg", "Max", "Min", "Sum".
:type function: str or ~azure.mgmt.costmanagement.models.FunctionType
"""

Expand Down Expand Up @@ -1499,7 +1500,8 @@ class QueryDataset(msrest.serialization.Model):
:param grouping: Array of group by expression to use in the query. Query can have up to 2 group
by clauses.
:type grouping: list[~azure.mgmt.costmanagement.models.QueryGrouping]
:param filter: Has filter expression to use in the query.
:param filter: The filter expression to use in the query. Please reference our Query API REST
documentation for how to properly format the filter.
:type filter: ~azure.mgmt.costmanagement.models.QueryFilter
"""

Expand Down Expand Up @@ -1548,7 +1550,8 @@ class QueryDatasetAutoGenerated(msrest.serialization.Model):
:param grouping: Array of group by expression to use in the query. Query can have up to 2 group
by clauses.
:type grouping: list[~azure.mgmt.costmanagement.models.QueryGrouping]
:param filter: Has filter expression to use in the query.
:param filter: The filter expression to use in the query. Please reference our Query API REST
documentation for how to properly format the filter.
:type filter: ~azure.mgmt.costmanagement.models.QueryFilterAutoGenerated
"""

Expand Down Expand Up @@ -1618,13 +1621,14 @@ class QueryDefinition(msrest.serialization.Model):
:type timeframe: str or ~azure.mgmt.costmanagement.models.TimeframeType
:param time_period: Has time period for pulling data for the query.
:type time_period: ~azure.mgmt.costmanagement.models.QueryTimePeriod
:param dataset: Has definition for data in this query.
:param dataset: Required. Has definition for data in this query.
:type dataset: ~azure.mgmt.costmanagement.models.QueryDataset
"""

_validation = {
'type': {'required': True},
'timeframe': {'required': True},
'dataset': {'required': True},
}

_attribute_map = {
Expand All @@ -1639,8 +1643,8 @@ def __init__(
*,
type: Union[str, "ExportType"],
timeframe: Union[str, "TimeframeType"],
dataset: "QueryDataset",
time_period: Optional["QueryTimePeriod"] = None,
dataset: Optional["QueryDataset"] = None,
**kwargs
):
super(QueryDefinition, self).__init__(**kwargs)
Expand Down Expand Up @@ -1875,7 +1879,7 @@ class ReportConfigAggregation(msrest.serialization.Model):
:param name: Required. The name of the column to aggregate.
:type name: str
:param function: Required. The name of the aggregation function to use. Possible values
include: "Sum".
include: "Avg", "Max", "Min", "Sum".
:type function: str or ~azure.mgmt.costmanagement.models.FunctionType
"""

Expand Down