diff --git a/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md b/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md index bff9d1bc90ea..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md @@ -1,16 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationDetailsProperties.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesProperties.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2017-11-30/consumption/_meta.json b/services/consumption/mgmt/2017-11-30/consumption/_meta.json index 6015a9886c42..e57b531af64d 100644 --- a/services/consumption/mgmt/2017-11-30/consumption/_meta.json +++ b/services/consumption/mgmt/2017-11-30/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-11", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md index 6022037b1777..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md @@ -1,22 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationDetailsProperties.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesProperties.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-01-31/consumption/_meta.json b/services/consumption/mgmt/2018-01-31/consumption/_meta.json index 2b32edbaf588..4033c95feaaf 100644 --- a/services/consumption/mgmt/2018-01-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-01-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-01", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md index bf7730b8b4ce..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md @@ -1,27 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationDetailsProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsProperties.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesProperties.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-03-31/consumption/_meta.json b/services/consumption/mgmt/2018-03-31/consumption/_meta.json index 51ae84d3bc1e..a73a827c69ca 100644 --- a/services/consumption/mgmt/2018-03-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-03-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-03", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md index 9b5b4bb91888..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md @@ -1,15 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-05-31/consumption/_meta.json b/services/consumption/mgmt/2018-05-31/consumption/_meta.json index 4cf8c9580dd8..79068d61901f 100644 --- a/services/consumption/mgmt/2018-05-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-05-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-05", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md index 06e390e51eca..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md @@ -1,28 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummaryProperties.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-06-30/consumption/_meta.json b/services/consumption/mgmt/2018-06-30/consumption/_meta.json index 5a24624f7660..52816a00f3c5 100644 --- a/services/consumption/mgmt/2018-06-30/consumption/_meta.json +++ b/services/consumption/mgmt/2018-06-30/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-06", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md index 85de86a01541..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md @@ -1,30 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. ChargeSummaryProperties.MarshalJSON() ([]byte, error) -1. ChargesListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummaryProperties.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-08-31/consumption/_meta.json b/services/consumption/mgmt/2018-08-31/consumption/_meta.json index 671dd47a7aa9..9b719ae8d390 100644 --- a/services/consumption/mgmt/2018-08-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-08-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-08", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md index 814a28f61542..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md @@ -1,32 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. ChargeSummaryProperties.MarshalJSON() ([]byte, error) -1. ChargesListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummaryProperties.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. TenantListResult.MarshalJSON() ([]byte, error) -1. TenantProperties.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2018-10-01/consumption/_meta.json b/services/consumption/mgmt/2018-10-01/consumption/_meta.json index 4d98db316dc7..8fe52fc07d12 100644 --- a/services/consumption/mgmt/2018-10-01/consumption/_meta.json +++ b/services/consumption/mgmt/2018-10-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-10", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md index 85de86a01541..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md @@ -1,30 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. ChargeSummaryProperties.MarshalJSON() ([]byte, error) -1. ChargesListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummaryProperties.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. UsageDetailProperties.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/consumption/mgmt/2019-01-01/consumption/_meta.json b/services/consumption/mgmt/2019-01-01/consumption/_meta.json index 8a06f097c86f..f33bc86e40aa 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/_meta.json +++ b/services/consumption/mgmt/2019-01-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2019-01", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md index a494ca2b4584..1a202a29474d 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md @@ -1,49 +1,182 @@ -# Change History +# Unreleased + +## Breaking Changes + +### Removed Constants + +1. Scope9.Scope9Shared +1. Scope9.Scope9Single + +### Removed Funcs + +1. PossibleScope11Values() []Scope11 +1. PossibleScope9Values() []Scope9 + +### Signature Changes + +#### Const Types + +1. Shared changed type from Scope11 to Scope12 +1. Single changed type from Scope11 to Scope12 + +#### Funcs + +1. CreditsClient.Get + - Params + - From: context.Context, string, string + - To: context.Context, string +1. CreditsClient.GetPreparer + - Params + - From: context.Context, string, string + - To: context.Context, string +1. EventsClient.List + - Params + - From: context.Context, string, string, string, string + - To: context.Context, string, string, string +1. EventsClient.ListComplete + - Params + - From: context.Context, string, string, string, string + - To: context.Context, string, string, string +1. EventsClient.ListPreparer + - Params + - From: context.Context, string, string, string, string + - To: context.Context, string, string, string +1. LotsClient.List + - Params + - From: context.Context, string, string + - To: context.Context, string +1. LotsClient.ListComplete + - Params + - From: context.Context, string, string + - To: context.Context, string +1. LotsClient.ListPreparer + - Params + - From: context.Context, string, string + - To: context.Context, string +1. ReservationRecommendationDetailsClient.Get + - Params + - From: context.Context, string, Scope11, string, Term, LookBackPeriod, string + - To: context.Context, string, Scope14, string, Term, LookBackPeriod, string +1. ReservationRecommendationDetailsClient.GetPreparer + - Params + - From: context.Context, string, Scope11, string, Term, LookBackPeriod, string + - To: context.Context, string, Scope14, string, Term, LookBackPeriod, string + +#### Struct Fields + +1. LegacyReservationRecommendationProperties.InstanceFlexibilityRatio changed type from *int32 to *float64 +1. ModernReservationRecommendationProperties.InstanceFlexibilityRatio changed type from *int32 to *float64 +1. ModernReservationRecommendationProperties.LookBackPeriod changed type from *string to *int32 +1. ModernUsageDetailProperties.MeterID changed type from *uuid.UUID to *string ## Additive Changes +### New Constants + +1. CultureCode.CsCz +1. CultureCode.DaDk +1. CultureCode.DeDe +1. CultureCode.EnGb +1. CultureCode.EnUs +1. CultureCode.EsEs +1. CultureCode.FrFr +1. CultureCode.HuHu +1. CultureCode.ItIt +1. CultureCode.JaJp +1. CultureCode.KoKr +1. CultureCode.NbNo +1. CultureCode.NlNl +1. CultureCode.PlPl +1. CultureCode.PtBr +1. CultureCode.PtPt +1. CultureCode.RuRu +1. CultureCode.SvSe +1. CultureCode.TrTr +1. CultureCode.ZhCn +1. CultureCode.ZhTw +1. Scope14.Scope14Shared +1. Scope14.Scope14Single + ### New Funcs -1. Amount.MarshalJSON() ([]byte, error) -1. BalancePropertiesAdjustmentDetailsItem.MarshalJSON() ([]byte, error) -1. BalancePropertiesNewPurchasesDetailsItem.MarshalJSON() ([]byte, error) -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. ChargesListResult.MarshalJSON() ([]byte, error) -1. CreditBalanceSummary.MarshalJSON() ([]byte, error) -1. CreditSummaryProperties.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. Events.MarshalJSON() ([]byte, error) -1. ForecastsListResult.MarshalJSON() ([]byte, error) -1. LegacyChargeSummaryProperties.MarshalJSON() ([]byte, error) -1. LegacyReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. LegacyReservationTransactionProperties.MarshalJSON() ([]byte, error) -1. LegacyUsageDetailProperties.MarshalJSON() ([]byte, error) -1. LotProperties.MarshalJSON() ([]byte, error) -1. Lots.MarshalJSON() ([]byte, error) -1. MarketplaceProperties.MarshalJSON() ([]byte, error) -1. MarketplacesListResult.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. MeterDetailsResponse.MarshalJSON() ([]byte, error) -1. ModernChargeSummaryProperties.MarshalJSON() ([]byte, error) -1. ModernReservationRecommendationProperties.MarshalJSON() ([]byte, error) -1. ModernReservationTransactionProperties.MarshalJSON() ([]byte, error) -1. ModernReservationTransactionsListResult.MarshalJSON() ([]byte, error) -1. ModernUsageDetailProperties.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. PriceSheetModel.MarshalJSON() ([]byte, error) -1. PriceSheetProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailProperties.MarshalJSON() ([]byte, error) -1. ReservationDetailsListResult.MarshalJSON() ([]byte, error) -1. ReservationRecommendationDetailsProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationDetailsResourceProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationDetailsUsageProperties.MarshalJSON() ([]byte, error) -1. ReservationRecommendationsListResult.MarshalJSON() ([]byte, error) -1. ReservationSummariesListResult.MarshalJSON() ([]byte, error) -1. ReservationSummaryProperties.MarshalJSON() ([]byte, error) -1. ReservationTransactionResource.MarshalJSON() ([]byte, error) -1. ReservationTransactionsListResult.MarshalJSON() ([]byte, error) -1. ResourceAttributes.MarshalJSON() ([]byte, error) -1. SkuProperty.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) +1. AmountWithExchangeRate.MarshalJSON() ([]byte, error) +1. DownloadProperties.MarshalJSON() ([]byte, error) +1. ForecastSpend.MarshalJSON() ([]byte, error) +1. HighCasedErrorDetails.MarshalJSON() ([]byte, error) +1. PossibleCultureCodeValues() []CultureCode +1. PossibleScope12Values() []Scope12 +1. PossibleScope14Values() []Scope14 +1. Reseller.MarshalJSON() ([]byte, error) +1. TagProperties.MarshalJSON() ([]byte, error) + +### Struct Changes + +#### New Structs + +1. AmountWithExchangeRate +1. DownloadProperties +1. ForecastSpend +1. HighCasedErrorDetails +1. HighCasedErrorResponse +1. Reseller + +#### New Struct Fields + +1. Balance.Etag +1. BudgetProperties.ForecastSpend +1. ChargeSummary.Etag +1. CreditBalanceSummary.CurrentBalanceInBillingCurrency +1. CreditBalanceSummary.EstimatedBalanceInBillingCurrency +1. CreditSummary.Etag +1. CreditSummaryProperties.BillingCurrency +1. CreditSummaryProperties.CreditCurrency +1. CreditSummaryProperties.Reseller +1. EventProperties.AdjustmentsInBillingCurrency +1. EventProperties.BillingCurrency +1. EventProperties.ChargesInBillingCurrency +1. EventProperties.ClosedBalanceInBillingCurrency +1. EventProperties.CreditCurrency +1. EventProperties.CreditExpiredInBillingCurrency +1. EventProperties.NewCreditInBillingCurrency +1. EventProperties.Reseller +1. EventSummary.Etag +1. Forecast.Etag +1. LegacyChargeSummary.Etag +1. LegacyReservationRecommendation.Etag +1. LegacyReservationRecommendationProperties.ResourceType +1. LegacyUsageDetail.Etag +1. LotProperties.BillingCurrency +1. LotProperties.ClosedBalanceInBillingCurrency +1. LotProperties.CreditCurrency +1. LotProperties.OriginalAmountInBillingCurrency +1. LotProperties.Reseller +1. LotSummary.Etag +1. ManagementGroupAggregatedCostResult.Etag +1. Marketplace.Etag +1. MarketplaceProperties.AdditionalInfo +1. ModernChargeSummary.Etag +1. ModernReservationRecommendation.ETag +1. ModernReservationRecommendation.Etag +1. ModernReservationRecommendationProperties.Location +1. ModernReservationRecommendationProperties.ResourceType +1. ModernReservationRecommendationProperties.SkuName +1. ModernReservationRecommendationProperties.SubscriptionID +1. ModernUsageDetail.Etag +1. ModernUsageDetailProperties.PayGPrice +1. Notification.Locale +1. Operation.ID +1. OperationDisplay.Description +1. PriceSheetModel.Download +1. PriceSheetResult.Etag +1. ReservationDetail.Etag +1. ReservationRecommendation.Etag +1. ReservationRecommendationDetailsModel.ETag +1. ReservationRecommendationDetailsModel.Etag +1. ReservationRecommendationsListResult.PreviousLink +1. ReservationRecommendationsListResult.TotalCost +1. ReservationSummary.Etag +1. Resource.Etag +1. Tag.Value +1. TagProperties.NextLink +1. TagProperties.PreviousLink +1. UsageDetail.Etag diff --git a/services/consumption/mgmt/2019-10-01/consumption/_meta.json b/services/consumption/mgmt/2019-10-01/consumption/_meta.json index db468a27e10b..0461a3a029b1 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/_meta.json +++ b/services/consumption/mgmt/2019-10-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2019-10", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/consumption/mgmt/2019-10-01/consumption/aggregatedcost.go b/services/consumption/mgmt/2019-10-01/consumption/aggregatedcost.go index b5f7ec411ff3..fe24ef7a64d6 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/aggregatedcost.go +++ b/services/consumption/mgmt/2019-10-01/consumption/aggregatedcost.go @@ -164,7 +164,7 @@ func (client AggregatedCostClient) GetForBillingPeriodByManagementGroupPreparer( preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/Microsoft.Consumption/aggregatedcost", pathParameters), + autorest.WithPathParameters("/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/Microsoft.Consumption/aggregatedCost", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } diff --git a/services/consumption/mgmt/2019-10-01/consumption/balances.go b/services/consumption/mgmt/2019-10-01/consumption/balances.go index efe5d5bfedb8..d50b68f85d1c 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/balances.go +++ b/services/consumption/mgmt/2019-10-01/consumption/balances.go @@ -158,7 +158,7 @@ func (client BalancesClient) GetForBillingPeriodByBillingAccountPreparer(ctx con preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances", pathParameters), + autorest.WithPathParameters("/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } diff --git a/services/consumption/mgmt/2019-10-01/consumption/budgets.go b/services/consumption/mgmt/2019-10-01/consumption/budgets.go index 43ee3836ee10..02a7fada4de2 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/budgets.go +++ b/services/consumption/mgmt/2019-10-01/consumption/budgets.go @@ -32,9 +32,9 @@ func NewBudgetsClientWithBaseURI(baseURI string, subscriptionID string) BudgetsC return BudgetsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CreateOrUpdate the operation to create or update a budget. Update operation requires latest eTag to be set in the -// request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require -// eTag. +// CreateOrUpdate the operation to create or update a budget. You can optionally provide an eTag if desired as a form +// of concurrency control. To obtain the latest eTag for a given budget, perform a get operation prior to your put +// operation. // Parameters: // scope - the scope associated with budget operations. This includes '/subscriptions/{subscriptionId}/' for // subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup @@ -70,32 +70,32 @@ func (client BudgetsClient) CreateOrUpdate(ctx context.Context, scope string, bu Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.TimePeriod.StartDate", Name: validation.Null, Rule: true, Chain: nil}}}, {Target: "parameters.BudgetProperties.Filter", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.And", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.And", Name: validation.MinItems, Rule: 2, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.And", Name: validation.MinItems, Rule: 0, Chain: nil}}}, {Target: "parameters.BudgetProperties.Filter.Not", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Dimensions", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Dimensions.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Not.Dimensions.Operator", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Not.Dimensions.Values", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Dimensions.Values", Name: validation.MinItems, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Dimensions.Values", Name: validation.MinItems, Rule: 0, Chain: nil}}}, }}, {Target: "parameters.BudgetProperties.Filter.Not.Tags", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Tags.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Not.Tags.Operator", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Not.Tags.Values", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Tags.Values", Name: validation.MinItems, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Not.Tags.Values", Name: validation.MinItems, Rule: 0, Chain: nil}}}, }}, }}, {Target: "parameters.BudgetProperties.Filter.Dimensions", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Dimensions.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Dimensions.Operator", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Dimensions.Values", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Dimensions.Values", Name: validation.MinItems, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Dimensions.Values", Name: validation.MinItems, Rule: 0, Chain: nil}}}, }}, {Target: "parameters.BudgetProperties.Filter.Tags", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Tags.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Tags.Operator", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.BudgetProperties.Filter.Tags.Values", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Tags.Values", Name: validation.MinItems, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.BudgetProperties.Filter.Tags.Values", Name: validation.MinItems, Rule: 0, Chain: nil}}}, }}, }}, }}}}}); err != nil { diff --git a/services/consumption/mgmt/2019-10-01/consumption/consumptionapi/interfaces.go b/services/consumption/mgmt/2019-10-01/consumption/consumptionapi/interfaces.go index 959201a4529d..6f14cb0c8afb 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/consumptionapi/interfaces.go +++ b/services/consumption/mgmt/2019-10-01/consumption/consumptionapi/interfaces.go @@ -95,7 +95,7 @@ var _ ReservationRecommendationsClientAPI = (*consumption.ReservationRecommendat // ReservationRecommendationDetailsClientAPI contains the set of methods on the ReservationRecommendationDetailsClient type. type ReservationRecommendationDetailsClientAPI interface { - Get(ctx context.Context, billingScope string, scope consumption.Scope11, region string, term consumption.Term, lookBackPeriod consumption.LookBackPeriod, product string) (result consumption.ReservationRecommendationDetailsModel, err error) + Get(ctx context.Context, billingScope string, scope consumption.Scope14, region string, term consumption.Term, lookBackPeriod consumption.LookBackPeriod, product string) (result consumption.ReservationRecommendationDetailsModel, err error) } var _ ReservationRecommendationDetailsClientAPI = (*consumption.ReservationRecommendationDetailsClient)(nil) @@ -143,23 +143,23 @@ var _ AggregatedCostClientAPI = (*consumption.AggregatedCostClient)(nil) // EventsClientAPI contains the set of methods on the EventsClient type. type EventsClientAPI interface { - List(ctx context.Context, billingAccountID string, billingProfileID string, startDate string, endDate string) (result consumption.EventsPage, err error) - ListComplete(ctx context.Context, billingAccountID string, billingProfileID string, startDate string, endDate string) (result consumption.EventsIterator, err error) + List(ctx context.Context, startDate string, endDate string, scope string) (result consumption.EventsPage, err error) + ListComplete(ctx context.Context, startDate string, endDate string, scope string) (result consumption.EventsIterator, err error) } var _ EventsClientAPI = (*consumption.EventsClient)(nil) // LotsClientAPI contains the set of methods on the LotsClient type. type LotsClientAPI interface { - List(ctx context.Context, billingAccountID string, billingProfileID string) (result consumption.LotsPage, err error) - ListComplete(ctx context.Context, billingAccountID string, billingProfileID string) (result consumption.LotsIterator, err error) + List(ctx context.Context, scope string) (result consumption.LotsPage, err error) + ListComplete(ctx context.Context, scope string) (result consumption.LotsIterator, err error) } var _ LotsClientAPI = (*consumption.LotsClient)(nil) // CreditsClientAPI contains the set of methods on the CreditsClient type. type CreditsClientAPI interface { - Get(ctx context.Context, billingAccountID string, billingProfileID string) (result consumption.CreditSummary, err error) + Get(ctx context.Context, scope string) (result consumption.CreditSummary, err error) } var _ CreditsClientAPI = (*consumption.CreditsClient)(nil) diff --git a/services/consumption/mgmt/2019-10-01/consumption/credits.go b/services/consumption/mgmt/2019-10-01/consumption/credits.go index a0ac2787ed61..82e7ccb954f0 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/credits.go +++ b/services/consumption/mgmt/2019-10-01/consumption/credits.go @@ -33,9 +33,12 @@ func NewCreditsClientWithBaseURI(baseURI string, subscriptionID string) CreditsC // Get the credit summary by billingAccountId and billingProfileId. // Parameters: -// billingAccountID - billingAccount ID -// billingProfileID - azure Billing Profile ID. -func (client CreditsClient) Get(ctx context.Context, billingAccountID string, billingProfileID string) (result CreditSummary, err error) { +// scope - the scope associated with credits operations. This includes +// '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for +// Billing Profile scope, and +// 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for +// partners. +func (client CreditsClient) Get(ctx context.Context, scope string) (result CreditSummary, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/CreditsClient.Get") defer func() { @@ -46,7 +49,7 @@ func (client CreditsClient) Get(ctx context.Context, billingAccountID string, bi tracing.EndSpan(ctx, sc, err) }() } - req, err := client.GetPreparer(ctx, billingAccountID, billingProfileID) + req, err := client.GetPreparer(ctx, scope) if err != nil { err = autorest.NewErrorWithError(err, "consumption.CreditsClient", "Get", nil, "Failure preparing request") return @@ -69,10 +72,9 @@ func (client CreditsClient) Get(ctx context.Context, billingAccountID string, bi } // GetPreparer prepares the Get request. -func (client CreditsClient) GetPreparer(ctx context.Context, billingAccountID string, billingProfileID string) (*http.Request, error) { +func (client CreditsClient) GetPreparer(ctx context.Context, scope string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "billingAccountId": autorest.Encode("path", billingAccountID), - "billingProfileId": autorest.Encode("path", billingProfileID), + "scope": scope, } const APIVersion = "2019-10-01" @@ -83,7 +85,7 @@ func (client CreditsClient) GetPreparer(ctx context.Context, billingAccountID st preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/credits/balanceSummary", pathParameters), + autorest.WithPathParameters("/{scope}/providers/Microsoft.Consumption/credits/balanceSummary", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } diff --git a/services/consumption/mgmt/2019-10-01/consumption/enums.go b/services/consumption/mgmt/2019-10-01/consumption/enums.go index 05b889fc3ef9..57b5f2d1c4d6 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/enums.go +++ b/services/consumption/mgmt/2019-10-01/consumption/enums.go @@ -53,6 +53,59 @@ func PossibleChargeTypeValues() []ChargeType { return []ChargeType{ChargeTypeActual, ChargeTypeForecast} } +// CultureCode enumerates the values for culture code. +type CultureCode string + +const ( + // CsCz ... + CsCz CultureCode = "cs-cz" + // DaDk ... + DaDk CultureCode = "da-dk" + // DeDe ... + DeDe CultureCode = "de-de" + // EnGb ... + EnGb CultureCode = "en-gb" + // EnUs ... + EnUs CultureCode = "en-us" + // EsEs ... + EsEs CultureCode = "es-es" + // FrFr ... + FrFr CultureCode = "fr-fr" + // HuHu ... + HuHu CultureCode = "hu-hu" + // ItIt ... + ItIt CultureCode = "it-it" + // JaJp ... + JaJp CultureCode = "ja-jp" + // KoKr ... + KoKr CultureCode = "ko-kr" + // NbNo ... + NbNo CultureCode = "nb-no" + // NlNl ... + NlNl CultureCode = "nl-nl" + // PlPl ... + PlPl CultureCode = "pl-pl" + // PtBr ... + PtBr CultureCode = "pt-br" + // PtPt ... + PtPt CultureCode = "pt-pt" + // RuRu ... + RuRu CultureCode = "ru-ru" + // SvSe ... + SvSe CultureCode = "sv-se" + // TrTr ... + TrTr CultureCode = "tr-tr" + // ZhCn ... + ZhCn CultureCode = "zh-cn" + // ZhTw ... + ZhTw CultureCode = "zh-tw" +) + +// PossibleCultureCodeValues returns an array of possible values for the CultureCode const type. +func PossibleCultureCodeValues() []CultureCode { + return []CultureCode{CsCz, DaDk, DeDe, EnGb, EnUs, EsEs, FrFr, HuHu, ItIt, JaJp, KoKr, NbNo, NlNl, PlPl, PtBr, PtPt, RuRu, SvSe, TrTr, ZhCn, ZhTw} +} + // Datagrain enumerates the values for datagrain. type Datagrain string @@ -227,34 +280,34 @@ func PossibleOperatorTypeValues() []OperatorType { return []OperatorType{EqualTo, GreaterThan, GreaterThanOrEqualTo} } -// Scope11 enumerates the values for scope 11. -type Scope11 string +// Scope12 enumerates the values for scope 12. +type Scope12 string const ( // Shared ... - Shared Scope11 = "Shared" + Shared Scope12 = "Shared" // Single ... - Single Scope11 = "Single" + Single Scope12 = "Single" ) -// PossibleScope11Values returns an array of possible values for the Scope11 const type. -func PossibleScope11Values() []Scope11 { - return []Scope11{Shared, Single} +// PossibleScope12Values returns an array of possible values for the Scope12 const type. +func PossibleScope12Values() []Scope12 { + return []Scope12{Shared, Single} } -// Scope9 enumerates the values for scope 9. -type Scope9 string +// Scope14 enumerates the values for scope 14. +type Scope14 string const ( - // Scope9Shared ... - Scope9Shared Scope9 = "Shared" - // Scope9Single ... - Scope9Single Scope9 = "Single" + // Scope14Shared ... + Scope14Shared Scope14 = "Shared" + // Scope14Single ... + Scope14Single Scope14 = "Single" ) -// PossibleScope9Values returns an array of possible values for the Scope9 const type. -func PossibleScope9Values() []Scope9 { - return []Scope9{Scope9Shared, Scope9Single} +// PossibleScope14Values returns an array of possible values for the Scope14 const type. +func PossibleScope14Values() []Scope14 { + return []Scope14{Scope14Shared, Scope14Single} } // Term enumerates the values for term. diff --git a/services/consumption/mgmt/2019-10-01/consumption/events.go b/services/consumption/mgmt/2019-10-01/consumption/events.go index 699f93c41f07..94ff2d054550 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/events.go +++ b/services/consumption/mgmt/2019-10-01/consumption/events.go @@ -33,11 +33,14 @@ func NewEventsClientWithBaseURI(baseURI string, subscriptionID string) EventsCli // List lists the events by billingAccountId and billingProfileId for given start and end date. // Parameters: -// billingAccountID - billingAccount ID -// billingProfileID - azure Billing Profile ID. // startDate - start date // endDate - end date -func (client EventsClient) List(ctx context.Context, billingAccountID string, billingProfileID string, startDate string, endDate string) (result EventsPage, err error) { +// scope - the scope associated with events operations. This includes +// '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for +// Billing Profile scope, and +// 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for +// partners. +func (client EventsClient) List(ctx context.Context, startDate string, endDate string, scope string) (result EventsPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/EventsClient.List") defer func() { @@ -49,7 +52,7 @@ func (client EventsClient) List(ctx context.Context, billingAccountID string, bi }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx, billingAccountID, billingProfileID, startDate, endDate) + req, err := client.ListPreparer(ctx, startDate, endDate, scope) if err != nil { err = autorest.NewErrorWithError(err, "consumption.EventsClient", "List", nil, "Failure preparing request") return @@ -76,10 +79,9 @@ func (client EventsClient) List(ctx context.Context, billingAccountID string, bi } // ListPreparer prepares the List request. -func (client EventsClient) ListPreparer(ctx context.Context, billingAccountID string, billingProfileID string, startDate string, endDate string) (*http.Request, error) { +func (client EventsClient) ListPreparer(ctx context.Context, startDate string, endDate string, scope string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "billingAccountId": autorest.Encode("path", billingAccountID), - "billingProfileId": autorest.Encode("path", billingProfileID), + "scope": scope, } const APIVersion = "2019-10-01" @@ -92,7 +94,7 @@ func (client EventsClient) ListPreparer(ctx context.Context, billingAccountID st preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/events", pathParameters), + autorest.WithPathParameters("/{scope}/providers/Microsoft.Consumption/events", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -137,7 +139,7 @@ func (client EventsClient) listNextResults(ctx context.Context, lastResults Even } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client EventsClient) ListComplete(ctx context.Context, billingAccountID string, billingProfileID string, startDate string, endDate string) (result EventsIterator, err error) { +func (client EventsClient) ListComplete(ctx context.Context, startDate string, endDate string, scope string) (result EventsIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/EventsClient.List") defer func() { @@ -148,6 +150,6 @@ func (client EventsClient) ListComplete(ctx context.Context, billingAccountID st tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx, billingAccountID, billingProfileID, startDate, endDate) + result.page, err = client.List(ctx, startDate, endDate, scope) return } diff --git a/services/consumption/mgmt/2019-10-01/consumption/forecasts.go b/services/consumption/mgmt/2019-10-01/consumption/forecasts.go index ca46f018b28d..b2e7d2136592 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/forecasts.go +++ b/services/consumption/mgmt/2019-10-01/consumption/forecasts.go @@ -31,7 +31,9 @@ func NewForecastsClientWithBaseURI(baseURI string, subscriptionID string) Foreca return ForecastsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// List lists the forecast charges by subscriptionId. +// List lists the forecast charges for scope defined. Please note that this API is no longer actively under +// development. We recommend using our new Forecast API moving forward: +// https://docs.microsoft.com/en-us/rest/api/cost-management/forecast/usage. // Parameters: // filter - may be used to filter forecasts by properties/usageDate (Utc time), properties/chargeType or // properties/grain. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support diff --git a/services/consumption/mgmt/2019-10-01/consumption/lots.go b/services/consumption/mgmt/2019-10-01/consumption/lots.go index 1c6584b210e6..b35c9130d82f 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/lots.go +++ b/services/consumption/mgmt/2019-10-01/consumption/lots.go @@ -33,9 +33,12 @@ func NewLotsClientWithBaseURI(baseURI string, subscriptionID string) LotsClient // List lists the lots by billingAccountId and billingProfileId. // Parameters: -// billingAccountID - billingAccount ID -// billingProfileID - azure Billing Profile ID. -func (client LotsClient) List(ctx context.Context, billingAccountID string, billingProfileID string) (result LotsPage, err error) { +// scope - the scope associated with Lots operations. This includes +// '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfile/{billingProfileId}' for +// Billing Profile scope, and +// 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/customers/{customerId}' specific for +// partners. +func (client LotsClient) List(ctx context.Context, scope string) (result LotsPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LotsClient.List") defer func() { @@ -47,7 +50,7 @@ func (client LotsClient) List(ctx context.Context, billingAccountID string, bill }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx, billingAccountID, billingProfileID) + req, err := client.ListPreparer(ctx, scope) if err != nil { err = autorest.NewErrorWithError(err, "consumption.LotsClient", "List", nil, "Failure preparing request") return @@ -74,10 +77,9 @@ func (client LotsClient) List(ctx context.Context, billingAccountID string, bill } // ListPreparer prepares the List request. -func (client LotsClient) ListPreparer(ctx context.Context, billingAccountID string, billingProfileID string) (*http.Request, error) { +func (client LotsClient) ListPreparer(ctx context.Context, scope string) (*http.Request, error) { pathParameters := map[string]interface{}{ - "billingAccountId": autorest.Encode("path", billingAccountID), - "billingProfileId": autorest.Encode("path", billingProfileID), + "scope": scope, } const APIVersion = "2019-10-01" @@ -88,7 +90,7 @@ func (client LotsClient) ListPreparer(ctx context.Context, billingAccountID stri preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/lots", pathParameters), + autorest.WithPathParameters("/{scope}/providers/Microsoft.Consumption/lots", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -133,7 +135,7 @@ func (client LotsClient) listNextResults(ctx context.Context, lastResults Lots) } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client LotsClient) ListComplete(ctx context.Context, billingAccountID string, billingProfileID string) (result LotsIterator, err error) { +func (client LotsClient) ListComplete(ctx context.Context, scope string) (result LotsIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LotsClient.List") defer func() { @@ -144,6 +146,6 @@ func (client LotsClient) ListComplete(ctx context.Context, billingAccountID stri tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx, billingAccountID, billingProfileID) + result.page, err = client.List(ctx, scope) return } diff --git a/services/consumption/mgmt/2019-10-01/consumption/models.go b/services/consumption/mgmt/2019-10-01/consumption/models.go index 678711298328..746ac5c5ca78 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/models.go +++ b/services/consumption/mgmt/2019-10-01/consumption/models.go @@ -35,6 +35,24 @@ func (a Amount) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// AmountWithExchangeRate reseller details +type AmountWithExchangeRate struct { + // ExchangeRate - READ-ONLY; Exchange Rate. + ExchangeRate *decimal.Decimal `json:"exchangeRate,omitempty"` + // ExchangeRateMonth - READ-ONLY; Exchange rate month. + ExchangeRateMonth *float64 `json:"exchangeRateMonth,omitempty"` + // Currency - READ-ONLY; Amount currency. + Currency *string `json:"currency,omitempty"` + // Value - READ-ONLY; Amount. + Value *decimal.Decimal `json:"value,omitempty"` +} + +// MarshalJSON is the custom marshaler for AmountWithExchangeRate. +func (awer AmountWithExchangeRate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + // Balance a balance resource. type Balance struct { autorest.Response `json:"-"` @@ -45,6 +63,8 @@ type Balance struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -103,6 +123,15 @@ func (b *Balance) UnmarshalJSON(body []byte) error { } b.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + b.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -315,12 +344,14 @@ type BudgetProperties struct { 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 twelve months. Past start date should be selected within the timegrain period. There are no restrictions on the end date. TimePeriod *BudgetTimePeriod `json:"timePeriod,omitempty"` - // Filter - May be used to filter budgets by resource group, resource, or meter. + // Filter - May be used to filter budgets by user-specified dimensions and/or tags. Filter *BudgetFilter `json:"filter,omitempty"` // CurrentSpend - READ-ONLY; The current amount of cost which is being tracked for a budget. CurrentSpend *CurrentSpend `json:"currentSpend,omitempty"` // Notifications - Dictionary of notifications associated with the budget. Budget can have up to five notifications. Notifications map[string]*Notification `json:"notifications"` + // ForecastSpend - READ-ONLY; The forecasted cost which is being tracked for a budget. + ForecastSpend *ForecastSpend `json:"forecastSpend,omitempty"` } // MarshalJSON is the custom marshaler for BudgetProperties. @@ -574,6 +605,8 @@ type ChargeSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -655,6 +688,10 @@ type CreditBalanceSummary struct { EstimatedBalance *Amount `json:"estimatedBalance,omitempty"` // CurrentBalance - READ-ONLY; Current balance. CurrentBalance *Amount `json:"currentBalance,omitempty"` + // EstimatedBalanceInBillingCurrency - READ-ONLY; Current balance. + EstimatedBalanceInBillingCurrency *AmountWithExchangeRate `json:"estimatedBalanceInBillingCurrency,omitempty"` + // CurrentBalanceInBillingCurrency - READ-ONLY; Current balance. + CurrentBalanceInBillingCurrency *AmountWithExchangeRate `json:"currentBalanceInBillingCurrency,omitempty"` } // MarshalJSON is the custom marshaler for CreditBalanceSummary. @@ -673,6 +710,8 @@ type CreditSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -731,6 +770,15 @@ func (cs *CreditSummary) UnmarshalJSON(body []byte) error { } cs.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + cs.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -748,6 +796,10 @@ func (cs *CreditSummary) UnmarshalJSON(body []byte) error { // CreditSummaryProperties the properties of the credit summary. type CreditSummaryProperties struct { + // CreditCurrency - READ-ONLY; Credit Currency + CreditCurrency *string `json:"creditCurrency,omitempty"` + // BillingCurrency - READ-ONLY; Billing Currency. + BillingCurrency *string `json:"billingCurrency,omitempty"` // BalanceSummary - READ-ONLY; Summary of balances associated with this credit summary. BalanceSummary *CreditBalanceSummary `json:"balanceSummary,omitempty"` // PendingCreditAdjustments - READ-ONLY; Pending credit adjustments. @@ -756,6 +808,8 @@ type CreditSummaryProperties struct { ExpiredCredit *Amount `json:"expiredCredit,omitempty"` // PendingEligibleCharges - READ-ONLY; Pending eligible charges. PendingEligibleCharges *Amount `json:"pendingEligibleCharges,omitempty"` + // Reseller - READ-ONLY; Reseller details. + Reseller *Reseller `json:"reseller,omitempty"` } // MarshalJSON is the custom marshaler for CreditSummaryProperties. @@ -778,6 +832,20 @@ func (cs CurrentSpend) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// DownloadProperties the properties of the price sheet download. +type DownloadProperties struct { + // DownloadURL - READ-ONLY; The link (url) to download the pricesheet. + DownloadURL *string `json:"downloadUrl,omitempty"` + // ValidTill - READ-ONLY; Download link validity. + ValidTill *string `json:"validTill,omitempty"` +} + +// MarshalJSON is the custom marshaler for DownloadProperties. +func (dp DownloadProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + // ErrorDetails the details of the error. type ErrorDetails struct { // Code - READ-ONLY; Error code. @@ -809,24 +877,40 @@ type ErrorResponse struct { // EventProperties the event properties. type EventProperties struct { + // CreditCurrency - READ-ONLY; Credit Currency + CreditCurrency *string `json:"creditCurrency,omitempty"` + // BillingCurrency - READ-ONLY; Billing Currency. + BillingCurrency *string `json:"billingCurrency,omitempty"` // TransactionDate - READ-ONLY; Transaction date. TransactionDate *date.Time `json:"transactionDate,omitempty"` // Description - READ-ONLY; Transaction description. Description *string `json:"description,omitempty"` // NewCredit - READ-ONLY; New Credit. NewCredit *Amount `json:"newCredit,omitempty"` + // NewCreditInBillingCurrency - READ-ONLY; Current balance. + NewCreditInBillingCurrency *AmountWithExchangeRate `json:"newCreditInBillingCurrency,omitempty"` // Adjustments - READ-ONLY; Adjustments amount. Adjustments *Amount `json:"adjustments,omitempty"` + // AdjustmentsInBillingCurrency - READ-ONLY; Current balance. + AdjustmentsInBillingCurrency *AmountWithExchangeRate `json:"adjustmentsInBillingCurrency,omitempty"` // CreditExpired - READ-ONLY; Credit expired. CreditExpired *Amount `json:"creditExpired,omitempty"` + // CreditExpiredInBillingCurrency - READ-ONLY; Current balance. + CreditExpiredInBillingCurrency *AmountWithExchangeRate `json:"creditExpiredInBillingCurrency,omitempty"` // Charges - READ-ONLY; Charges amount. Charges *Amount `json:"charges,omitempty"` + // ChargesInBillingCurrency - READ-ONLY; Current balance. + ChargesInBillingCurrency *AmountWithExchangeRate `json:"chargesInBillingCurrency,omitempty"` // ClosedBalance - READ-ONLY; Closed balance. ClosedBalance *Amount `json:"closedBalance,omitempty"` + // ClosedBalanceInBillingCurrency - READ-ONLY; Current balance. + ClosedBalanceInBillingCurrency *AmountWithExchangeRate `json:"closedBalanceInBillingCurrency,omitempty"` // EventType - The type of event. Possible values include: 'SettledCharges', 'PendingCharges', 'PendingAdjustments', 'PendingNewCredit', 'PendingExpiredCredit', 'UnKnown', 'NewCredit' EventType EventType `json:"eventType,omitempty"` // InvoiceNumber - READ-ONLY; Invoice number. InvoiceNumber *string `json:"invoiceNumber,omitempty"` + // Reseller - READ-ONLY; Reseller details. + Reseller *Reseller `json:"reseller,omitempty"` } // MarshalJSON is the custom marshaler for EventProperties. @@ -1012,6 +1096,8 @@ type EventSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -1070,6 +1156,15 @@ func (es *EventSummary) UnmarshalJSON(body []byte) error { } es.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + es.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -1094,6 +1189,8 @@ type Forecast struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -1152,6 +1249,15 @@ func (f *Forecast) UnmarshalJSON(body []byte) error { } f.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + f.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -1171,7 +1277,7 @@ func (f *Forecast) UnmarshalJSON(body []byte) error { type ForecastProperties struct { // UsageDate - READ-ONLY; The usage date of the forecast. UsageDate *string `json:"usageDate,omitempty"` - // Grain - The granularity of forecast. Possible values include: 'Daily', 'Monthly', 'Yearly' + // Grain - The granularity of forecast. Please note that Yearly is not currently supported in this API. The API will provide responses in the Monthly grain if Yearly is selected. To get yearly grain data, please use our newer Forecast API. Possible values include: 'Daily', 'Monthly', 'Yearly' Grain Grain `json:"grain,omitempty"` // Charge - READ-ONLY; The amount of charge Charge *decimal.Decimal `json:"charge,omitempty"` @@ -1227,6 +1333,49 @@ func (flr ForecastsListResult) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// ForecastSpend the forecasted cost which is being tracked for a budget. +type ForecastSpend struct { + // Amount - READ-ONLY; 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. + Amount *decimal.Decimal `json:"amount,omitempty"` + // Unit - READ-ONLY; The unit of measure for the budget amount. + Unit *string `json:"unit,omitempty"` +} + +// MarshalJSON is the custom marshaler for ForecastSpend. +func (fs ForecastSpend) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// HighCasedErrorDetails the details of the error. +type HighCasedErrorDetails struct { + // Code - READ-ONLY; Error code. + Code *string `json:"code,omitempty"` + // Message - READ-ONLY; Error message indicating why the operation failed. + Message *string `json:"message,omitempty"` +} + +// MarshalJSON is the custom marshaler for HighCasedErrorDetails. +func (hced HighCasedErrorDetails) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// HighCasedErrorResponse error response indicates that the service is not able to process the incoming +// request. The reason is provided in the error message. +// +// Some Error responses: +// +// * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the +// "x-ms-ratelimit-microsoft.consumption-retry-after" header. +// +// * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time +// specified in the "Retry-After" header. +type HighCasedErrorResponse struct { + // Error - The details of the error. + Error *HighCasedErrorDetails `json:"error,omitempty"` +} + // LegacyChargeSummary legacy charge summary. type LegacyChargeSummary struct { // LegacyChargeSummaryProperties - Properties for legacy charge summary @@ -1239,6 +1388,8 @@ type LegacyChargeSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -1330,6 +1481,15 @@ func (lcs *LegacyChargeSummary) UnmarshalJSON(body []byte) error { } lcs.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + lcs.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -1379,6 +1539,8 @@ type LegacyReservationRecommendation struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` // Location - READ-ONLY; Resource location @@ -1467,6 +1629,15 @@ func (lrr *LegacyReservationRecommendation) UnmarshalJSON(body []byte) error { } lrr.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + lrr.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -1514,7 +1685,7 @@ type LegacyReservationRecommendationProperties struct { // LookBackPeriod - READ-ONLY; The number of days of usage to look back for recommendation. LookBackPeriod *string `json:"lookBackPeriod,omitempty"` // InstanceFlexibilityRatio - READ-ONLY; The instance Flexibility Ratio. - InstanceFlexibilityRatio *int32 `json:"instanceFlexibilityRatio,omitempty"` + InstanceFlexibilityRatio *float64 `json:"instanceFlexibilityRatio,omitempty"` // InstanceFlexibilityGroup - READ-ONLY; The instance Flexibility Group. InstanceFlexibilityGroup *string `json:"instanceFlexibilityGroup,omitempty"` // NormalizedSize - READ-ONLY; The normalized Size. @@ -1523,6 +1694,8 @@ type LegacyReservationRecommendationProperties struct { RecommendedQuantityNormalized *float64 `json:"recommendedQuantityNormalized,omitempty"` // MeterID - READ-ONLY; The meter id (GUID) MeterID *uuid.UUID `json:"meterId,omitempty"` + // ResourceType - READ-ONLY; The azure resource type. + ResourceType *string `json:"resourceType,omitempty"` // Term - READ-ONLY; RI recommendations in one or three year terms. Term *string `json:"term,omitempty"` // CostWithNoReservedInstances - READ-ONLY; The total amount of cost without reserved instances. @@ -1689,6 +1862,8 @@ type LegacyUsageDetail struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` // Kind - Possible values include: 'KindUsageDetail', 'KindLegacy', 'KindModern' @@ -1782,6 +1957,15 @@ func (lud *LegacyUsageDetail) UnmarshalJSON(body []byte) error { } lud.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + lud.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -1893,10 +2077,18 @@ func (ludp LegacyUsageDetailProperties) MarshalJSON() ([]byte, error) { // LotProperties the lot properties. type LotProperties struct { + // CreditCurrency - READ-ONLY; Credit Currency + CreditCurrency *string `json:"creditCurrency,omitempty"` + // BillingCurrency - READ-ONLY; Billing Currency. + BillingCurrency *string `json:"billingCurrency,omitempty"` // OriginalAmount - READ-ONLY; Original amount. OriginalAmount *Amount `json:"originalAmount,omitempty"` + // OriginalAmountInBillingCurrency - READ-ONLY; Current balance. + OriginalAmountInBillingCurrency *AmountWithExchangeRate `json:"originalAmountInBillingCurrency,omitempty"` // ClosedBalance - READ-ONLY; Closed balance. ClosedBalance *Amount `json:"closedBalance,omitempty"` + // ClosedBalanceInBillingCurrency - READ-ONLY; Current balance. + ClosedBalanceInBillingCurrency *AmountWithExchangeRate `json:"closedBalanceInBillingCurrency,omitempty"` // Source - READ-ONLY; Lot source. Possible values include: 'PurchasedCredit', 'PromotionalCredit' Source LotSource `json:"source,omitempty"` // StartDate - READ-ONLY; Start date. @@ -1905,6 +2097,8 @@ type LotProperties struct { ExpirationDate *date.Time `json:"expirationDate,omitempty"` // PoNumber - READ-ONLY; PO number. PoNumber *string `json:"poNumber,omitempty"` + // Reseller - READ-ONLY; Reseller details. + Reseller *Reseller `json:"reseller,omitempty"` } // MarshalJSON is the custom marshaler for LotProperties. @@ -2087,6 +2281,8 @@ type LotSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -2145,6 +2341,15 @@ func (ls *LotSummary) UnmarshalJSON(body []byte) error { } ls.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + ls.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -2209,6 +2414,8 @@ type ManagementGroupAggregatedCostResult struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -2267,6 +2474,15 @@ func (mgacr *ManagementGroupAggregatedCostResult) UnmarshalJSON(body []byte) err } mgacr.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + mgacr.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -2291,6 +2507,8 @@ type Marketplace struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -2349,6 +2567,15 @@ func (mVar *Marketplace) UnmarshalJSON(body []byte) error { } mVar.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + mVar.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -2378,6 +2605,8 @@ type MarketplaceProperties struct { OfferName *string `json:"offerName,omitempty"` // ResourceGroup - READ-ONLY; The name of resource group. ResourceGroup *string `json:"resourceGroup,omitempty"` + // AdditionalInfo - READ-ONLY; Additional information. + AdditionalInfo *string `json:"additionalInfo,omitempty"` // OrderNumber - READ-ONLY; The order number. OrderNumber *string `json:"orderNumber,omitempty"` // InstanceName - READ-ONLY; The name of the resource instance that the usage is about. @@ -2650,6 +2879,8 @@ type ModernChargeSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -2741,6 +2972,15 @@ func (mcs *ModernChargeSummary) UnmarshalJSON(body []byte) error { } mcs.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + mcs.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -2792,12 +3032,16 @@ func (mcsp ModernChargeSummaryProperties) MarshalJSON() ([]byte, error) { type ModernReservationRecommendation struct { // ModernReservationRecommendationProperties - Properties for modern reservation recommendation *ModernReservationRecommendationProperties `json:"properties,omitempty"` + // ETag - READ-ONLY; Resource eTag. + ETag *string `json:"eTag,omitempty"` // ID - READ-ONLY; Resource Id. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` // Location - READ-ONLY; Resource location @@ -2859,6 +3103,15 @@ func (mrr *ModernReservationRecommendation) UnmarshalJSON(body []byte) error { } mrr.ModernReservationRecommendationProperties = &modernReservationRecommendationProperties } + case "eTag": + if v != nil { + var eTag string + err = json.Unmarshal(*v, &eTag) + if err != nil { + return err + } + mrr.ETag = &eTag + } case "id": if v != nil { var ID string @@ -2886,6 +3139,15 @@ func (mrr *ModernReservationRecommendation) UnmarshalJSON(body []byte) error { } mrr.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + mrr.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -2930,10 +3192,12 @@ func (mrr *ModernReservationRecommendation) UnmarshalJSON(body []byte) error { // ModernReservationRecommendationProperties the properties of the reservation recommendation. type ModernReservationRecommendationProperties struct { + // Location - READ-ONLY; Resource Location. + Location *string `json:"location,omitempty"` // LookBackPeriod - READ-ONLY; The number of days of usage to look back for recommendation. - LookBackPeriod *string `json:"lookBackPeriod,omitempty"` + LookBackPeriod *int32 `json:"lookBackPeriod,omitempty"` // InstanceFlexibilityRatio - READ-ONLY; The instance Flexibility Ratio. - InstanceFlexibilityRatio *int32 `json:"instanceFlexibilityRatio,omitempty"` + InstanceFlexibilityRatio *float64 `json:"instanceFlexibilityRatio,omitempty"` // InstanceFlexibilityGroup - READ-ONLY; The instance Flexibility Group. InstanceFlexibilityGroup *string `json:"instanceFlexibilityGroup,omitempty"` // NormalizedSize - READ-ONLY; The normalized Size. @@ -2958,6 +3222,12 @@ type ModernReservationRecommendationProperties struct { Scope *string `json:"scope,omitempty"` // SkuProperties - READ-ONLY; List of sku properties SkuProperties *[]SkuProperty `json:"skuProperties,omitempty"` + // SkuName - READ-ONLY; This is the ARM Sku name. + SkuName *string `json:"skuName,omitempty"` + // ResourceType - READ-ONLY; The Azure resource type. + ResourceType *string `json:"resourceType,omitempty"` + // SubscriptionID - READ-ONLY; The Azure subscription ID. + SubscriptionID *string `json:"subscriptionId,omitempty"` } // MarshalJSON is the custom marshaler for ModernReservationRecommendationProperties. @@ -3276,6 +3546,8 @@ type ModernUsageDetail struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -3367,6 +3639,15 @@ func (mud *ModernUsageDetail) UnmarshalJSON(body []byte) error { } mud.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + mud.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -3405,7 +3686,7 @@ type ModernUsageDetailProperties struct { // Product - READ-ONLY; Name of the product that has accrued charges by consumption or purchase as listed in the invoice. Not available for Marketplace. Product *string `json:"product,omitempty"` // MeterID - READ-ONLY; The meter id (GUID). Not available for marketplace. For reserved instance this represents the primary meter for which the reservation was purchased. For the actual VM Size for which the reservation is purchased see productOrderName. - MeterID *uuid.UUID `json:"meterId,omitempty"` + MeterID *string `json:"meterId,omitempty"` // MeterName - READ-ONLY; Identifies the name of the meter against which consumption is measured. MeterName *string `json:"meterName,omitempty"` // MeterRegion - READ-ONLY; Identifies the location of the datacenter for certain services that are priced based on datacenter location. @@ -3480,7 +3761,7 @@ type ModernUsageDetailProperties struct { PreviousInvoiceID *string `json:"previousInvoiceId,omitempty"` // PricingCurrencyCode - READ-ONLY; Pricing Billing Currency. PricingCurrencyCode *string `json:"pricingCurrencyCode,omitempty"` - // ProductIdentifier - READ-ONLY; Identifer for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SKuId in partner center. + // ProductIdentifier - READ-ONLY; Identifier for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SkuId in partner center. ProductIdentifier *string `json:"productIdentifier,omitempty"` // ResourceLocationNormalized - READ-ONLY; Resource Location Normalized. ResourceLocationNormalized *string `json:"resourceLocationNormalized,omitempty"` @@ -3514,6 +3795,8 @@ type ModernUsageDetailProperties struct { PartnerEarnedCreditRate *decimal.Decimal `json:"partnerEarnedCreditRate,omitempty"` // PartnerEarnedCreditApplied - READ-ONLY; Flag to indicate if partner earned credit has been applied or not. PartnerEarnedCreditApplied *string `json:"partnerEarnedCreditApplied,omitempty"` + // PayGPrice - READ-ONLY; Retail price for the resource. + PayGPrice *decimal.Decimal `json:"payGPrice,omitempty"` } // MarshalJSON is the custom marshaler for ModernUsageDetailProperties. @@ -3530,18 +3813,22 @@ type Notification struct { Operator OperatorType `json:"operator,omitempty"` // Threshold - Threshold value associated with a notification. Notification is sent when the cost exceeded the threshold. It is always percent and has to be between 0 and 1000. Threshold *decimal.Decimal `json:"threshold,omitempty"` - // ContactEmails - Email addresses to send the budget notification to when the threshold is exceeded. + // ContactEmails - Email addresses to send the budget notification to when the threshold is exceeded. Must have at least one contact email or contact group specified at the Subscription or Resource Group scopes. All other scopes must have at least one contact email specified. ContactEmails *[]string `json:"contactEmails,omitempty"` // ContactRoles - Contact roles to send the budget notification to when the threshold is exceeded. ContactRoles *[]string `json:"contactRoles,omitempty"` - // ContactGroups - Action groups to send the budget notification to when the threshold is exceeded. + // ContactGroups - Action groups to send the budget notification to when the threshold is exceeded. Must be provided as a fully qualified Azure resource id. Only supported at Subscription or Resource Group scopes. ContactGroups *[]string `json:"contactGroups,omitempty"` // ThresholdType - The type of threshold. Possible values include: 'Actual' ThresholdType ThresholdType `json:"thresholdType,omitempty"` + // Locale - Language in which the recipient will receive the notification. Possible values include: 'EnUs', 'JaJp', 'ZhCn', 'DeDe', 'EsEs', 'FrFr', 'ItIt', 'KoKr', 'PtBr', 'RuRu', 'ZhTw', 'CsCz', 'PlPl', 'TrTr', 'DaDk', 'EnGb', 'HuHu', 'NbNo', 'NlNl', 'PtPt', 'SvSe' + Locale CultureCode `json:"locale,omitempty"` } // Operation a Consumption REST API operation. type Operation struct { + // ID - READ-ONLY; Operation Id. + ID *string `json:"id,omitempty"` // Name - READ-ONLY; Operation name: {provider}/{resource}/{operation}. Name *string `json:"name,omitempty"` // Display - The object that represents the operation. @@ -3565,6 +3852,8 @@ type OperationDisplay struct { Resource *string `json:"resource,omitempty"` // Operation - READ-ONLY; Operation type: Read, write, delete, etc. Operation *string `json:"operation,omitempty"` + // Description - READ-ONLY; Description of the operation. + Description *string `json:"description,omitempty"` } // MarshalJSON is the custom marshaler for OperationDisplay. @@ -3745,6 +4034,8 @@ type PriceSheetModel struct { Pricesheets *[]PriceSheetProperties `json:"pricesheets,omitempty"` // NextLink - READ-ONLY; The link (url) to the next page of results. NextLink *string `json:"nextLink,omitempty"` + // Download - READ-ONLY; Pricesheet download details. + Download *MeterDetails `json:"download,omitempty"` } // MarshalJSON is the custom marshaler for PriceSheetModel. @@ -3791,6 +4082,8 @@ type PriceSheetResult struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -3849,6 +4142,15 @@ func (psr *PriceSheetResult) UnmarshalJSON(body []byte) error { } psr.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + psr.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -3885,6 +4187,20 @@ func (pr ProxyResource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// Reseller reseller details +type Reseller struct { + // ResellerID - READ-ONLY; Reseller id. + ResellerID *string `json:"resellerId,omitempty"` + // ResellerDescription - READ-ONLY; Reseller Description. + ResellerDescription *string `json:"resellerDescription,omitempty"` +} + +// MarshalJSON is the custom marshaler for Reseller. +func (r Reseller) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + // ReservationDetail reservation detail resource. type ReservationDetail struct { *ReservationDetailProperties `json:"properties,omitempty"` @@ -3894,6 +4210,8 @@ type ReservationDetail struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -3952,6 +4270,15 @@ func (rd *ReservationDetail) UnmarshalJSON(body []byte) error { } rd.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + rd.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -4179,6 +4506,8 @@ type ReservationRecommendation struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` // Location - READ-ONLY; Resource location @@ -4293,7 +4622,9 @@ type ReservationRecommendationDetailsModel struct { // Location - Resource Location. Location *string `json:"location,omitempty"` // Sku - Resource sku - Sku *string `json:"sku,omitempty"` + Sku *string `json:"sku,omitempty"` + // ETag - Resource eTag. + ETag *string `json:"eTag,omitempty"` *ReservationRecommendationDetailsProperties `json:"properties,omitempty"` // ID - READ-ONLY; Resource Id. ID *string `json:"id,omitempty"` @@ -4301,6 +4632,8 @@ type ReservationRecommendationDetailsModel struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -4314,6 +4647,9 @@ func (rrdm ReservationRecommendationDetailsModel) MarshalJSON() ([]byte, error) if rrdm.Sku != nil { objectMap["sku"] = rrdm.Sku } + if rrdm.ETag != nil { + objectMap["eTag"] = rrdm.ETag + } if rrdm.ReservationRecommendationDetailsProperties != nil { objectMap["properties"] = rrdm.ReservationRecommendationDetailsProperties } @@ -4347,6 +4683,15 @@ func (rrdm *ReservationRecommendationDetailsModel) UnmarshalJSON(body []byte) er } rrdm.Sku = &sku } + case "eTag": + if v != nil { + var eTag string + err = json.Unmarshal(*v, &eTag) + if err != nil { + return err + } + rrdm.ETag = &eTag + } case "properties": if v != nil { var reservationRecommendationDetailsProperties ReservationRecommendationDetailsProperties @@ -4383,6 +4728,15 @@ func (rrdm *ReservationRecommendationDetailsModel) UnmarshalJSON(body []byte) er } rrdm.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + rrdm.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -4495,6 +4849,10 @@ type ReservationRecommendationsListResult struct { Value *[]BasicReservationRecommendation `json:"value,omitempty"` // NextLink - READ-ONLY; The link (url) to the next page of results. NextLink *string `json:"nextLink,omitempty"` + // PreviousLink - READ-ONLY; The link (url) to the previous page of results. + PreviousLink *string `json:"previousLink,omitempty"` + // TotalCost - READ-ONLY; The total amount of cost. + TotalCost *string `json:"totalCost,omitempty"` } // MarshalJSON is the custom marshaler for ReservationRecommendationsListResult. @@ -4529,6 +4887,24 @@ func (rrlr *ReservationRecommendationsListResult) UnmarshalJSON(body []byte) err } rrlr.NextLink = &nextLink } + case "previousLink": + if v != nil { + var previousLink string + err = json.Unmarshal(*v, &previousLink) + if err != nil { + return err + } + rrlr.PreviousLink = &previousLink + } + case "totalCost": + if v != nil { + var totalCost string + err = json.Unmarshal(*v, &totalCost) + if err != nil { + return err + } + rrlr.TotalCost = &totalCost + } } } @@ -4861,6 +5237,8 @@ type ReservationSummary struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -4919,6 +5297,15 @@ func (rs *ReservationSummary) UnmarshalJSON(body []byte) error { } rs.Type = &typeVar } + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + rs.Etag = &etag + } case "tags": if v != nil { var tags map[string]*string @@ -5248,6 +5635,8 @@ type Resource struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } @@ -5290,12 +5679,27 @@ func (sp SkuProperty) MarshalJSON() ([]byte, error) { type Tag struct { // Key - Tag key. Key *string `json:"key,omitempty"` + // Value - Tag values. + Value *[]string `json:"value,omitempty"` } // TagProperties the properties of the tag. type TagProperties struct { // Tags - A list of Tag. Tags *[]Tag `json:"tags,omitempty"` + // NextLink - READ-ONLY; The link (url) to the next page of results. + NextLink *string `json:"nextLink,omitempty"` + // PreviousLink - READ-ONLY; The link (url) to the previous page of results. + PreviousLink *string `json:"previousLink,omitempty"` +} + +// MarshalJSON is the custom marshaler for TagProperties. +func (tp TagProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tp.Tags != nil { + objectMap["tags"] = tp.Tags + } + return json.Marshal(objectMap) } // TagsResult a resource listing all tags. @@ -5401,6 +5805,8 @@ type UsageDetail struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // Etag - READ-ONLY; Resource etag. + Etag *string `json:"etag,omitempty"` // Tags - READ-ONLY; Resource tags. Tags map[string]*string `json:"tags"` } diff --git a/services/consumption/mgmt/2019-10-01/consumption/reservationrecommendationdetails.go b/services/consumption/mgmt/2019-10-01/consumption/reservationrecommendationdetails.go index f6d286a65ad4..f9ff41e7914e 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/reservationrecommendationdetails.go +++ b/services/consumption/mgmt/2019-10-01/consumption/reservationrecommendationdetails.go @@ -46,7 +46,7 @@ func NewReservationRecommendationDetailsClientWithBaseURI(baseURI string, subscr // lookBackPeriod - filter the time period on which reservation recommendation results are based. // product - filter the products for which reservation recommendation results are generated. Examples: // Standard_DS1_v2 (for VM), Premium_SSD_Managed_Disks_P30 (for Managed Disks) -func (client ReservationRecommendationDetailsClient) Get(ctx context.Context, billingScope string, scope Scope11, region string, term Term, lookBackPeriod LookBackPeriod, product string) (result ReservationRecommendationDetailsModel, err error) { +func (client ReservationRecommendationDetailsClient) Get(ctx context.Context, billingScope string, scope Scope14, region string, term Term, lookBackPeriod LookBackPeriod, product string) (result ReservationRecommendationDetailsModel, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ReservationRecommendationDetailsClient.Get") defer func() { @@ -80,7 +80,7 @@ func (client ReservationRecommendationDetailsClient) Get(ctx context.Context, bi } // GetPreparer prepares the Get request. -func (client ReservationRecommendationDetailsClient) GetPreparer(ctx context.Context, billingScope string, scope Scope11, region string, term Term, lookBackPeriod LookBackPeriod, product string) (*http.Request, error) { +func (client ReservationRecommendationDetailsClient) GetPreparer(ctx context.Context, billingScope string, scope Scope14, region string, term Term, lookBackPeriod LookBackPeriod, product string) (*http.Request, error) { pathParameters := map[string]interface{}{ "billingScope": billingScope, } diff --git a/services/consumption/mgmt/2019-10-01/consumption/reservationssummaries.go b/services/consumption/mgmt/2019-10-01/consumption/reservationssummaries.go index 6b3c510a4fb3..b0a5f4f65972 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/reservationssummaries.go +++ b/services/consumption/mgmt/2019-10-01/consumption/reservationssummaries.go @@ -39,10 +39,10 @@ func NewReservationsSummariesClientWithBaseURI(baseURI string, subscriptionID st // '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}' for // BillingProfile scope (modern). // grain - can be daily or monthly -// startDate - start date. Only applicable when querying with billing profile -// endDate - end date. Only applicable when querying with billing profile -// filter - required only for daily grain. The properties/UsageDate for start date and end date. The filter -// supports 'le' and 'ge'. Not applicable when querying with billing profile +// startDate - start date. Required only when querying with billing profile +// endDate - end date. Required only when querying with billing profile +// filter - the properties/UsageDate for start date and end date. The filter supports 'le' and 'ge'. Not +// required when querying with billing profile // reservationID - reservation Id GUID. Only valid if reservationOrderId is also provided. Filter to a specific // reservation // reservationOrderID - reservation Order Id GUID. Required if reservationId is provided. Filter to a specific diff --git a/services/consumption/mgmt/2019-10-01/consumption/tags.go b/services/consumption/mgmt/2019-10-01/consumption/tags.go index 9f26eb4a91be..d55821750c5b 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/tags.go +++ b/services/consumption/mgmt/2019-10-01/consumption/tags.go @@ -104,7 +104,7 @@ func (client TagsClient) GetSender(req *http.Request) (*http.Response, error) { func (client TagsClient) GetResponder(resp *http.Response) (result TagsResult, err error) { err = autorest.Respond( resp, - azure.WithErrorUnlessStatusCode(http.StatusOK), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} diff --git a/services/consumption/mgmt/2019-10-01/consumption/usagedetails.go b/services/consumption/mgmt/2019-10-01/consumption/usagedetails.go index 3ef3eb43f3c8..0d4180d68e5e 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/usagedetails.go +++ b/services/consumption/mgmt/2019-10-01/consumption/usagedetails.go @@ -33,7 +33,8 @@ func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) Usa } // List lists the usage details for the defined scope. Usage details are available via this API only for May 1, 2014 or -// later. +// later. For more information on using this API, including how to specify a date range, please see: +// https://docs.microsoft.com/en-us/azure/cost-management-billing/costs/manage-automation // Parameters: // scope - the scope associated with usage details operations. This includes '/subscriptions/{subscriptionId}/' // for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing @@ -54,7 +55,7 @@ func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) Usa // partners. // expand - may be used to expand the properties/additionalInfo or properties/meterDetails within a list of // usage details. By default, these fields are not included when listing usage details. -// filter - may be used to filter usageDetails by properties/resourceGroup, properties/resourceName, +// filter - may be used to filter usageDetails by properties/resourceGroup, properties/instanceName, // properties/resourceId, properties/chargeType, properties/reservationId, properties/publisherType or tags. // The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or // 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:). PublisherType diff --git a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md index 8e5150edd81b..a1ecf841edb0 100644 --- a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md +++ b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md @@ -1,11 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. MeterDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) -1. UsageDetailsListResult.MarshalJSON() ([]byte, error) diff --git a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json index de42dee5ee2f..2ad0311128ca 100644 --- a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json +++ b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-04-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md index 2a1f53abf241..a1ecf841edb0 100644 --- a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md +++ b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md @@ -1,11 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. BudgetsListResult.MarshalJSON() ([]byte, error) -1. CurrentSpend.MarshalJSON() ([]byte, error) -1. ErrorDetails.MarshalJSON() ([]byte, error) -1. OperationDisplay.MarshalJSON() ([]byte, error) -1. OperationListResult.MarshalJSON() ([]byte, error) diff --git a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json index 44a1f90a98ca..7508c246b84a 100644 --- a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json +++ b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "5d48f6af66f294966def3c15967a7568dca5dd62", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-12-preview", "use": "@microsoft.azure/autorest.go@2.1.183",