Release azure-resourcemanager 2.0.0

Author: Azure-Fluent

README.md

@@ -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/managed-disk-java-create-virtual-machine-using-custom-image-from-VHD.git
 
@@ -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).
 
 ---
 

pom.xml

@@ -15,15 +15,16 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.4.0</version>
         <configuration>
-          <mainClass>com.microsoft.azure.management.compute.samples.CreateVirtualMachineUsingCustomImageFromVHD</mainClass>
+          <mainClass>com.azure.resourcemanager.compute.samples.CreateVirtualMachineUsingCustomImageFromVHD</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>
@@ -40,7 +41,7 @@
               </descriptorRefs>
               <archive>
                 <manifest>
-                  <mainClass>com.microsoft.azure.management.compute.samples.CreateVirtualMachineUsingCustomImageFromVHD.java</mainClass>
+                  <mainClass>com.azure.resourcemanager.compute.samples.CreateVirtualMachineUsingCustomImageFromVHD.java</mainClass>
                 </manifest>
               </archive>
             </configuration>
@@ -51,30 +52,25 @@
   </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>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.1.3</version>
     </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jsch</artifactId>
       <version>0.1.55</version>
     </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.6</version>
+    </dependency>
     <dependency>
       <groupId>com.github.cverges.expect4j</groupId>
       <artifactId>expect4j</artifactId>

src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java renamed to src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java

