Release azure-resourcemanager 2.0.0

Azure-Fluent · Azure-Fluent · commit 99c315b4f5cb · 2020-10-26T13:11:58.000+08:00
diff --git a/README.md b/README.md
@@ -5,25 +5,25 @@ languages:
 products:
 - azure
 extensions:
-  services: virtual-network
+  services: Network
   platforms: java
 ---
 
 # Getting Started with Network - Manage Network Interface - in Java #
 
 
   Azure Network sample for managing network interfaces -
-   - Create a virtual machine with multiple network interfaces
-   - Configure a network interface
-   - List network interfaces
-   - Delete a network interface.
+  - Create a virtual machine with multiple network interfaces
+  - Configure a network interface
+  - List network interfaces
+  - Delete a network interface.
  
 
 ## Running this Sample ##
 
 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/network-java-manage-network-interface.git
 
@@ -33,9 +33,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).
 
 ---
 
diff --git a/pom.xml b/pom.xml
@@ -15,15 +15,16 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.4.0</version>
         <configuration>
-          <mainClass>com.microsoft.azure.management.network.samples.ManageNetworkInterface</mainClass>
+          <mainClass>com.azure.resourcemanager.network.samples.ManageNetworkInterface</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.network.samples.ManageNetworkInterface.java</mainClass>
+                  <mainClass>com.azure.resourcemanager.network.samples.ManageNetworkInterface.java</mainClass>
                 </manifest>
               </archive>
             </configuration>
@@ -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>
diff --git a/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java b/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java
@@ -1,56 +1,55 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.resourcemanager.network.samples;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.AzureEnvironment;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.resourcemanager.AzureResourceManager;
+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.resourcemanager.network.models.NetworkInterface;
+import com.azure.core.management.Region;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.resourcemanager.samples.Utils;
 
