diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 4d43c767c821..185cba225651 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -296,7 +296,7 @@ com.azure.resourcemanager:azure-resourcemanager-postgresql;1.1.0;1.2.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-hdinsight;1.0.0;1.1.0-beta.3 com.azure.resourcemanager:azure-resourcemanager-sqlvirtualmachine;1.0.0-beta.5;1.0.0-beta.6 com.azure.resourcemanager:azure-resourcemanager-relay;1.0.0-beta.3;1.1.0-beta.1 -com.azure.resourcemanager:azure-resourcemanager-costmanagement;1.0.0-beta.7;1.0.0-beta.8 +com.azure.resourcemanager:azure-resourcemanager-costmanagement;1.0.0-beta.7;1.0.0 com.azure.resourcemanager:azure-resourcemanager-recoveryservices;1.4.0;1.5.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-kusto;1.1.0;1.2.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-loganalytics;1.1.0;1.2.0-beta.1 diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/CHANGELOG.md b/sdk/costmanagement/azure-resourcemanager-costmanagement/CHANGELOG.md index 522601b7b450..f574ddfb1e3a 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/CHANGELOG.md +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/CHANGELOG.md @@ -1,14 +1,30 @@ # Release History -## 1.0.0-beta.8 (Unreleased) +## 1.0.0 (2024-12-24) -### Features Added +- Azure Resource Manager CostManagement client library for Java. This package contains Microsoft Azure SDK for CostManagement Management SDK. CostManagement management client provides access to CostManagement resources for Azure Enterprise Subscriptions. Package tag package-2022-10. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ### Breaking Changes -### Bugs Fixed +#### `models.SingleScopeBenefitRecommendationProperties` was modified + +* `currencyCode()` was removed +* `costWithoutBenefit()` was removed +* `lastConsumptionDate()` was removed +* `totalHours()` was removed +* `firstConsumptionDate()` was removed +* `allRecommendationDetails()` was removed +* `armSkuName()` was removed + +#### `models.SharedScopeBenefitRecommendationProperties` was modified -### Other Changes +* `allRecommendationDetails()` was removed +* `firstConsumptionDate()` was removed +* `costWithoutBenefit()` was removed +* `totalHours()` was removed +* `lastConsumptionDate()` was removed +* `currencyCode()` was removed +* `armSkuName()` was removed ## 1.0.0-beta.7 (2024-10-31) diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/README.md b/sdk/costmanagement/azure-resourcemanager-costmanagement/README.md index d150b32a760f..bc11909dedb1 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/README.md +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/README.md @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-costmanagement - 1.0.0-beta.7 + 1.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml index 7009f154cca1..ede2e706ef47 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml @@ -14,7 +14,7 @@ com.azure.resourcemanager azure-resourcemanager-costmanagement - 1.0.0-beta.8 + 1.0.0 jar Microsoft Azure SDK for CostManagement Management @@ -45,7 +45,6 @@ UTF-8 0 0 - true false diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/CostManagementManager.java b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/CostManagementManager.java index 0eeb06bc1d8d..5b63cadcb012 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/CostManagementManager.java +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/CostManagementManager.java @@ -11,6 +11,7 @@ import com.azure.core.http.HttpPipelinePosition; import com.azure.core.http.policy.AddDatePolicy; import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; @@ -19,7 +20,6 @@ import com.azure.core.http.policy.RetryOptions; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy; import com.azure.core.management.profile.AzureProfile; import com.azure.core.util.Configuration; import com.azure.core.util.logging.ClientLogger; @@ -264,7 +264,7 @@ public CostManagementManager authenticate(TokenCredential credential, AzureProfi .append("-") .append("com.azure.resourcemanager.costmanagement") .append("/") - .append("1.0.0-beta.7"); + .append("1.0.0"); if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { userAgentBuilder.append(" (") .append(Configuration.getGlobalConfiguration().get("java.version")) @@ -297,7 +297,7 @@ public CostManagementManager authenticate(TokenCredential credential, AzureProfi HttpPolicyProviders.addBeforeRetryPolicies(policies); policies.add(retryPolicy); policies.add(new AddDatePolicy()); - policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0]))); + policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0]))); policies.addAll(this.policies.stream() .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) .collect(Collectors.toList())); diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SharedScopeBenefitRecommendationProperties.java b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SharedScopeBenefitRecommendationProperties.java index 6ec184a03b36..dedfd052e34b 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SharedScopeBenefitRecommendationProperties.java +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SharedScopeBenefitRecommendationProperties.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import java.time.OffsetDateTime; /** * The properties of the benefit recommendation when scope is 'Shared'. @@ -23,42 +22,6 @@ public final class SharedScopeBenefitRecommendationProperties extends BenefitRec */ private Scope scope = Scope.SHARED; - /* - * The list of all benefit recommendations with the recommendation details. - */ - private AllSavingsList allRecommendationDetails; - - /* - * The current cost without benefit, corresponds to 'totalHours' in the look-back period. - */ - private BigDecimal costWithoutBenefit; - - /* - * An ISO 4217 currency code identifier for the costs and savings amounts. - */ - private String currencyCode; - - /* - * ARM SKU name. 'Compute_Savings_Plan' for SavingsPlan. - */ - private String armSkuName; - - /* - * The total hours for which the cost is covered. Its equal to number of records in a property - * 'properties/usage/charges'. - */ - private Integer totalHours; - - /* - * The last usage date used for looking back for computing the recommendations. - */ - private OffsetDateTime lastConsumptionDate; - - /* - * The first usage date used for looking back for computing the recommendations. - */ - private OffsetDateTime firstConsumptionDate; - /** * Creates an instance of SharedScopeBenefitRecommendationProperties class. */ @@ -75,81 +38,6 @@ public Scope scope() { return this.scope; } - /** - * Get the allRecommendationDetails property: The list of all benefit recommendations with the recommendation - * details. - * - * @return the allRecommendationDetails value. - */ - @Override - public AllSavingsList allRecommendationDetails() { - return this.allRecommendationDetails; - } - - /** - * Get the costWithoutBenefit property: The current cost without benefit, corresponds to 'totalHours' in the - * look-back period. - * - * @return the costWithoutBenefit value. - */ - @Override - public BigDecimal costWithoutBenefit() { - return this.costWithoutBenefit; - } - - /** - * Get the currencyCode property: An ISO 4217 currency code identifier for the costs and savings amounts. - * - * @return the currencyCode value. - */ - @Override - public String currencyCode() { - return this.currencyCode; - } - - /** - * Get the armSkuName property: ARM SKU name. 'Compute_Savings_Plan' for SavingsPlan. - * - * @return the armSkuName value. - */ - @Override - public String armSkuName() { - return this.armSkuName; - } - - /** - * Get the totalHours property: The total hours for which the cost is covered. Its equal to number of records in a - * property 'properties/usage/charges'. - * - * @return the totalHours value. - */ - @Override - public Integer totalHours() { - return this.totalHours; - } - - /** - * Get the lastConsumptionDate property: The last usage date used for looking back for computing the - * recommendations. - * - * @return the lastConsumptionDate value. - */ - @Override - public OffsetDateTime lastConsumptionDate() { - return this.lastConsumptionDate; - } - - /** - * Get the firstConsumptionDate property: The first usage date used for looking back for computing the - * recommendations. - * - * @return the firstConsumptionDate value. - */ - @Override - public OffsetDateTime firstConsumptionDate() { - return this.firstConsumptionDate; - } - /** * {@inheritDoc} */ @@ -247,22 +135,22 @@ public static SharedScopeBenefitRecommendationProperties fromJson(JsonReader jso reader.nextToken(); if ("firstConsumptionDate".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.firstConsumptionDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + deserializedSharedScopeBenefitRecommendationProperties.withFirstConsumptionDate(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); } else if ("lastConsumptionDate".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.lastConsumptionDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + deserializedSharedScopeBenefitRecommendationProperties.withLastConsumptionDate(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); } else if ("lookBackPeriod".equals(fieldName)) { deserializedSharedScopeBenefitRecommendationProperties .withLookBackPeriod(LookBackPeriod.fromString(reader.getString())); } else if ("totalHours".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.totalHours - = reader.getNullable(JsonReader::getInt); + deserializedSharedScopeBenefitRecommendationProperties + .withTotalHours(reader.getNullable(JsonReader::getInt)); } else if ("usage".equals(fieldName)) { deserializedSharedScopeBenefitRecommendationProperties .withUsage(RecommendationUsageDetails.fromJson(reader)); } else if ("armSkuName".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.armSkuName = reader.getString(); + deserializedSharedScopeBenefitRecommendationProperties.withArmSkuName(reader.getString()); } else if ("term".equals(fieldName)) { deserializedSharedScopeBenefitRecommendationProperties .withTerm(Term.fromString(reader.getString())); @@ -270,16 +158,16 @@ public static SharedScopeBenefitRecommendationProperties fromJson(JsonReader jso deserializedSharedScopeBenefitRecommendationProperties .withCommitmentGranularity(Grain.fromString(reader.getString())); } else if ("currencyCode".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.currencyCode = reader.getString(); + deserializedSharedScopeBenefitRecommendationProperties.withCurrencyCode(reader.getString()); } else if ("costWithoutBenefit".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.costWithoutBenefit - = reader.getNullable(nonNullReader -> new BigDecimal(nonNullReader.getString())); + deserializedSharedScopeBenefitRecommendationProperties.withCostWithoutBenefit( + reader.getNullable(nonNullReader -> new BigDecimal(nonNullReader.getString()))); } else if ("recommendationDetails".equals(fieldName)) { deserializedSharedScopeBenefitRecommendationProperties .withRecommendationDetails(AllSavingsBenefitDetails.fromJson(reader)); } else if ("allRecommendationDetails".equals(fieldName)) { - deserializedSharedScopeBenefitRecommendationProperties.allRecommendationDetails - = AllSavingsList.fromJson(reader); + deserializedSharedScopeBenefitRecommendationProperties + .withAllRecommendationDetails(AllSavingsList.fromJson(reader)); } else if ("scope".equals(fieldName)) { deserializedSharedScopeBenefitRecommendationProperties.scope = Scope.fromString(reader.getString()); } else { diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SingleScopeBenefitRecommendationProperties.java b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SingleScopeBenefitRecommendationProperties.java index 76e46265e411..47cb768dbd98 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SingleScopeBenefitRecommendationProperties.java +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/models/SingleScopeBenefitRecommendationProperties.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import java.time.OffsetDateTime; /** * The properties of the benefit recommendations when scope is 'Single'. @@ -35,42 +34,6 @@ public final class SingleScopeBenefitRecommendationProperties extends BenefitRec */ private String resourceGroup; - /* - * The list of all benefit recommendations with the recommendation details. - */ - private AllSavingsList allRecommendationDetails; - - /* - * The current cost without benefit, corresponds to 'totalHours' in the look-back period. - */ - private BigDecimal costWithoutBenefit; - - /* - * An ISO 4217 currency code identifier for the costs and savings amounts. - */ - private String currencyCode; - - /* - * ARM SKU name. 'Compute_Savings_Plan' for SavingsPlan. - */ - private String armSkuName; - - /* - * The total hours for which the cost is covered. Its equal to number of records in a property - * 'properties/usage/charges'. - */ - private Integer totalHours; - - /* - * The last usage date used for looking back for computing the recommendations. - */ - private OffsetDateTime lastConsumptionDate; - - /* - * The first usage date used for looking back for computing the recommendations. - */ - private OffsetDateTime firstConsumptionDate; - /** * Creates an instance of SingleScopeBenefitRecommendationProperties class. */ @@ -107,81 +70,6 @@ public String resourceGroup() { return this.resourceGroup; } - /** - * Get the allRecommendationDetails property: The list of all benefit recommendations with the recommendation - * details. - * - * @return the allRecommendationDetails value. - */ - @Override - public AllSavingsList allRecommendationDetails() { - return this.allRecommendationDetails; - } - - /** - * Get the costWithoutBenefit property: The current cost without benefit, corresponds to 'totalHours' in the - * look-back period. - * - * @return the costWithoutBenefit value. - */ - @Override - public BigDecimal costWithoutBenefit() { - return this.costWithoutBenefit; - } - - /** - * Get the currencyCode property: An ISO 4217 currency code identifier for the costs and savings amounts. - * - * @return the currencyCode value. - */ - @Override - public String currencyCode() { - return this.currencyCode; - } - - /** - * Get the armSkuName property: ARM SKU name. 'Compute_Savings_Plan' for SavingsPlan. - * - * @return the armSkuName value. - */ - @Override - public String armSkuName() { - return this.armSkuName; - } - - /** - * Get the totalHours property: The total hours for which the cost is covered. Its equal to number of records in a - * property 'properties/usage/charges'. - * - * @return the totalHours value. - */ - @Override - public Integer totalHours() { - return this.totalHours; - } - - /** - * Get the lastConsumptionDate property: The last usage date used for looking back for computing the - * recommendations. - * - * @return the lastConsumptionDate value. - */ - @Override - public OffsetDateTime lastConsumptionDate() { - return this.lastConsumptionDate; - } - - /** - * Get the firstConsumptionDate property: The first usage date used for looking back for computing the - * recommendations. - * - * @return the firstConsumptionDate value. - */ - @Override - public OffsetDateTime firstConsumptionDate() { - return this.firstConsumptionDate; - } - /** * {@inheritDoc} */ @@ -279,22 +167,22 @@ public static SingleScopeBenefitRecommendationProperties fromJson(JsonReader jso reader.nextToken(); if ("firstConsumptionDate".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.firstConsumptionDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + deserializedSingleScopeBenefitRecommendationProperties.withFirstConsumptionDate(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); } else if ("lastConsumptionDate".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.lastConsumptionDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + deserializedSingleScopeBenefitRecommendationProperties.withLastConsumptionDate(reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()))); } else if ("lookBackPeriod".equals(fieldName)) { deserializedSingleScopeBenefitRecommendationProperties .withLookBackPeriod(LookBackPeriod.fromString(reader.getString())); } else if ("totalHours".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.totalHours - = reader.getNullable(JsonReader::getInt); + deserializedSingleScopeBenefitRecommendationProperties + .withTotalHours(reader.getNullable(JsonReader::getInt)); } else if ("usage".equals(fieldName)) { deserializedSingleScopeBenefitRecommendationProperties .withUsage(RecommendationUsageDetails.fromJson(reader)); } else if ("armSkuName".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.armSkuName = reader.getString(); + deserializedSingleScopeBenefitRecommendationProperties.withArmSkuName(reader.getString()); } else if ("term".equals(fieldName)) { deserializedSingleScopeBenefitRecommendationProperties .withTerm(Term.fromString(reader.getString())); @@ -302,16 +190,16 @@ public static SingleScopeBenefitRecommendationProperties fromJson(JsonReader jso deserializedSingleScopeBenefitRecommendationProperties .withCommitmentGranularity(Grain.fromString(reader.getString())); } else if ("currencyCode".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.currencyCode = reader.getString(); + deserializedSingleScopeBenefitRecommendationProperties.withCurrencyCode(reader.getString()); } else if ("costWithoutBenefit".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.costWithoutBenefit - = reader.getNullable(nonNullReader -> new BigDecimal(nonNullReader.getString())); + deserializedSingleScopeBenefitRecommendationProperties.withCostWithoutBenefit( + reader.getNullable(nonNullReader -> new BigDecimal(nonNullReader.getString()))); } else if ("recommendationDetails".equals(fieldName)) { deserializedSingleScopeBenefitRecommendationProperties .withRecommendationDetails(AllSavingsBenefitDetails.fromJson(reader)); } else if ("allRecommendationDetails".equals(fieldName)) { - deserializedSingleScopeBenefitRecommendationProperties.allRecommendationDetails - = AllSavingsList.fromJson(reader); + deserializedSingleScopeBenefitRecommendationProperties + .withAllRecommendationDetails(AllSavingsList.fromJson(reader)); } else if ("scope".equals(fieldName)) { deserializedSingleScopeBenefitRecommendationProperties.scope = Scope.fromString(reader.getString()); } else if ("subscriptionId".equals(fieldName)) {