Skip to content

Commit cc3953f

Browse files
authored
[Automation] Generate Fluent Lite from cost-management#package-2019-11 (Azure#23232)
1 parent 3177509 commit cc3953f

File tree

77 files changed

+6607
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+6607
-969
lines changed

sdk/costmanagement/azure-resourcemanager-costmanagement/CHANGELOG.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,51 @@
11
# Release History
22

3-
## 1.0.0-beta.3 (Unreleased)
3+
## 1.0.0-beta.3 (2021-07-29)
44

5+
- Azure Resource Manager CostManagement client library for Java. This package contains Microsoft Azure SDK for CostManagement Management SDK. Package tag package-2019-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
6+
7+
### Breaking Changes
8+
9+
* `models.ExportProperties` was removed
10+
11+
#### `models.View$Update` was modified
12+
13+
* `withTypePropertiesQueryType(models.ReportType)` was removed
14+
15+
#### `models.View` was modified
16+
17+
* `typePropertiesQueryType()` was removed
18+
19+
#### `models.View$Definition` was modified
20+
21+
* `withTypePropertiesQueryType(models.ReportType)` was removed
22+
23+
### Features Added
24+
25+
* `models.CacheItem` was added
26+
27+
* `models.SettingsPropertiesStartOn` was added
28+
29+
#### `models.View$Update` was modified
30+
31+
* `withTypePropertiesType(models.ReportType)` was added
32+
33+
#### `models.View` was modified
34+
35+
* `typePropertiesType()` was added
36+
37+
#### `CostManagementManager$Configurable` was modified
38+
39+
* `withScope(java.lang.String)` was added
40+
41+
#### `models.Setting` was modified
42+
43+
* `startOn()` was added
44+
* `cache()` was added
45+
46+
#### `models.View$Definition` was modified
47+
48+
* `withTypePropertiesType(models.ReportType)` was added
549

650
## 1.0.0-beta.2 (2021-04-07)
751

sdk/costmanagement/azure-resourcemanager-costmanagement/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
3232
<dependency>
3333
<groupId>com.azure.resourcemanager</groupId>
3434
<artifactId>azure-resourcemanager-costmanagement</artifactId>
35-
<version>1.0.0-beta.2</version>
35+
<version>1.0.0-beta.3</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})
@@ -74,6 +74,9 @@ See [API design][design] for general introduction on design and key concepts on
7474

7575
## Examples
7676

77+
[Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/SAMPLE.md)
78+
79+
7780
## Troubleshooting
7881

7982
## Next steps
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Code snippets and samples
2+
3+
4+
### Alerts
5+
6+
- [Dismiss](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/AlertsDismissSamples.java)
7+
- [Get](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/AlertsGetSamples.java)
8+
- [List](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/AlertsListSamples.java)
9+
- [ListExternal](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/AlertsListExternalSamples.java)
10+
11+
### Dimensions
12+
13+
- [ByExternalCloudProviderType](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/DimensionsByExternalCloudProviderTypeSamples.java)
14+
- [List](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/DimensionsListSamples.java)
15+
16+
### Exports
17+
18+
- [CreateOrUpdate](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsCreateOrUpdateSamples.java)
19+
- [Delete](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsDeleteSamples.java)
20+
- [Execute](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsExecuteSamples.java)
21+
- [Get](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsGetSamples.java)
22+
- [GetExecutionHistory](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsGetExecutionHistorySamples.java)
23+
- [List](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ExportsListSamples.java)
24+
25+
### Forecast
26+
27+
- [ExternalCloudProviderUsage](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ForecastExternalCloudProviderUsageSamples.java)
28+
- [Usage](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ForecastUsageSamples.java)
29+
30+
### GenerateReservationDetailsReport
31+
32+
- [ByBillingAccountId](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/GenerateReservationDetailsReportByBillingAccountIdSamples.java)
33+
- [ByBillingProfileId](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/GenerateReservationDetailsReportByBillingProfileIdSamples.java)
34+
35+
### Query
36+
37+
- [Usage](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/QueryUsageSamples.java)
38+
- [UsageByExternalCloudProviderType](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/QueryUsageByExternalCloudProviderTypeSamples.java)
39+
40+
### Settings
41+
42+
- [CreateOrUpdate](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/SettingsCreateOrUpdateSamples.java)
43+
- [Delete](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/SettingsDeleteSamples.java)
44+
- [Get](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/SettingsGetSamples.java)
45+
- [List](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/SettingsListSamples.java)
46+
47+
### Views
48+
49+
- [CreateOrUpdate](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsCreateOrUpdateSamples.java)
50+
- [CreateOrUpdateByScope](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsCreateOrUpdateByScopeSamples.java)
51+
- [Delete](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsDeleteSamples.java)
52+
- [DeleteByScope](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsDeleteByScopeSamples.java)
53+
- [Get](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsGetSamples.java)
54+
- [GetByScope](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsGetByScopeSamples.java)
55+
- [List](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsListSamples.java)
56+
- [ListByScope](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/costmanagement/azure-resourcemanager-costmanagement/src/samples/java/com/azure/resourcemanager/costmanagement/ViewsListByScopeSamples.java)
Lines changed: 80 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,86 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>com.azure</groupId>
5-
<artifactId>azure-client-sdk-parent</artifactId>
6-
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
7-
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
8-
</parent>
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>com.azure</groupId>
5+
<artifactId>azure-client-sdk-parent</artifactId>
6+
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
7+
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
8+
</parent>
99

