Merged changes from main

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/storagepool/CreateHyperdiskStoragePool.java

@@ -15,7 +15,6 @@
 package compute.disks.storagepool;
 
 // [START compute_hyperdisk_pool_create]
-
 import com.google.cloud.compute.v1.InsertStoragePoolRequest;
 import com.google.cloud.compute.v1.Operation;
 import com.google.cloud.compute.v1.StoragePool;
@@ -32,12 +31,13 @@ public static void main(String[] args)
     // Project ID or project number of the Google Cloud project you want to use.
     String projectId = "YOUR_PROJECT_ID";
     // Name of the zone in which you want to create the storagePool.
-    String zone = "europe-central2-b";
+    String zone = "us-central1-a";
     // Name of the storagePool you want to create.
     String storagePoolName = "YOUR_STORAGE_POOL_NAME";
-    // The type of disk you want to create. This value uses the following format:
-    // "projects/%s/zones/%s/storagePoolTypes/hyperdisk-throughput|hyperdisk-balanced"
-    String storagePoolType = "hyperdisk-balanced";
+    // The type of disk you want to create.
+    // Storage types can be "hyperdisk-throughput" or "hyperdisk-balanced"
+    String storagePoolType = String.format(
+        "projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced", projectId, zone);
     // Optional: the capacity provisioning type of the storage pool.
     // The allowed values are advanced and standard. If not specified, the value advanced is used.
     String capacityProvisioningType = "advanced";
@@ -48,16 +48,19 @@ public static void main(String[] args)
     long provisionedIops = 3000;
     // the throughput in MBps to provision for the storage pool.
     long provisionedThroughput = 140;
+    // The allowed values are low-casing strings "advanced" and "standard".
+    // If not specified, "advanced" is used.
+    String performanceProvisioningType = "advanced";
 
     createHyperdiskStoragePool(projectId, zone, storagePoolName, storagePoolType,
-            capacityProvisioningType, provisionedCapacity, provisionedIops, provisionedThroughput);
+            capacityProvisioningType, provisionedCapacity, provisionedIops,
+        provisionedThroughput, performanceProvisioningType);
   }
 
   // Creates a hyperdisk storagePool in a project
   public static StoragePool createHyperdiskStoragePool(String projectId, String zone,
-                                                String storagePoolName, String storagePoolType,
-                                                String capacityProvisioningType, long capacity,
-                                                long iops, long throughput)
+        String storagePoolName, String storagePoolType, String capacityProvisioningType,
+        long capacity, long iops, long throughput, String performanceProvisioningType)
           throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
@@ -71,6 +74,7 @@ public static StoragePool createHyperdiskStoragePool(String projectId, String zo
               .setPoolProvisionedCapacityGb(capacity)
               .setPoolProvisionedIops(iops)
               .setPoolProvisionedThroughput(throughput)
+              .setPerformanceProvisioningType(performanceProvisioningType)
               .build();
 
       InsertStoragePoolRequest request = InsertStoragePoolRequest.newBuilder()

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -29,25 +29,27 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
-import org.junit.FixMethodOrder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.junit.runners.MethodSorters;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 40, unit = TimeUnit.MINUTES)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Timeout(value = 6, unit = TimeUnit.MINUTES)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class HyperdisksIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "us-east1-c";
-  private static String HYPERDISK_NAME;
-  private static String HYPERDISK_IN_POOL_NAME;
-  private static String STORAGE_POOL_NAME;
+  private static final String ZONE = "us-central1-a";
+  private static final String  HYPERDISK_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+  private static final String  HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+  private static final String STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
+  private static final String PERFORMANCE_PROVISIONING_TYPE = "advanced";
+  private static final String CAPACITY_PROVISIONING_TYPE = "advanced";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -60,26 +62,21 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    HYPERDISK_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
-    HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
-    STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
-
-    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
   }
 
   @AfterAll
   public static void cleanup()
        throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Delete all disks created for testing.
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
-    //DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
+    DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
 
