Skip to content

Commit 9619f41

Browse files
author
SDKAuto
committed
CodeGen from PR 14545 in Azure/azure-rest-api-specs
Merge 0625e805651826884d17127001ac6e2d53a2d5bc into 45080747a094f6a64968b6f93aa1f9a7233a63ae
1 parent 24328e1 commit 9619f41

32 files changed

+1719
-528
lines changed

‎sdk/storagecache/azure-resourcemanager-storagecache/CHANGELOG.md‎

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

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

5+
- Azure Resource Manager StorageCache client library for Java. This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
56

67
## 1.0.0-beta.2 (2021-03-08)
78

‎sdk/storagecache/azure-resourcemanager-storagecache/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Azure Resource Manager StorageCache client library for Java.
44

5-
This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
5+
This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
66

77
## We'd love to hear your feedback
88

@@ -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-storagecache</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,8 @@ See [API design][design] for general introduction on design and key concepts on
7474

7575
## Examples
7676

77+
78+
7779
## Troubleshooting
7880

7981
## Next steps

‎sdk/storagecache/azure-resourcemanager-storagecache/pom.xml‎

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

15-
<name>Microsoft Azure SDK for StorageCache Management</name>
16-
<description>This package contains Microsoft Azure SDK for StorageCache Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-03.</description>
17-
<url>https://github.com/Azure/azure-sdk-for-java</url>
15+
<name>Microsoft Azure SDK for StorageCache Management</name>
16+
<description>This package contains Microsoft Azure SDK for StorageCache Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-05.</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/storagecache/azure-resourcemanager-storagecache/src/main/java/com/azure/resourcemanager/storagecache/StorageCacheManager.java‎

Lines changed: 32 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;
@@ -26,12 +26,14 @@
2626
import com.azure.resourcemanager.storagecache.implementation.OperationsImpl;
2727
import com.azure.resourcemanager.storagecache.implementation.SkusImpl;
2828
import com.azure.resourcemanager.storagecache.implementation.StorageCacheManagementClientBuilder;
29+
import com.azure.resourcemanager.storagecache.implementation.StorageTargetOperationsImpl;
2930
import com.azure.resourcemanager.storagecache.implementation.StorageTargetsImpl;
3031
import com.azure.resourcemanager.storagecache.implementation.UsageModelsImpl;
3132
import com.azure.resourcemanager.storagecache.models.AscOperations;
3233
import com.azure.resourcemanager.storagecache.models.Caches;
3334
import com.azure.resourcemanager.storagecache.models.Operations;
3435
import com.azure.resourcemanager.storagecache.models.Skus;
36+
import com.azure.resourcemanager.storagecache.models.StorageTargetOperations;
3537
import com.azure.resourcemanager.storagecache.models.StorageTargets;
3638
import com.azure.resourcemanager.storagecache.models.UsageModels;
3739
import java.time.Duration;
@@ -58,6 +60,8 @@ public final class StorageCacheManager {
5860

5961
private StorageTargets storageTargets;
6062

63+
private StorageTargetOperations storageTargetOperations;
64+
6165
private final StorageCacheManagementClient clientObject;
6266

6367
private StorageCacheManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
@@ -101,6 +105,7 @@ public static final class Configurable {
101105
private HttpClient httpClient;
102106
private HttpLogOptions httpLogOptions;
103107
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
108+
private final List<String> scopes = new ArrayList<>();
104109
private RetryPolicy retryPolicy;
105110
private Duration defaultPollInterval;
106111

@@ -140,6 +145,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
140145
return this;
141146
}
142147

148+
/**
149+
* Adds the scope to permission sets.
150+
*
151+
* @param scope the scope.
152+
* @return the configurable object itself.
153+
*/
154+
public Configurable withScope(String scope) {
155+
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
156+
return this;
157+
}
158+
143159
/**
144160
* Sets the retry policy to the HTTP pipeline.
145161
*
@@ -182,7 +198,7 @@ public StorageCacheManager authenticate(TokenCredential credential, AzureProfile
182198
.append("-")
183199
.append("com.azure.resourcemanager.storagecache")
184200
.append("/")
185-
.append("1.0.0-beta.2");
201+
.append("1.0.0-beta.1");
186202
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
187203
userAgentBuilder
188204
.append(" (")
@@ -196,6 +212,9 @@ public StorageCacheManager authenticate(TokenCredential credential, AzureProfile
196212
userAgentBuilder.append(" (auto-generated)");
197213
}
198214

215+
if (scopes.isEmpty()) {
216+
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
217+
}
199218
if (retryPolicy == null) {
200219
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
201220
}
@@ -205,10 +224,8 @@ public StorageCacheManager authenticate(TokenCredential credential, AzureProfile
205224
HttpPolicyProviders.addBeforeRetryPolicies(policies);
206225
policies.add(retryPolicy);
207226
policies.add(new AddDatePolicy());
208-
policies
209-
.add(
210-
new BearerTokenAuthenticationPolicy(
211-
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
227+
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
228+
policies.addAll(this.policies);
212229
HttpPolicyProviders.addAfterRetryPolicies(policies);
213230
policies.add(new HttpLoggingPolicy(httpLogOptions));
214231
HttpPipeline httpPipeline =
@@ -268,6 +285,15 @@ public StorageTargets storageTargets() {
268285
return storageTargets;
269286
}
270287

288+
/** @return Resource collection API of StorageTargetOperations. */
289+
public StorageTargetOperations storageTargetOperations() {
290+
if (this.storageTargetOperations == null) {
291+
this.storageTargetOperations =
292+
new StorageTargetOperationsImpl(clientObject.getStorageTargetOperations(), this);
293+
}
294+
return storageTargetOperations;
295+
}
296+
271297
/**
272298
* @return Wrapped service client StorageCacheManagementClient providing direct access to the underlying
273299
* auto-generated API implementation, based on Azure REST API.

‎sdk/storagecache/azure-resourcemanager-storagecache/src/main/java/com/azure/resourcemanager/storagecache/fluent/StorageCacheManagementClient.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,11 @@ public interface StorageCacheManagementClient {
8686
* @return the StorageTargetsClient object.
8787
*/
8888
StorageTargetsClient getStorageTargets();
89+
90+
/**
91+
* Gets the StorageTargetOperationsClient object to access its operations.
92+
*
93+
* @return the StorageTargetOperationsClient object.
94+
*/
95+
StorageTargetOperationsClient getStorageTargetOperations();
8996
}

0 commit comments

Comments
 (0)