10-
<groupId>com.azure.resourcemanager</groupId>
11-
<artifactId>azure-resourcemanager-costmanagement</artifactId>
12-
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-costmanagement;current} -->
13-
<packaging>jar</packaging>
10+
<groupId>com.azure.resourcemanager</groupId>
11+
<artifactId>azure-resourcemanager-costmanagement</artifactId>
12+
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-costmanagement;current} -->
13+
<packaging>jar</packaging>
1414

15-
<name>Microsoft Azure SDK for CostManagement Management</name>
16-
<description>This package contains Microsoft Azure SDK for CostManagement Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2019-11.</description>
17-
<url>https://github.com/Azure/azure-sdk-for-java</url>
15+
<name>Microsoft Azure SDK for CostManagement Management</name>
16+
<description>This package contains Microsoft Azure SDK for CostManagement Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2019-11.</description>
17+
<url>https://github.com/Azure/azure-sdk-for-java</url>
1818

19-
<licenses>
20-
<license>
21-
<name>The MIT License (MIT)</name>
22-
<url>http://opensource.org/licenses/MIT</url>
23-
<distribution>repo</distribution>
24-
</license>
25-
</licenses>
19+
<licenses>
20+
<license>
21+
<name>The MIT License (MIT)</name>
22+
<url>http://opensource.org/licenses/MIT</url>
23+
<distribution>repo</distribution>
24+
</license>
25+
</licenses>
2626

27-
<scm>
28-
<url>https://github.com/Azure/azure-sdk-for-java</url>
29-
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
30-
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
31-
<tag>HEAD</tag>
32-
</scm>
33-
<developers>
34-
<developer>
35-
<id>microsoft</id>
36-
<name>Microsoft</name>
37-
</developer>
38-
</developers>
39-
<properties>
40-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
42-
</properties>
43-
<dependencies>
44-
<dependency>
45-
<groupId>com.azure</groupId>
46-
<artifactId>azure-core</artifactId>
47-
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
48-
</dependency>
49-
<dependency>
50-
<groupId>com.azure</groupId>
51-
<artifactId>azure-core-management</artifactId>
52-
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53-
</dependency>
54-
</dependencies>
55-
<build>
56-
<plugins>
57-
<plugin>
58-
<groupId>org.jacoco</groupId>
59-
<artifactId>jacoco-maven-plugin</artifactId>
60-
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
61-
<configuration>
62-
<skip>true</skip>
63-
</configuration>
64-
</plugin>
65-
</plugins>
66-
</build>
27+
<scm>
28+
<url>https://github.com/Azure/azure-sdk-for-java</url>
29+
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
30+
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
31+
<tag>HEAD</tag>
32+
</scm>
33+
<developers>
34+
<developer>
35+
<id>microsoft</id>
36+
<name>Microsoft</name>
37+
</developer>
38+
</developers>
39+
<properties>
40+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
42+
</properties>
43+
<dependencies>
44+
<dependency>
45+
<groupId>com.azure</groupId>
46+
<artifactId>azure-core</artifactId>
47+
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
48+
</dependency>
49+
<dependency>
50+
<groupId>com.azure</groupId>
51+
<artifactId>azure-core-management</artifactId>
52+
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53+
</dependency>
54+
</dependencies>
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.jacoco</groupId>
59+
<artifactId>jacoco-maven-plugin</artifactId>
60+
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
61+
<configuration>
62+
<skip>true</skip>
63+
</configuration>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.revapi</groupId>
67+
<artifactId>revapi-maven-plugin</artifactId>
68+
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
69+
<configuration>
70+
<analysisConfiguration>
71+
<revapi.ignore>
72+
<item>
73+
<code>java.method.addedToInterface</code>
74+
</item>
75+
<item>
76+
<regex>true</regex>
77+
<code>.*</code>
78+
<package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
79+
</item>
80+
</revapi.ignore>
81+
</analysisConfiguration>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
6786
</project>

