Skip to content

Commit

Permalink
Release azure-resourcemanager 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Azure-Fluent
Azure-Fluent committed Oct 26, 2020
1 parent 4eecee1 commit f87b74a
Show file tree
Hide file tree
Showing 4 changed files with 1,656 additions and 1,412 deletions.
8 changes: 5 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extensions:

To run this sample:

Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an auth file. See [how to create an auth file](https://github.com/Azure/azure-libraries-for-java/blob/master/AUTH.md).
See [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity#defaultazurecredential) and prepare the authentication works best for you. For more details on authentication, please refer to [AUTH.md](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/docs/AUTH.md).

git clone https://github.com/Azure-Samples/key-vault-java-manage-key-vaults.git

Expand All @@ -37,9 +37,11 @@ Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an aut

## More information ##

[http://azure.com/java](http://azure.com/java)
For general documentation as well as quickstarts on how to use Azure Management Libraries for Java, please see [here](https://aka.ms/azsdk/java/mgmt).

If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
Start to develop applications with Java on Azure [here](http://azure.com/java).

If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).

---

Expand Down
34 changes: 15 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<mainClass>com.microsoft.azure.management.keyvault.samples.ManageKeyVault</mainClass>
<mainClass>com.azure.resourcemanager.keyvault.samples.ManageKeyVault</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -40,7 +41,7 @@
</descriptorRefs>
<archive>
<manifest>
<mainClass>com.microsoft.azure.management.keyvault.samples.ManageKeyVault.java</mainClass>
<mainClass>com.azure.resourcemanager.keyvault.samples.ManageKeyVault.java</mainClass>
</manifest>
</archive>
</configuration>
Expand All @@ -51,24 +52,19 @@
</build>
<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>1.36.3</version>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.3</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
</dependencies>
</project>
82 changes: 41 additions & 41 deletions ...ment/keyvault/samples/ManageKeyVault.java → ...ager/keyvault/samples/ManageKeyVault.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/

package com.microsoft.azure.management.keyvault.samples;

import com.microsoft.azure.credentials.ApplicationTokenCredentials;
import com.microsoft.azure.management.Azure;
import com.microsoft.azure.management.keyvault.KeyPermissions;
import com.microsoft.azure.management.keyvault.SecretPermissions;
import com.microsoft.azure.management.keyvault.Vault;
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
import com.microsoft.azure.management.samples.Utils;
import com.microsoft.rest.LogLevel;

import java.io.File;
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.resourcemanager.keyvault.samples;

import com.azure.core.credential.TokenCredential;
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.management.AzureEnvironment;
import com.azure.core.util.Configuration;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.resourcemanager.AzureResourceManager;
import com.azure.resourcemanager.keyvault.models.KeyPermissions;
import com.azure.resourcemanager.keyvault.models.SecretPermissions;
import com.azure.resourcemanager.keyvault.models.Vault;
import com.azure.core.management.Region;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.samples.Utils;

/**
* Azure Key Vault sample for managing key vaults -
Expand All @@ -33,22 +31,22 @@ public final class ManageKeyVault {

/**
* Main function which runs the actual sample.
* @param azure instance of the azure client
* @param azureResourceManager instance of the azure client
* @param clientId client id
* @return true if sample runs successfully
*/
public static boolean runSample(Azure azure, String clientId) {
final String vaultName1 = SdkContext.randomResourceName("vault1", 20);
final String vaultName2 = SdkContext.randomResourceName("vault2", 20);
final String rgName = SdkContext.randomResourceName("rgNEMV", 24);
public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) {
final String vaultName1 = Utils.randomResourceName(azureResourceManager, "vault1", 20);
final String vaultName2 = Utils.randomResourceName(azureResourceManager, "vault2", 20);
final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24);

try {
//============================================================
// Create a key vault with empty access policy

System.out.println("Creating a key vault...");

Vault vault1 = azure.vaults().define(vaultName1)
Vault vault1 = azureResourceManager.vaults().define(vaultName1)
.withRegion(Region.US_WEST)
.withNewResourceGroup(rgName)
.withEmptyAccessPolicy()
Expand Down Expand Up @@ -83,6 +81,7 @@ public static boolean runSample(Azure azure, String clientId) {
.withDeploymentEnabled()
.withTemplateDeploymentEnabled()
.updateAccessPolicy(vault1.accessPolicies().get(0).objectId())
.allowCertificatePermissions()
.allowSecretAllPermissions()
.parent()
.apply();
Expand All @@ -95,7 +94,7 @@ public static boolean runSample(Azure azure, String clientId) {
//============================================================
// Create another key vault

Vault vault2 = azure.vaults().define(vaultName2)
Vault vault2 = azureResourceManager.vaults().define(vaultName2)
.withRegion(Region.US_EAST)
.withExistingResourceGroup(rgName)
.defineAccessPolicy()
Expand All @@ -117,33 +116,29 @@ public static boolean runSample(Azure azure, String clientId) {

System.out.println("Listing key vaults...");

for (Vault vault : azure.vaults().listByResourceGroup(rgName)) {
for (Vault vault : azureResourceManager.vaults().listByResourceGroup(rgName)) {
Utils.print(vault);
}

//============================================================
// Delete key vaults
System.out.println("Deleting the key vaults");
azure.vaults().deleteById(vault1.id());
azure.vaults().deleteById(vault2.id());
azureResourceManager.vaults().deleteById(vault1.id());
azureResourceManager.vaults().deleteById(vault2.id());
System.out.println("Deleted the key vaults");

return true;
} catch (Exception e) {
System.err.println(e.getMessage());
} finally {
try {
System.out.println("Deleting Resource Group: " + rgName);
azure.resourceGroups().deleteByName(rgName);
azureResourceManager.resourceGroups().beginDeleteByName(rgName);
System.out.println("Deleted Resource Group: " + rgName);
} catch (NullPointerException npe) {
System.out.println("Did not create any resources in Azure. No clean up is necessary");
} catch (Exception g) {
g.printStackTrace();
}
}

return false;
}
/**
* Main entry point.
Expand All @@ -155,17 +150,22 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION"));
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
.build();
final Configuration configuration = Configuration.getGlobalConfiguration();

Azure azure = Azure.configure()
.withLogLevel(LogLevel.BASIC)
.authenticate(credFile)
.withDefaultSubscription();
AzureResourceManager azureResourceManager = AzureResourceManager
.configure()
.withLogLevel(HttpLogDetailLevel.BASIC)
.authenticate(credential, profile)
.withDefaultSubscription();

// Print selected subscription
System.out.println("Selected subscription: " + azure.subscriptionId());
System.out.println("Selected subscription: " + azureResourceManager.subscriptionId());

runSample(azure, ApplicationTokenCredentials.fromFile(credFile).clientId());
runSample(azureResourceManager, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID));
} catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
Expand Down
Loading

0 comments on commit f87b74a

Please sign in to comment.