-package com.microsoft.azure.management.network.samples;
-
-import com.microsoft.azure.PagedList;
-import com.microsoft.azure.management.Azure;
-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.network.NetworkInterface;
-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;
 import java.util.Date;
 
 /**
  * Azure Network sample for managing network interfaces -
- *  - Create a virtual machine with multiple network interfaces
- *  - Configure a network interface
- *  - List network interfaces
- *  - Delete a network interface.
+ * - Create a virtual machine with multiple network interfaces
+ * - Configure a network interface
+ * - List network interfaces
+ * - Delete a network interface.
  */
 
 public final class ManageNetworkInterface {
 
     /**
      * 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_NORTH_CENTRAL;
-        final String vnetName = SdkContext.randomResourceName("vnet", 24);
-        final String networkInterfaceName1 = SdkContext.randomResourceName("nic1", 24);
-        final String networkInterfaceName2 = SdkContext.randomResourceName("nic2", 24);
-        final String networkInterfaceName3 = SdkContext.randomResourceName("nic3", 24);
-        final String publicIPAddressLeafDNS1 = SdkContext.randomResourceName("pip1", 24);
-        final String publicIPAddressLeafDNS2 = SdkContext.randomResourceName("pip2", 24);
-
-        // TODO adjust the length of vm name from 8 to 24
-        final String vmName = SdkContext.randomResourceName("vm", 8);
-        final String rgName = SdkContext.randomResourceName("rgNEMI", 24);
+        final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24);
+        final String networkInterfaceName1 = Utils.randomResourceName(azureResourceManager, "nic1", 24);
+        final String networkInterfaceName2 = Utils.randomResourceName(azureResourceManager, "nic2", 24);
+        final String networkInterfaceName3 = Utils.randomResourceName(azureResourceManager, "nic3", 24);
+        final String publicIPAddressLeafDNS1 = Utils.randomResourceName(azureResourceManager, "pip1", 24);
+        final String publicIPAddressLeafDNS2 = Utils.randomResourceName(azureResourceManager, "pip2", 24);
+
+        // TODO: adjust the length of vm name from 8 to 24
+        final String vmName = Utils.randomResourceName(azureResourceManager, "vm", 8);
+        final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMI", 24);
         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 = SdkContext.randomResourceName("Pa5$", 24);
+        final String password = Utils.password();
         try {
 
             //============================================================
@@ -60,19 +59,19 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a virtual network ...");
 
-            Network network = azure.networks().define(vnetName)
+            Network network = azureResourceManager.networks().define(vnetName)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withAddressSpace("172.16.0.0/16")
                     .defineSubnet("Front-end")
-                        .withAddressPrefix("172.16.1.0/24")
-                        .attach()
+                    .withAddressPrefix("172.16.1.0/24")
+                    .attach()
                     .defineSubnet("Mid-tier")
-                        .withAddressPrefix("172.16.2.0/24")
-                        .attach()
+                    .withAddressPrefix("172.16.2.0/24")
+                    .attach()
                     .defineSubnet("Back-end")
-                        .withAddressPrefix("172.16.3.0/24")
-                        .attach()
+                    .withAddressPrefix("172.16.3.0/24")
+                    .attach()
                     .create();
 
             System.out.println("Created a virtual network: " + network.id());
@@ -81,7 +80,7 @@ public static boolean runSample(Azure azure) {
             System.out.println("Creating multiple network interfaces");
             System.out.println("Creating network interface 1");
 
-            NetworkInterface networkInterface1 = azure.networkInterfaces().define(networkInterfaceName1)
+            NetworkInterface networkInterface1 = azureResourceManager.networkInterfaces().define(networkInterfaceName1)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withExistingPrimaryNetwork(network)
@@ -95,7 +94,7 @@ public static boolean runSample(Azure azure) {
             Utils.print(networkInterface1);
             System.out.println("Creating network interface 2");
 
-            NetworkInterface networkInterface2 = azure.networkInterfaces().define(networkInterfaceName2)
+            NetworkInterface networkInterface2 = azureResourceManager.networkInterfaces().define(networkInterfaceName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withExistingPrimaryNetwork(network)
@@ -108,7 +107,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating network interface 3");
 
-            NetworkInterface networkInterface3 = azure.networkInterfaces().define(networkInterfaceName3)
+            NetworkInterface networkInterface3 = azureResourceManager.networkInterfaces().define(networkInterfaceName3)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withExistingPrimaryNetwork(network)
@@ -127,7 +126,7 @@ public static boolean runSample(Azure azure) {
 
             Date t1 = new Date();
 
-            VirtualMachine vm = azure.virtualMachines().define(vmName)
+            VirtualMachine vm = azureResourceManager.virtualMachines().define(vmName)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withExistingPrimaryNetworkInterface(networkInterface1)
@@ -162,7 +161,7 @@ public static boolean runSample(Azure azure) {
             // List network interfaces
 
             System.out.println("Walking through network inter4faces in resource group: " + rgName);
-            PagedList<NetworkInterface> networkInterfaces = azure.networkInterfaces().listByResourceGroup(rgName);
+            PagedIterable<NetworkInterface> networkInterfaces = azureResourceManager.networkInterfaces().listByResourceGroup(rgName);
             for (NetworkInterface networkinterface : networkInterfaces) {
                 Utils.print(networkinterface);
             }
@@ -173,28 +172,23 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Deleting a network interface: " + networkInterface2.id());
             System.out.println("First, deleting the vm");
-            azure.virtualMachines().deleteById(vm.id());
+            azureResourceManager.virtualMachines().deleteById(vm.id());
             System.out.println("Second, deleting the network interface");
-            azure.networkInterfaces().deleteById(networkInterface2.id());
+            azureResourceManager.networkInterfaces().deleteById(networkInterface2.id());
             System.out.println("Deleted network interface");
 
             System.out.println("============================================================");
             System.out.println("Remaining network interfaces are ...");
-            networkInterfaces = azure.networkInterfaces().listByResourceGroup(rgName);
+            networkInterfaces = azureResourceManager.networkInterfaces().listByResourceGroup(rgName);
             for (NetworkInterface networkinterface : networkInterfaces) {
                 Utils.print(networkinterface);
             }
             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");
@@ -203,11 +197,11 @@ public static boolean runSample(Azure azure) {
             }
 
         }
-        return false;
     }
 
     /**
      * Main entry point.
+     *
      * @param args the parameters
      */
     public static void main(String[] args) {
@@ -216,17 +210,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();
diff --git a/src/main/java/com/azure/resourcemanager/samples/Utils.java b/src/main/java/com/azure/resourcemanager/samples/Utils.java
