Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR azure-resourcemanager-avs] fix some AVS 2021-06-01 list examples #9300

Closed
wants to merge 1 commit into from
Closed

[AutoPR azure-resourcemanager-avs] fix some AVS 2021-06-01 list examples #9300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/avs/azure-resourcemanager-avs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Release History

## 1.0.0-beta.2 (Unreleased)
## 1.0.0-beta.1 (2021-07-09)

- Azure Resource Manager Avs client library for Java. This package contains Microsoft Azure SDK for Avs Management SDK. Azure VMware Solution API. Package tag package-2021-06-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## 1.0.0-beta.1 (2021-04-13)

Expand Down
6 changes: 4 additions & 2 deletions sdk/avs/azure-resourcemanager-avs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Azure Resource Manager Avs client library for Java.

This package contains Microsoft Azure SDK for Avs Management SDK. Azure VMware Solution API. Package tag package-2020-03-20. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
This package contains Microsoft Azure SDK for Avs Management SDK. Azure VMware Solution API. Package tag package-2021-06-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## We'd love to hear your feedback

Expand Down Expand Up @@ -32,7 +32,7 @@ Various documentation is available to help you get started
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-avs</artifactId>
<version>1.0.0-beta.1</version>
<version>1.0.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on

## Examples



## Troubleshooting

## Next steps
Expand Down
141 changes: 80 additions & 61 deletions sdk/avs/azure-resourcemanager-avs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,86 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-avs</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-avs;current} -->
<packaging>jar</packaging>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-avs</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-avs;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Avs Management</name>
<description>This package contains Microsoft Azure SDK for Avs Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure VMware Solution API. Package tag package-2020-03-20.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<name>Microsoft Azure SDK for Avs Management</name>
<description>This package contains Microsoft Azure SDK for Avs Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure VMware Solution API. Package tag package-2021-06-01.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>