-    //Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+    Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
   }
 
   @Test
-  public void stage1_CreateHyperdiskTest()
+  @Order(1)
+  public void testCreateHyperdisk()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
 
@@ -96,29 +93,33 @@ public void stage1_CreateHyperdiskTest()
     Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
   }
 
-  @Disabled
   @Test
-  public void stage1_CreateHyperdiskStoragePoolTest()
+  @Order(1)
+  public void testCreateHyperdiskStoragePool()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String poolType = String.format("projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced",
         PROJECT_ID, ZONE);
     StoragePool storagePool = CreateHyperdiskStoragePool
          .createHyperdiskStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME, poolType,
-         "advanced", 10240, 10000, 10240);
+             CAPACITY_PROVISIONING_TYPE, 10240, 10000, 1024,
+             PERFORMANCE_PROVISIONING_TYPE);
 
     Assert.assertNotNull(storagePool);
     Assert.assertEquals(STORAGE_POOL_NAME, storagePool.getName());
     Assert.assertEquals(10000, storagePool.getPoolProvisionedIops());
-    Assert.assertEquals(10240, storagePool.getPoolProvisionedThroughput());
+    Assert.assertEquals(1024, storagePool.getPoolProvisionedThroughput());
     Assert.assertEquals(10240, storagePool.getPoolProvisionedCapacityGb());
     Assert.assertTrue(storagePool.getStoragePoolType().contains("hyperdisk-balanced"));
-    Assert.assertTrue(storagePool.getCapacityProvisioningType().equalsIgnoreCase("advanced"));
+    Assert.assertTrue(storagePool.getCapacityProvisioningType()
+        .equalsIgnoreCase(CAPACITY_PROVISIONING_TYPE));
+    Assert.assertTrue(storagePool.getPerformanceProvisioningType()
+        .equalsIgnoreCase(PERFORMANCE_PROVISIONING_TYPE));
     Assert.assertTrue(storagePool.getZone().contains(ZONE));
   }
 
-  @Disabled
   @Test
-  public void stage2_CreateHyperdiskStoragePoolTest()
+  @Order(2)
+  public void testCreateDiskInStoragePool()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
     String storagePoolLink = String

dataplex/snippets/src/main/java/dataplex/CreateAspectType.java

@@ -22,7 +22,6 @@
 import com.google.cloud.dataplex.v1.LocationName;
 import java.util.List;
 
