From c12421e420ddc2c2118f6bf8143d54e41e22c1e1 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 14 May 2019 19:56:46 +0000 Subject: [PATCH 1/2] Generated from eda653d26bdd03096d931da6676c4a962ae110ab Update consumption.json Modified the description to remove resource group from scope for usagedetails and Marketplace --- profiles/latest/consumption/mgmt/consumption/models.go | 9 +++------ .../preview/consumption/mgmt/consumption/models.go | 9 +++------ .../mgmt/2019-01-01/consumption/marketplaces.go | 5 ++--- .../consumption/mgmt/2019-01-01/consumption/models.go | 10 ++-------- .../mgmt/2019-01-01/consumption/usagedetails.go | 5 ++--- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/profiles/latest/consumption/mgmt/consumption/models.go b/profiles/latest/consumption/mgmt/consumption/models.go index d608a8651939..1a2880a62e0b 100644 --- a/profiles/latest/consumption/mgmt/consumption/models.go +++ b/profiles/latest/consumption/mgmt/consumption/models.go @@ -84,12 +84,9 @@ const ( type TimeGrainType = original.TimeGrainType const ( - TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually - TimeGrainTypeBillingAnnual TimeGrainType = original.TimeGrainTypeBillingAnnual - TimeGrainTypeBillingMonth TimeGrainType = original.TimeGrainTypeBillingMonth - TimeGrainTypeBillingQuarter TimeGrainType = original.TimeGrainTypeBillingQuarter - TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly - TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly + TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually + TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly + TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly ) type AggregatedCostClient = original.AggregatedCostClient diff --git a/profiles/preview/consumption/mgmt/consumption/models.go b/profiles/preview/consumption/mgmt/consumption/models.go index e6a953c5c462..2c5576284c5a 100644 --- a/profiles/preview/consumption/mgmt/consumption/models.go +++ b/profiles/preview/consumption/mgmt/consumption/models.go @@ -84,12 +84,9 @@ const ( type TimeGrainType = original.TimeGrainType const ( - TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually - TimeGrainTypeBillingAnnual TimeGrainType = original.TimeGrainTypeBillingAnnual - TimeGrainTypeBillingMonth TimeGrainType = original.TimeGrainTypeBillingMonth - TimeGrainTypeBillingQuarter TimeGrainType = original.TimeGrainTypeBillingQuarter - TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly - TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly + TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually + TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly + TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly ) type AggregatedCostClient = original.AggregatedCostClient diff --git a/services/consumption/mgmt/2019-01-01/consumption/marketplaces.go b/services/consumption/mgmt/2019-01-01/consumption/marketplaces.go index dbf7aa86f96f..9c3890f6a793 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/marketplaces.go +++ b/services/consumption/mgmt/2019-01-01/consumption/marketplaces.go @@ -46,9 +46,8 @@ func NewMarketplacesClientWithBaseURI(baseURI string, subscriptionID string) Mar // 1, 2014 or later. // Parameters: // scope - the scope associated with marketplace operations. This includes '/subscriptions/{subscriptionId}/' -// for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for -// resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account -// scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, +// for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing +// Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, // '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and // '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For // subscription, billing account, department, enrollment account and ManagementGroup, you can also add billing diff --git a/services/consumption/mgmt/2019-01-01/consumption/models.go b/services/consumption/mgmt/2019-01-01/consumption/models.go index 21142c4a40f5..5599d9c869f8 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/models.go +++ b/services/consumption/mgmt/2019-01-01/consumption/models.go @@ -149,12 +149,6 @@ type TimeGrainType string const ( // TimeGrainTypeAnnually ... TimeGrainTypeAnnually TimeGrainType = "Annually" - // TimeGrainTypeBillingAnnual ... - TimeGrainTypeBillingAnnual TimeGrainType = "BillingAnnual" - // TimeGrainTypeBillingMonth ... - TimeGrainTypeBillingMonth TimeGrainType = "BillingMonth" - // TimeGrainTypeBillingQuarter ... - TimeGrainTypeBillingQuarter TimeGrainType = "BillingQuarter" // TimeGrainTypeMonthly ... TimeGrainTypeMonthly TimeGrainType = "Monthly" // TimeGrainTypeQuarterly ... @@ -163,7 +157,7 @@ const ( // PossibleTimeGrainTypeValues returns an array of possible values for the TimeGrainType const type. func PossibleTimeGrainTypeValues() []TimeGrainType { - return []TimeGrainType{TimeGrainTypeAnnually, TimeGrainTypeBillingAnnual, TimeGrainTypeBillingMonth, TimeGrainTypeBillingQuarter, TimeGrainTypeMonthly, TimeGrainTypeQuarterly} + return []TimeGrainType{TimeGrainTypeAnnually, TimeGrainTypeMonthly, TimeGrainTypeQuarterly} } // Balance a balance resource. @@ -391,7 +385,7 @@ type BudgetProperties struct { Category CategoryType `json:"category,omitempty"` // Amount - The total amount of cost to track with the budget Amount *decimal.Decimal `json:"amount,omitempty"` - // TimeGrain - The time covered by a budget. Tracking of the amount will be reset based on the time grain. Possible values include: 'TimeGrainTypeMonthly', 'TimeGrainTypeQuarterly', 'TimeGrainTypeAnnually', 'TimeGrainTypeBillingMonth', 'TimeGrainTypeBillingQuarter', 'TimeGrainTypeBillingAnnual' + // TimeGrain - The time covered by a budget. Tracking of the amount will be reset based on the time grain. Possible values include: 'TimeGrainTypeMonthly', 'TimeGrainTypeQuarterly', 'TimeGrainTypeAnnually' TimeGrain TimeGrainType `json:"timeGrain,omitempty"` // TimePeriod - 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. TimePeriod *BudgetTimePeriod `json:"timePeriod,omitempty"` diff --git a/services/consumption/mgmt/2019-01-01/consumption/usagedetails.go b/services/consumption/mgmt/2019-01-01/consumption/usagedetails.go index 633f2d85f8ca..33cf137b4cf5 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/usagedetails.go +++ b/services/consumption/mgmt/2019-01-01/consumption/usagedetails.go @@ -46,9 +46,8 @@ func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) Usa // later. // Parameters: // scope - the scope associated with usage details operations. This includes '/subscriptions/{subscriptionId}/' -// for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for -// resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account -// scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, +// for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing +// Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, // '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and // '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For // subscription, billing account, department, enrollment account and management group, you can also add billing From eff98c1ba0f8b4f41042ef8ece5ad45be8cc6646 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 14 May 2019 20:01:00 +0000 Subject: [PATCH 2/2] Generated from 2e3eea16500055837b7f91509dbf7814aa85a98d Update readme.md --- profiles/latest/consumption/mgmt/consumption/models.go | 9 ++++++--- .../preview/consumption/mgmt/consumption/models.go | 9 ++++++--- .../consumption/mgmt/2019-01-01/consumption/models.go | 10 ++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/profiles/latest/consumption/mgmt/consumption/models.go b/profiles/latest/consumption/mgmt/consumption/models.go index 1a2880a62e0b..d608a8651939 100644 --- a/profiles/latest/consumption/mgmt/consumption/models.go +++ b/profiles/latest/consumption/mgmt/consumption/models.go @@ -84,9 +84,12 @@ const ( type TimeGrainType = original.TimeGrainType const ( - TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually - TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly - TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly + TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually + TimeGrainTypeBillingAnnual TimeGrainType = original.TimeGrainTypeBillingAnnual + TimeGrainTypeBillingMonth TimeGrainType = original.TimeGrainTypeBillingMonth + TimeGrainTypeBillingQuarter TimeGrainType = original.TimeGrainTypeBillingQuarter + TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly + TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly ) type AggregatedCostClient = original.AggregatedCostClient diff --git a/profiles/preview/consumption/mgmt/consumption/models.go b/profiles/preview/consumption/mgmt/consumption/models.go index 2c5576284c5a..e6a953c5c462 100644 --- a/profiles/preview/consumption/mgmt/consumption/models.go +++ b/profiles/preview/consumption/mgmt/consumption/models.go @@ -84,9 +84,12 @@ const ( type TimeGrainType = original.TimeGrainType const ( - TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually - TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly - TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly + TimeGrainTypeAnnually TimeGrainType = original.TimeGrainTypeAnnually + TimeGrainTypeBillingAnnual TimeGrainType = original.TimeGrainTypeBillingAnnual + TimeGrainTypeBillingMonth TimeGrainType = original.TimeGrainTypeBillingMonth + TimeGrainTypeBillingQuarter TimeGrainType = original.TimeGrainTypeBillingQuarter + TimeGrainTypeMonthly TimeGrainType = original.TimeGrainTypeMonthly + TimeGrainTypeQuarterly TimeGrainType = original.TimeGrainTypeQuarterly ) type AggregatedCostClient = original.AggregatedCostClient diff --git a/services/consumption/mgmt/2019-01-01/consumption/models.go b/services/consumption/mgmt/2019-01-01/consumption/models.go index 5599d9c869f8..21142c4a40f5 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/models.go +++ b/services/consumption/mgmt/2019-01-01/consumption/models.go @@ -149,6 +149,12 @@ type TimeGrainType string const ( // TimeGrainTypeAnnually ... TimeGrainTypeAnnually TimeGrainType = "Annually" + // TimeGrainTypeBillingAnnual ... + TimeGrainTypeBillingAnnual TimeGrainType = "BillingAnnual" + // TimeGrainTypeBillingMonth ... + TimeGrainTypeBillingMonth TimeGrainType = "BillingMonth" + // TimeGrainTypeBillingQuarter ... + TimeGrainTypeBillingQuarter TimeGrainType = "BillingQuarter" // TimeGrainTypeMonthly ... TimeGrainTypeMonthly TimeGrainType = "Monthly" // TimeGrainTypeQuarterly ... @@ -157,7 +163,7 @@ const ( // PossibleTimeGrainTypeValues returns an array of possible values for the TimeGrainType const type. func PossibleTimeGrainTypeValues() []TimeGrainType { - return []TimeGrainType{TimeGrainTypeAnnually, TimeGrainTypeMonthly, TimeGrainTypeQuarterly} + return []TimeGrainType{TimeGrainTypeAnnually, TimeGrainTypeBillingAnnual, TimeGrainTypeBillingMonth, TimeGrainTypeBillingQuarter, TimeGrainTypeMonthly, TimeGrainTypeQuarterly} } // Balance a balance resource. @@ -385,7 +391,7 @@ type BudgetProperties struct { Category CategoryType `json:"category,omitempty"` // Amount - The total amount of cost to track with the budget Amount *decimal.Decimal `json:"amount,omitempty"` - // TimeGrain - The time covered by a budget. Tracking of the amount will be reset based on the time grain. Possible values include: 'TimeGrainTypeMonthly', 'TimeGrainTypeQuarterly', 'TimeGrainTypeAnnually' + // TimeGrain - The time covered by a budget. Tracking of the amount will be reset based on the time grain. Possible values include: 'TimeGrainTypeMonthly', 'TimeGrainTypeQuarterly', 'TimeGrainTypeAnnually', 'TimeGrainTypeBillingMonth', 'TimeGrainTypeBillingQuarter', 'TimeGrainTypeBillingAnnual' TimeGrain TimeGrainType `json:"timeGrain,omitempty"` // TimePeriod - 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. TimePeriod *BudgetTimePeriod `json:"timePeriod,omitempty"`