<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
<configuration>
<analysisConfiguration>
<revapi.ignore>
<item>
<code>java.method.addedToInterface</code>
</item>
<item>
<regex>true</regex>
<code>.*</code>
<package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
</item>
</revapi.ignore>
</analysisConfiguration>
</configuration>
</plugin>
</plugins>
</build>
</project>
119 changes: 114 additions & 5 deletions ...avs/azure-resourcemanager-avs/src/main/java/com/azure/resourcemanager/avs/AvsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,47 @@
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.http.policy.AddDatePolicy;
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;
import com.azure.core.http.policy.HttpPolicyProviders;
import com.azure.core.http.policy.RequestIdPolicy;
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;
import com.azure.resourcemanager.avs.fluent.AvsClient;
import com.azure.resourcemanager.avs.implementation.AddonsImpl;
import com.azure.resourcemanager.avs.implementation.AuthorizationsImpl;
import com.azure.resourcemanager.avs.implementation.AvsClientBuilder;
import com.azure.resourcemanager.avs.implementation.CloudLinksImpl;
import com.azure.resourcemanager.avs.implementation.ClustersImpl;
import com.azure.resourcemanager.avs.implementation.DatastoresImpl;
import com.azure.resourcemanager.avs.implementation.GlobalReachConnectionsImpl;
import com.azure.resourcemanager.avs.implementation.HcxEnterpriseSitesImpl;
import com.azure.resourcemanager.avs.implementation.LocationsImpl;
import com.azure.resourcemanager.avs.implementation.OperationsImpl;
import com.azure.resourcemanager.avs.implementation.PrivateCloudsImpl;
import com.azure.resourcemanager.avs.implementation.ScriptCmdletsImpl;
import com.azure.resourcemanager.avs.implementation.ScriptExecutionsImpl;
import com.azure.resourcemanager.avs.implementation.ScriptPackagesImpl;
import com.azure.resourcemanager.avs.implementation.WorkloadNetworksImpl;
import com.azure.resourcemanager.avs.models.Addons;
import com.azure.resourcemanager.avs.models.Authorizations;
import com.azure.resourcemanager.avs.models.CloudLinks;
import com.azure.resourcemanager.avs.models.Clusters;
import com.azure.resourcemanager.avs.models.Datastores;
import com.azure.resourcemanager.avs.models.GlobalReachConnections;
import com.azure.resourcemanager.avs.models.HcxEnterpriseSites;
import com.azure.resourcemanager.avs.models.Locations;
import com.azure.resourcemanager.avs.models.Operations;
import com.azure.resourcemanager.avs.models.PrivateClouds;
import com.azure.resourcemanager.avs.models.ScriptCmdlets;
import com.azure.resourcemanager.avs.models.ScriptExecutions;
import com.azure.resourcemanager.avs.models.ScriptPackages;
import com.azure.resourcemanager.avs.models.WorkloadNetworks;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
Expand All @@ -50,10 +66,26 @@ public final class AvsManager {

private Clusters clusters;

private Datastores datastores;

private HcxEnterpriseSites hcxEnterpriseSites;

private Authorizations authorizations;

private GlobalReachConnections globalReachConnections;

private WorkloadNetworks workloadNetworks;

private CloudLinks cloudLinks;

private Addons addons;

private ScriptPackages scriptPackages;

private ScriptCmdlets scriptCmdlets;

private ScriptExecutions scriptExecutions;

private final AvsClient clientObject;

private AvsManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
Expand Down Expand Up @@ -97,6 +129,7 @@ public static final class Configurable {
private HttpClient httpClient;
private HttpLogOptions httpLogOptions;
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
private final List<String> scopes = new ArrayList<>();
private RetryPolicy retryPolicy;
private Duration defaultPollInterval;

Expand Down Expand Up @@ -136,6 +169,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
return this;
}

/**
* Adds the scope to permission sets.
*
* @param scope the scope.
* @return the configurable object itself.
*/
public Configurable withScope(String scope) {
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
return this;
}

/**
* Sets the retry policy to the HTTP pipeline.
*
Expand Down Expand Up @@ -192,6 +236,9 @@ public AvsManager authenticate(TokenCredential credential, AzureProfile profile)
userAgentBuilder.append(" (auto-generated)");
}

if (scopes.isEmpty()) {
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
}
if (retryPolicy == null) {
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
}
Expand All @@ -201,10 +248,7 @@ public AvsManager authenticate(TokenCredential credential, AzureProfile profile)
HttpPolicyProviders.addBeforeRetryPolicies(policies);
policies.add(retryPolicy);
policies.add(new AddDatePolicy());
policies
.add(
new BearerTokenAuthenticationPolicy(
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
policies.addAll(this.policies);
HttpPolicyProviders.addAfterRetryPolicies(policies);
policies.add(new HttpLoggingPolicy(httpLogOptions));
Expand Down Expand Up @@ -249,6 +293,14 @@ public Clusters clusters() {
return clusters;
}

/** @return Resource collection API of Datastores. */
public Datastores datastores() {
if (this.datastores == null) {
this.datastores = new DatastoresImpl(clientObject.getDatastores(), this);
}
return datastores;
}

/** @return Resource collection API of HcxEnterpriseSites. */
public HcxEnterpriseSites hcxEnterpriseSites() {
if (this.hcxEnterpriseSites == null) {
Expand All @@ -265,6 +317,63 @@ public Authorizations authorizations() {
return authorizations;
}

/** @return Resource collection API of GlobalReachConnections. */
public GlobalReachConnections globalReachConnections() {
if (this.globalReachConnections == null) {
this.globalReachConnections =
new GlobalReachConnectionsImpl(clientObject.getGlobalReachConnections(), this);
}
return globalReachConnections;
}

/** @return Resource collection API of WorkloadNetworks. */
public WorkloadNetworks workloadNetworks() {
if (this.workloadNetworks == null) {
this.workloadNetworks = new WorkloadNetworksImpl(clientObject.getWorkloadNetworks(), this);
}
return workloadNetworks;
}

/** @return Resource collection API of CloudLinks. */
public CloudLinks cloudLinks() {
if (this.cloudLinks == null) {
this.cloudLinks = new CloudLinksImpl(clientObject.getCloudLinks(), this);
}
return cloudLinks;
}

/** @return Resource collection API of Addons. */
public Addons addons() {
if (this.addons == null) {
this.addons = new AddonsImpl(clientObject.getAddons(), this);
}
return addons;
}

/** @return Resource collection API of ScriptPackages. */
public ScriptPackages scriptPackages() {
if (this.scriptPackages == null) {
this.scriptPackages = new ScriptPackagesImpl(clientObject.getScriptPackages(), this);
}
return scriptPackages;
}

/** @return Resource collection API of ScriptCmdlets. */
public ScriptCmdlets scriptCmdlets() {
if (this.scriptCmdlets == null) {
this.scriptCmdlets = new ScriptCmdletsImpl(clientObject.getScriptCmdlets(), this);
}
return scriptCmdlets;
}

/** @return Resource collection API of ScriptExecutions. */
public ScriptExecutions scriptExecutions() {
if (this.scriptExecutions == null) {
this.scriptExecutions = new ScriptExecutionsImpl(clientObject.getScriptExecutions(), this);
}
return scriptExecutions;
}

/**
* @return Wrapped service client AvsClient providing direct access to the underlying auto-generated API
* implementation, based on Azure REST API.
Expand Down
Loading