-// Sample to create Aspect Type
 public class CreateAspectType {
 
   public static void main(String[] args) throws Exception {
@@ -59,33 +58,32 @@ public static void main(String[] args) throws Exception {
     System.out.println("Successfully created aspect type: " + createdAspectType.getName());
   }
 
+  // Method to create Aspect Type located in projectId, location and with aspectTypeId and
+  // aspectFields specifying schema of the Aspect Type
   public static AspectType createAspectType(
       String projectId,
       String location,
       String aspectTypeId,
       List<AspectType.MetadataTemplate> aspectFields)
       throws Exception {
-    LocationName locationName = LocationName.of(projectId, location);
-    AspectType aspectType =
-        AspectType.newBuilder()
-            .setDescription("description of the aspect type")
-            .setMetadataTemplate(
-                AspectType.MetadataTemplate.newBuilder()
-                    // The name must follow regex ^(([a-zA-Z]{1})([\\w\\-_]{0,62}))$
-                    // That means name must only contain alphanumeric character or dashes or
-                    // underscores, start with an alphabet, and must be less than 63 characters.
-                    .setName("name_of_the_template")
-                    .setType("record")
-                    // Aspect Type fields, that themselves are Metadata Templates
-                    .addAllRecordFields(aspectFields)
-                    .build())
-            .build();
-
     // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests. After completing all of your requests, call
-    // the "close" method on the client to safely clean up any remaining background resources,
-    // or use "try-with-close" statement to do this automatically.
+    // once, and can be reused for multiple requests.
     try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      LocationName locationName = LocationName.of(projectId, location);
+      AspectType aspectType =
+          AspectType.newBuilder()
+              .setDescription("description of the aspect type")
+              .setMetadataTemplate(
+                  AspectType.MetadataTemplate.newBuilder()
+                      // The name must follow regex ^(([a-zA-Z]{1})([\\w\\-_]{0,62}))$
+                      // That means name must only contain alphanumeric character or dashes or
+                      // underscores, start with an alphabet, and must be less than 63 characters.
+                      .setName("name_of_the_template")
+                      .setType("record")
+                      // Aspect Type fields, that themselves are Metadata Templates
+                      .addAllRecordFields(aspectFields)
+                      .build())
+              .build();
       return client.createAspectTypeAsync(locationName, aspectType, aspectTypeId).get();
     }
   }

dataplex/snippets/src/main/java/dataplex/CreateEntry.java

@@ -31,6 +31,7 @@ public class CreateEntry {
   public static void main(String[] args) throws Exception {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "MY_PROJECT_ID";
+    // Available locations: https://cloud.google.com/dataplex/docs/locations
     String location = "MY_LOCATION";
     String entryGroupId = "MY_ENTRY_GROUP_ID";
     String entryId = "MY_ENTRY_ID";

dataplex/snippets/src/main/java/dataplex/CreateEntryGroup.java

@@ -21,7 +21,6 @@
 import com.google.cloud.dataplex.v1.EntryGroup;
 import com.google.cloud.dataplex.v1.LocationName;
 
-// Samples to create Entry Group
 public class CreateEntryGroup {
 
   public static void main(String[] args) throws Exception {
@@ -35,17 +34,15 @@ public static void main(String[] args) throws Exception {
     System.out.println("Successfully created entry group: " + createdEntryGroup.getName());
   }
 
+  // Method to create Entry Group located in projectId, location and with entryGroupId
   public static EntryGroup createEntryGroup(String projectId, String location, String entryGroupId)
       throws Exception {
-    LocationName locationName = LocationName.of(projectId, location);
-    EntryGroup entryGroup =
-        EntryGroup.newBuilder().setDescription("description of the entry group").build();
-
     // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests. After completing all of your requests, call
-    // the "close" method on the client to safely clean up any remaining background resources,
-    // or use "try-with-close" statement to do this automatically.
+    // once, and can be reused for multiple requests.
     try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      LocationName locationName = LocationName.of(projectId, location);
+      EntryGroup entryGroup =
+          EntryGroup.newBuilder().setDescription("description of the entry group").build();
       return client.createEntryGroupAsync(locationName, entryGroup, entryGroupId).get();
     }
   }

dataplex/snippets/src/main/java/dataplex/CreateEntryType.java

@@ -21,7 +21,6 @@
 import com.google.cloud.dataplex.v1.EntryType;
 import com.google.cloud.dataplex.v1.LocationName;
 
-// Samples to create Entry Type
 public class CreateEntryType {
 
   public static void main(String[] args) throws Exception {
@@ -35,27 +34,26 @@ public static void main(String[] args) throws Exception {
     System.out.println("Successfully created entry type: " + createdEntryType.getName());
   }
 
+  // Method to create Entry Type located in projectId, location and with entryTypeId
   public static EntryType createEntryType(String projectId, String location, String entryTypeId)
       throws Exception {
-    LocationName locationName = LocationName.of(projectId, location);
-    EntryType entryType =
-        EntryType.newBuilder()
-            .setDescription("description of the entry type")
-            // Required aspects will need to be attached to every entry created for this entry type.
-            // You cannot change required aspects for entry type once it is created.
-            .addRequiredAspects(
-                EntryType.AspectInfo.newBuilder()
-                    // Example of system aspect type.
-                    // It is also possible to specify custom aspect type.
-                    .setType("projects/dataplex-types/locations/global/aspectTypes/schema")
-                    .build())
-            .build();
-
     // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests. After completing all of your requests, call
-    // the "close" method on the client to safely clean up any remaining background resources,
-    // or use "try-with-close" statement to do this automatically.
+    // once, and can be reused for multiple requests.
     try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      LocationName locationName = LocationName.of(projectId, location);
+      EntryType entryType =
+          EntryType.newBuilder()
+              .setDescription("description of the entry type")
+              // Required aspects will need to be attached to every entry created for this entry
+              // type.
+              // You cannot change required aspects for entry type once it is created.
+              .addRequiredAspects(
+                  EntryType.AspectInfo.newBuilder()
+                      // Example of system aspect type.
+                      // It is also possible to specify custom aspect type.
+                      .setType("projects/dataplex-types/locations/global/aspectTypes/schema")
+                      .build())
+              .build();
       return client.createEntryTypeAsync(locationName, entryType, entryTypeId).get();
     }
   }

dataplex/snippets/src/main/java/dataplex/DeleteAspectType.java

@@ -20,7 +20,6 @@
 import com.google.cloud.dataplex.v1.AspectTypeName;
 import com.google.cloud.dataplex.v1.CatalogServiceClient;
 
-// Sample to delete Aspect Type
 public class DeleteAspectType {
 
   public static void main(String[] args) throws Exception {
@@ -34,15 +33,13 @@ public static void main(String[] args) throws Exception {
     System.out.println("Successfully deleted aspect type");
   }
 
+  // Method to delete Aspect Type located in projectId, location and with aspectTypeId
   public static void deleteAspectType(String projectId, String location, String aspectTypeId)
       throws Exception {
-    AspectTypeName aspectTypeName = AspectTypeName.of(projectId, location, aspectTypeId);
-
     // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests. After completing all of your requests, call
-    // the "close" method on the client to safely clean up any remaining background resources,
-    // or use "try-with-close" statement to do this automatically.
+    // once, and can be reused for multiple requests.
     try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      AspectTypeName aspectTypeName = AspectTypeName.of(projectId, location, aspectTypeId);
       client.deleteAspectTypeAsync(aspectTypeName).get();
     }
   }

dataplex/snippets/src/main/java/dataplex/DeleteEntry.java

@@ -25,6 +25,7 @@ public class DeleteEntry {
   public static void main(String[] args) throws Exception {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "MY_PROJECT_ID";
+    // Available locations: https://cloud.google.com/dataplex/docs/locations
     String location = "MY_LOCATION";
     String entryGroupId = "MY_ENTRY_GROUP_ID";
     String entryId = "MY_ENTRY_ID";

dataplex/snippets/src/main/java/dataplex/DeleteEntryGroup.java

@@ -20,7 +20,6 @@
 import com.google.cloud.dataplex.v1.CatalogServiceClient;
 import com.google.cloud.dataplex.v1.EntryGroupName;
 
-// Sample to delete Entry Group
 public class DeleteEntryGroup {
 
   public static void main(String[] args) throws Exception {
@@ -34,15 +33,13 @@ public static void main(String[] args) throws Exception {
     System.out.println("Successfully deleted entry group");
   }
 
+  // Method to delete Entry Group located in projectId, location and with entryGroupId
   public static void deleteEntryGroup(String projectId, String location, String entryGroupId)
       throws Exception {
-    EntryGroupName entryGroupName = EntryGroupName.of(projectId, location, entryGroupId);
-
     // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests. After completing all of your requests, call
-    // the "close" method on the client to safely clean up any remaining background resources,
-    // or use "try-with-close" statement to do this automatically.
+    // once, and can be reused for multiple requests.
     try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      EntryGroupName entryGroupName = EntryGroupName.of(projectId, location, entryGroupId);
       client.deleteEntryGroupAsync(entryGroupName).get();
     }
   }