sdk/costmanagement/azure-resourcemanager-costmanagement/src/main/java/com/azure/resourcemanager/costmanagement/CostManagementManager.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import com.azure.core.http.HttpPipeline;
1010
import com.azure.core.http.HttpPipelineBuilder;
1111
import com.azure.core.http.policy.AddDatePolicy;
12-
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
1312
import com.azure.core.http.policy.HttpLogOptions;
1413
import com.azure.core.http.policy.HttpLoggingPolicy;
1514
import com.azure.core.http.policy.HttpPipelinePolicy;
1615
import com.azure.core.http.policy.HttpPolicyProviders;
1716
import com.azure.core.http.policy.RequestIdPolicy;
1817
import com.azure.core.http.policy.RetryPolicy;
1918
import com.azure.core.http.policy.UserAgentPolicy;
19+
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
2020
import com.azure.core.management.profile.AzureProfile;
2121
import com.azure.core.util.Configuration;
2222
import com.azure.core.util.logging.ClientLogger;
@@ -108,6 +108,7 @@ public static final class Configurable {
108108
private HttpClient httpClient;
109109
private HttpLogOptions httpLogOptions;
110110
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
111+
private final List<String> scopes = new ArrayList<>();
111112
private RetryPolicy retryPolicy;
112113
private Duration defaultPollInterval;
113114

@@ -147,6 +148,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
147148
return this;
148149
}
149150

151+
/**
152+
* Adds the scope to permission sets.
153+
*
154+
* @param scope the scope.
155+
* @return the configurable object itself.
156+
*/
157+
public Configurable withScope(String scope) {
158+
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
159+
return this;
160+
}
161+
150162
/**
151163
* Sets the retry policy to the HTTP pipeline.
152164
*
@@ -189,7 +201,7 @@ public CostManagementManager authenticate(TokenCredential credential, AzureProfi
189201
.append("-")
190202
.append("com.azure.resourcemanager.costmanagement")
191203
.append("/")
192-
.append("1.0.0-beta.2");
204+
.append("1.0.0-beta.3");
193205
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
194206
userAgentBuilder
195207
.append(" (")
@@ -203,6 +215,9 @@ public CostManagementManager authenticate(TokenCredential credential, AzureProfi
203215
userAgentBuilder.append(" (auto-generated)");
204216
}
205217

218+
if (scopes.isEmpty()) {
219+
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
220+
}
206221
if (retryPolicy == null) {
207222
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
208223
}
@@ -212,10 +227,7 @@ public CostManagementManager authenticate(TokenCredential credential, AzureProfi
212227
HttpPolicyProviders.addBeforeRetryPolicies(policies);
213228
policies.add(retryPolicy);
214229
policies.add(new AddDatePolicy());
215-
policies
216-
.add(
217-
new BearerTokenAuthenticationPolicy(
218-
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
230+
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
219231
policies.addAll(this.policies);
220232
HttpPolicyProviders.addAfterRetryPolicies(policies);
221233
policies.add(new HttpLoggingPolicy(httpLogOptions));

0 commit comments

Comments
 (0)