@@ -1,28 +1,27 @@
-/**
- * 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;
-
+// 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.KnownLinuxVirtualMachineImage;
+import com.azure.resourcemanager.compute.models.VirtualMachine;
+import com.azure.core.management.Region;
+import com.azure.core.management.profile.AzureProfile;
 import com.jcraft.jsch.JSchException;
-import com.microsoft.azure.management.Azure;
-import com.microsoft.azure.management.compute.CachingTypes;
-import com.microsoft.azure.management.compute.Disk;
-import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage;
-import com.microsoft.azure.management.compute.OperatingSystemStateTypes;
-import com.microsoft.azure.management.compute.VirtualMachine;
-import com.microsoft.azure.management.compute.VirtualMachineCustomImage;
-import com.microsoft.azure.management.compute.VirtualMachineDataDisk;
-import com.microsoft.azure.management.compute.VirtualMachineSizeTypes;
-import com.microsoft.azure.management.resources.fluentcore.arm.Region;
-import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
-import com.microsoft.azure.management.samples.SSHShell;
-import com.microsoft.azure.management.samples.Utils;
-import com.microsoft.rest.LogLevel;
-
-import java.io.File;
+import com.azure.resourcemanager.compute.models.CachingTypes;
+import com.azure.resourcemanager.compute.models.Disk;
+import com.azure.resourcemanager.compute.models.OperatingSystemStateTypes;
+import com.azure.resourcemanager.compute.models.VirtualMachineCustomImage;
+import com.azure.resourcemanager.compute.models.VirtualMachineDataDisk;
+import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes;
+import com.azure.resourcemanager.samples.SSHShell;
+import com.azure.resourcemanager.samples.Utils;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,22 +41,21 @@ public final class CreateVirtualMachineUsingCustomImageFromVHD {
 
     /**
      * 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) {
-        final String linuxVMName1 = SdkContext.randomResourceName("VM1", 10);
-        final String linuxVMName2 = SdkContext.randomResourceName("VM2", 10);
-        final String linuxVMName3 = SdkContext.randomResourceName("VM3", 10);
-        final String customImageName = SdkContext.randomResourceName("img", 10);
-        final String rgName = SdkContext.randomResourceName("rgCOMV", 15);
-        final String publicIPDnsLabel = SdkContext.randomResourceName("pip", 10);
+    public static boolean runSample(AzureResourceManager azureResourceManager) {
+        final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 10);
+        final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 10);
+        final String linuxVMName3 = Utils.randomResourceName(azureResourceManager, "VM3", 10);
+        final String customImageName = Utils.randomResourceName(azureResourceManager, "img", 10);
+        final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15);
+        final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 10);
         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();
         final Region region = Region.US_WEST_CENTRAL;
 
-        final String apacheInstallScript = "https://raw.githubusercontent.com/Azure/azure-libraries-for-java/master/azure-samples/src/main/resources/install_apache.sh";
+        final String apacheInstallScript = "https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/sdk/resourcemanager/azure-resourcemanager-samples/src/main/resources/install_apache.sh";
         final String apacheInstallCommand = "bash install_apache.sh";
         List<String> apacheInstallScriptUris = new ArrayList<>();
         apacheInstallScriptUris.add(apacheInstallScript);
@@ -69,7 +67,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
+            VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -129,7 +127,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating virtual machine custom image from un-managed disk VHDs: " + linuxVM.id());
 
-            VirtualMachineCustomImage virtualMachineCustomImage = azure.virtualMachineCustomImages()
+            VirtualMachineCustomImage virtualMachineCustomImage = azureResourceManager.virtualMachineCustomImages()
                     .define(customImageName)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
@@ -158,13 +156,13 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using custom image: " + virtualMachineCustomImage.id());
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
+            VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
                     .withPrimaryPrivateIPAddressDynamic()
                     .withoutPrimaryPublicIPAddress()
-                    .withLinuxCustomImage(virtualMachineCustomImage.id())
+                    .withGeneralizedLinuxCustomImage(virtualMachineCustomImage.id())
                     .withRootUsername(userName)
                     .withRootPassword(password)
                     .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
@@ -177,13 +175,13 @@ public static boolean runSample(Azure azure) {
             // Create another Linux VM using custom image and configure the data disks from image and
             // add another data disk
 
-            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3)
+            VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVMName3)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
                     .withPrimaryPrivateIPAddressDynamic()
                     .withoutPrimaryPublicIPAddress()
-                    .withLinuxCustomImage(virtualMachineCustomImage.id())
+                    .withGeneralizedLinuxCustomImage(virtualMachineCustomImage.id())
                     .withRootUsername(userName)
                     .withRootPassword(password)
                     .withNewDataDiskFromImage(1, 200, CachingTypes.READ_WRITE)
@@ -208,15 +206,15 @@ public static boolean runSample(Azure azure) {
             System.out.println("Getting OS and data disks SAS Uris");
 
             // OS Disk SAS Uri
-            Disk osDisk = azure.disks().getById(linuxVM3.osDiskId());
+            Disk osDisk = azureResourceManager.disks().getById(linuxVM3.osDiskId());
 
             String osDiskSasUri = osDisk.grantAccess(24 * 60);
 
             System.out.println("OS disk SAS Uri: " + osDiskSasUri);
 
             // Data Disks SAS Uri
             for (VirtualMachineDataDisk disk : linuxVM3.dataDisks().values()) {
-                Disk dataDisk = azure.disks().getById(disk.id());
+                Disk dataDisk = azureResourceManager.disks().getById(disk.id());
                 String dataDiskSasUri = dataDisk.grantAccess(24 * 60);
                 System.out.println(String.format("Data disk (lun: %d) SAS Uri: %s", disk.lun(), dataDiskSasUri));
             }
@@ -225,25 +223,21 @@ public static boolean runSample(Azure azure) {
             // Deleting the custom image
             System.out.println("Deleting custom Image: " + virtualMachineCustomImage.id());
 
-            azure.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id());
+            azureResourceManager.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id());
 
             System.out.println("Deleted custom image");
             return true;
-        } catch (Exception f) {
-            System.out.println(f.getMessage());
-            f.printStackTrace();
         } finally {
             try {
                 System.out.println("Deleting Resource Group: " + rgName);
-                azure.resourceGroups().beginDeleteByName(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;
     }
 
     /**
@@ -255,17 +249,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.BODY)
-                    .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();