Merged changes from main

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/reservation/CreateReservation.java

@@ -107,7 +107,7 @@ public static void createReservation(
 
       // Wait for the create reservation operation to complete.
       Operation response =
-          reservationsClient.insertAsync(projectId, zone, reservation).get(5, TimeUnit.MINUTES);
+          reservationsClient.insertAsync(projectId, zone, reservation).get(7, TimeUnit.MINUTES);
 
       if (response.hasError()) {
         System.out.println("Reservation creation failed!" + response);

compute/cloud-client/src/test/java/compute/Util.java

@@ -57,7 +57,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_MINUTES = 45;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 30;
   // comma separate list of zone names
   private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
   private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";
@@ -238,7 +238,7 @@ public static void cleanUpExistingStoragePool(
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (StoragePoolsClient storagePoolsClient = StoragePoolsClient.create()) {
       for (StoragePool storagePool : storagePoolsClient.list(projectId, zone).iterateAll()) {
-        if (containPrefixToDeleteAndZone(projectId, prefixToDelete, zone)
+        if (containPrefixToDeleteAndZone(storagePool, prefixToDelete, zone)
             && isCreatedBeforeThresholdTime(storagePool.getCreationTimestamp())) {
           deleteStoragePool(projectId, zone, storagePool.getName());
         }
@@ -255,7 +255,7 @@ public static void deleteStoragePool(String project, String zone, String storage
               .setZone(zone)
               .setStoragePool(storagePoolName)
               .build();
-      Operation operation = storagePoolsClient.deleteAsync(request).get(1, TimeUnit.MINUTES);
+      Operation operation = storagePoolsClient.deleteAsync(request).get(3, TimeUnit.MINUTES);
       if (operation.hasError()) {
         System.out.println("StoragePool deletion failed!");
         throw new Error(operation.getError().toString());

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

@@ -32,6 +32,7 @@
 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.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
@@ -72,9 +73,9 @@ 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
@@ -95,6 +96,7 @@ public void stage1_CreateHyperdiskTest()
     Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage1_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
@@ -114,6 +116,7 @@ public void stage1_CreateHyperdiskStoragePoolTest()
     Assert.assertTrue(storagePool.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage2_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {

compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java

@@ -23,27 +23,32 @@
 import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.compute.v1.Reservation;
 import compute.Util;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 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.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 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 = 25, unit = TimeUnit.MINUTES)
-class CrudOperationsReservationIT {
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class CrudOperationsReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "us-central1-a";
+  private static final String ZONE = "us-west1-a";
   private static String RESERVATION_NAME;
   private static final int NUMBER_OF_VMS = 3;
   static String javaVersion = System.getProperty("java.version").substring(0, 2);
@@ -64,9 +69,6 @@ public static void setUp()
 
     // Cleanup existing stale resources.
     Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, ZONE);
-
-    CreateReservation.createReservation(
-        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
   }
 
   @AfterAll
@@ -82,8 +84,22 @@ public static void cleanup()
   }
 
   @Test
-  public void testGetReservation()
-      throws IOException {
+  public void firstCreateReservationTest()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    final PrintStream out = System.out;
+    ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(stdOut));
+    CreateReservation.createReservation(
+        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
+
+    assertThat(stdOut.toString()).contains("Reservation created. Operation Status: DONE");
+
+    stdOut.close();
+    System.setOut(out);
+  }
+
+  @Test
+  public void secondGetReservationTest() throws IOException {
     Reservation reservation = GetReservation.getReservation(
         PROJECT_ID, RESERVATION_NAME, ZONE);
 
@@ -92,7 +108,7 @@ public void testGetReservation()
   }
 
   @Test
-  public void testListReservation() throws IOException {
+  public void thirdListReservationTest() throws IOException {
     List<Reservation> reservations =
         ListReservations.listReservations(PROJECT_ID, ZONE);
 

compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java

@@ -92,23 +92,26 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
+    final PrintStream out = System.out;
+    ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(stdOut));
 
     // Cleanup existing stale resources.
     Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
     Util.cleanUpExistingRegionalInstanceTemplates(
         "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reservation-global-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reservation-regional-" + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingInstanceTemplates("test-shared-inst-temp-" + javaVersion, PROJECT_ID);
 
     // Initialize the client once for all tests
     reservationsClient = ReservationsClient.create();
 
-    RESERVATION_NAME_GLOBAL = "test-reserv-global-" + javaVersion  + "-"
+    RESERVATION_NAME_GLOBAL = "test-reservation-global-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
-    RESERVATION_NAME_REGIONAL = "test-reserv-regional-" + javaVersion  + "-"
+    RESERVATION_NAME_REGIONAL = "test-reservation-regional-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
-    RESERVATION_NAME_SHARED = "test-reserv-shared-" + javaVersion  + "-"
+    RESERVATION_NAME_SHARED = "test-reservation-shared-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
     GLOBAL_INSTANCE_TEMPLATE_URI = String.format("projects/%s/global/instanceTemplates/%s",
@@ -125,10 +128,15 @@ public static void setUp()
 
     // Create instance template with GLOBAL location.
     CreateInstanceTemplate.createInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
-
+    assertThat(stdOut.toString())
+        .contains("Instance Template Operation Status " + GLOBAL_INSTANCE_TEMPLATE_NAME);
     // Create instance template with REGIONAL location.
     CreateRegionalInstanceTemplate.createRegionalInstanceTemplate(
         PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
+    assertThat(stdOut.toString()).contains("Instance Template Operation Status: DONE");
+
+    stdOut.close();
+    System.setOut(out);
   }
 
   @AfterAll
@@ -219,7 +227,6 @@ public void testCreateReservationWithRegionInstanceTemplate()
   @Test
   public void testCreateSharedReservation()
       throws ExecutionException, InterruptedException, TimeoutException {
-
     // Mock the ReservationsClient
     ReservationsClient mockReservationsClient = mock(ReservationsClient.class);
 

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

@@ -32,7 +32,6 @@ public static void main(String[] args) throws Exception {
     String location = "MY_LOCATION";
     String aspectTypeId = "MY_ASPECT_TYPE_ID";
 
-    LocationName locationName = LocationName.of(projectId, location);
     AspectType.MetadataTemplate aspectField =
         AspectType.MetadataTemplate.newBuilder()
             // The name must follow regex ^(([a-zA-Z]{1})([\\w\\-_]{0,62}))$
@@ -55,15 +54,18 @@ public static void main(String[] args) throws Exception {
                     .build())
             .build();
     List<AspectType.MetadataTemplate> aspectFields = List.of(aspectField);
-    AspectType createdAspectType = createAspectType(locationName, aspectTypeId, aspectFields);
+    AspectType createdAspectType =
+        createAspectType(projectId, location, aspectTypeId, aspectFields);
     System.out.println("Successfully created aspect type: " + createdAspectType.getName());
   }
 
   public static AspectType createAspectType(
-      LocationName locationName,
+      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")

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dataplex;
+
+// [START dataplex_create_entry_type]
+import com.google.cloud.dataplex.v1.CatalogServiceClient;
+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 {
+    // 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 entryTypeId = "MY_ENTRY_TYPE_ID";
+
+    EntryType createdEntryType = createEntryType(projectId, location, entryTypeId);
+    System.out.println("Successfully created entry type: " + createdEntryType.getName());
+  }
+
+  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.
+    try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      return client.createEntryTypeAsync(locationName, entryType, entryTypeId).get();
+    }
+  }
+}
+// [END dataplex_create_entry_type]

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

@@ -30,12 +30,14 @@ public static void main(String[] args) throws Exception {
     String location = "MY_LOCATION";
     String aspectTypeId = "MY_ASPECT_TYPE_ID";
 
-    AspectTypeName aspectTypeName = AspectTypeName.of(projectId, location, aspectTypeId);
-    deleteAspectType(aspectTypeName);
+    deleteAspectType(projectId, location, aspectTypeId);
     System.out.println("Successfully deleted aspect type");
   }
 
-  public static void deleteAspectType(AspectTypeName aspectTypeName) throws Exception {
+  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,

dataplex/snippets/src/main/java/dataplex/DeleteEntryType.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dataplex;
+
+// [START dataplex_delete_entry_type]
+import com.google.cloud.dataplex.v1.CatalogServiceClient;
+import com.google.cloud.dataplex.v1.EntryTypeName;
+
+// Sample to delete Entry Type
+public class DeleteEntryType {
+
+  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 entryTypeId = "MY_ENTRY_TYPE_ID";
+
+    deleteEntryType(projectId, location, entryTypeId);
+    System.out.println("Successfully deleted entry type");
+  }
+
+  public static void deleteEntryType(String projectId, String location, String entryTypeId)
+      throws Exception {
+    EntryTypeName entryTypeName = EntryTypeName.of(projectId, location, entryTypeId);
+
+    // 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.
+    try (CatalogServiceClient client = CatalogServiceClient.create()) {
+      client.deleteEntryTypeAsync(entryTypeName).get();
+    }
+  }
+}
+// [END dataplex_delete_entry_type]

dataplex/snippets/src/main/java/dataplex/GetAspectType.java

@@ -32,12 +32,14 @@ public static void main(String[] args) throws IOException {
     String location = "MY_LOCATION";
     String aspectTypeId = "MY_ASPECT_TYPE_ID";
 
-    AspectTypeName aspectTypeName = AspectTypeName.of(projectId, location, aspectTypeId);
-    AspectType aspectType = getAspectType(aspectTypeName);
+    AspectType aspectType = getAspectType(projectId, location, aspectTypeId);
     System.out.println("Aspect type retrieved successfully: " + aspectType.getName());
   }
 
-  public static AspectType getAspectType(AspectTypeName aspectTypeName) throws IOException {
+  public static AspectType getAspectType(String projectId, String location, String aspectTypeId)
+      throws IOException {
+    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,