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 e9561b7 commit 29fd208
Show file tree
Hide file tree
Showing 4 changed files with 1,665 additions and 1,425 deletions.
8 changes: 5 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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/compute-java-manage-availability-sets.git

Expand All @@ -36,9 +36,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.compute.samples.ManageAvailabilitySet</mainClass>
<mainClass>com.azure.resourcemanager.compute.samples.ManageAvailabilitySet</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.compute.samples.ManageAvailabilitySet.java</mainClass>
<mainClass>com.azure.resourcemanager.compute.samples.ManageAvailabilitySet.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>
104 changes: 50 additions & 54 deletions ...ompute/samples/ManageAvailabilitySet.java → ...ompute/samples/ManageAvailabilitySet.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
/**
* 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.compute.samples;

import com.microsoft.azure.management.Azure;
import com.microsoft.azure.management.compute.AvailabilitySet;
import com.microsoft.azure.management.compute.AvailabilitySetSkuTypes;
import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage;
import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage;
import com.microsoft.azure.management.compute.VirtualMachine;
import com.microsoft.azure.management.compute.VirtualMachineSizeTypes;
import com.microsoft.azure.management.network.Network;
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
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.compute.samples;

import com.azure.core.credential.TokenCredential;
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.management.AzureEnvironment;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.resourcemanager.AzureResourceManager;
import com.azure.resourcemanager.compute.models.AvailabilitySet;
import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes;
import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage;
import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage;
import com.azure.resourcemanager.compute.models.VirtualMachine;
import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes;
import com.azure.resourcemanager.network.models.Network;
import com.azure.core.management.Region;
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.samples.Utils;

/**
* Azure Compute sample for managing availability sets -
Expand All @@ -36,21 +35,20 @@ public final class ManageAvailabilitySet {

/**
* Main function which runs the actual sample.
* @param azure instance of the azure client
* @param azureResourceManager instance of the azure client
* @return true if sample runs successfully
*/
public static boolean runSample(Azure azure) {
public static boolean runSample(AzureResourceManager azureResourceManager) {
final Region region = Region.US_WEST_CENTRAL;
final String rgName = Utils.createRandomName("rgCOMA");
final String availSetName1 = Utils.createRandomName("av1");
final String availSetName2 = Utils.createRandomName("av2");
final String vm1Name = Utils.createRandomName("vm1");
final String vm2Name = Utils.createRandomName("vm2");
final String vnetName = Utils.createRandomName("vnet");
final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMA", 15);
final String availSetName1 = Utils.randomResourceName(azureResourceManager, "av1", 15);
final String availSetName2 = Utils.randomResourceName(azureResourceManager, "av2", 15);
final String vm1Name = Utils.randomResourceName(azureResourceManager, "vm1", 15);
final String vm2Name = Utils.randomResourceName(azureResourceManager, "vm2", 15);
final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 15);

final String userName = "tirekicker";
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")]
final String password = "12NewPA$$w0rd!";
final String password = Utils.password();

try {

Expand All @@ -59,7 +57,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Creating an availability set");

AvailabilitySet availSet1 = azure.availabilitySets().define(availSetName1)
AvailabilitySet availSet1 = azureResourceManager.availabilitySets().define(availSetName1)
.withRegion(region)
.withNewResourceGroup(rgName)
.withFaultDomainCount(2)
Expand All @@ -75,7 +73,7 @@ public static boolean runSample(Azure azure) {
//=============================================================
// Define a virtual network for the VMs in this availability set

Creatable<Network> networkDefinition = azure.networks().define(vnetName)
Creatable<Network> networkDefinition = azureResourceManager.networks().define(vnetName)
.withRegion(region)
.withExistingResourceGroup(rgName)
.withAddressSpace("10.0.0.0/28");
Expand All @@ -86,7 +84,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Creating a Windows VM in the availability set");

VirtualMachine vm1 = azure.virtualMachines().define(vm1Name)
VirtualMachine vm1 = azureResourceManager.virtualMachines().define(vm1Name)
.withRegion(region)
.withExistingResourceGroup(rgName)
.withNewPrimaryNetwork(networkDefinition)
Expand All @@ -109,7 +107,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Creating a Linux VM in the availability set");

VirtualMachine vm2 = azure.virtualMachines().define(vm2Name)
VirtualMachine vm2 = azureResourceManager.virtualMachines().define(vm2Name)
.withRegion(region)
.withExistingResourceGroup(rgName)
.withNewPrimaryNetwork(networkDefinition)
Expand Down Expand Up @@ -143,7 +141,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Creating an availability set");

AvailabilitySet availSet2 = azure.availabilitySets().define(availSetName2)
AvailabilitySet availSet2 = azureResourceManager.availabilitySets().define(availSetName2)
.withRegion(region)
.withExistingResourceGroup(rgName)
.create();
Expand All @@ -159,7 +157,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Printing list of availability sets =======");

for (AvailabilitySet availabilitySet : azure.availabilitySets().listByResourceGroup(resourceGroupName)) {
for (AvailabilitySet availabilitySet : azureResourceManager.availabilitySets().listByResourceGroup(resourceGroupName)) {
Utils.print(availabilitySet);
}

Expand All @@ -169,28 +167,22 @@ public static boolean runSample(Azure azure) {

System.out.println("Deleting an availability set: " + availSet2.id());

azure.availabilitySets().deleteById(availSet2.id());
azureResourceManager.availabilitySets().deleteById(availSet2.id());

System.out.println("Deleted availability set: " + availSet2.id());
return true;
} catch (Exception f) {

System.out.println(f.getMessage());
f.printStackTrace();

} 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;
}

/**
Expand All @@ -203,17 +195,21 @@ 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();

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);
runSample(azureResourceManager);
} catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
Expand All @@ -223,4 +219,4 @@ public static void main(String[] args) {

private ManageAvailabilitySet() {
}
}
}
Loading

0 comments on commit 29fd208

Please sign in to comment.