Added clean up method for regional disks, added comments

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneDisksFromConsistencyGroup.java

@@ -55,32 +55,32 @@ public static void cloneDisksFromConsistencyGroup(String project, String disksLo
             "projects/%s/regions/%s/resourcePolicies/%s", project, consistencyGroupLocation,
             consistencyGroupName);
 
+    // If your disk has zonal location uncomment this code
     //try (DisksClient disksClient = DisksClient.create()){
     //  BulkInsertDiskRequest request = BulkInsertDiskRequest.newBuilder()
-    //          .setProject(project)
-    //          .setZone(disksLocation)
-    //          .setBulkInsertDiskResourceResource(
-    //                  BulkInsertDiskResource.newBuilder()
-    //                          .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
-    //                          .build())
-    //          .build();
+    //    .setProject(project)
+    //    .setZone(disksLocation)
+    //    .setBulkInsertDiskResourceResource(
+    //        BulkInsertDiskResource.newBuilder()
+    //            .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
+    //            .build())
+    //    .build();
     //Operation response = disksClient.bulkInsertAsync(request).get(3, TimeUnit.MINUTES);
 
-
     try (RegionDisksClient regionDisksClient = RegionDisksClient.create()) {
       BulkInsertRegionDiskRequest request = BulkInsertRegionDiskRequest.newBuilder()
-              .setProject(project)
-              .setRegion(disksLocation)
-              .setBulkInsertDiskResourceResource(
-                      BulkInsertDiskResource.newBuilder()
-                              .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
-                              .build())
-              .build();
+          .setProject(project)
+          .setRegion(disksLocation)
+          .setBulkInsertDiskResourceResource(
+              BulkInsertDiskResource.newBuilder()
+                  .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
+                  .build())
+          .build();
 
       Operation response = regionDisksClient.bulkInsertAsync(request).get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println(String.format("Error cloning disks: %s", response.getError()));
+        System.out.printf("Error cloning disks: %s%n", response.getError());
         return;
       }
       System.out.printf("Disks cloned from consistency group: %s\n", consistencyGroupName);

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

@@ -37,6 +37,7 @@
 import compute.deleteprotection.SetDeleteProtection;
 import compute.disks.DeleteDisk;
 import compute.disks.DeleteSnapshot;
+import compute.disks.RegionalDelete;
 import compute.reservation.DeleteReservation;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -266,6 +267,22 @@ public static void deleteStoragePool(String project, String zone, String storage
     }
   }
 
+  // Delete disks which starts with the given prefixToDelete and
+  // has creation timestamp >24 hours.
+  public static void cleanUpExistingRegionalDisks(
+          String prefixToDelete, String projectId, String region)
+          throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    try (RegionDisksClient disksClient = RegionDisksClient.create()) {
+      for (Disk disk : disksClient.list(projectId, region).iterateAll()) {
+        if (disk.getName().contains(prefixToDelete)
+                && disk.getRegion().equals(region)
+                && isCreatedBeforeThresholdTime(disk.getCreationTimestamp())) {
+          RegionalDelete.deleteRegionalDisk(projectId, region, disk.getName());
+        }
+      }
+    }
+  }
+
   public static boolean containPrefixToDeleteAndZone(
       Object resource, String prefixToDelete, String zone) {
     boolean containPrefixAndZone = false;

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

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import com.google.cloud.compute.v1.Disk;
+import compute.Util;
 import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
 import compute.disks.consistencygroup.CloneDisksFromConsistencyGroup;
 import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
@@ -61,6 +62,9 @@ public class ConsistencyGroupIT {
   private static final String SECONDARY_REGIONAL_DISK =
           "gcloud-test-disk-secondary-regional-" + randomUUID;
   private static final long DISK_SIZE = 10L;
+  private static final List<String> replicaZones = Arrays.asList(
+          String.format("projects/%s/zones/%s-a", PROJECT_ID, REGION),
+          String.format("projects/%s/zones/%s-b", PROJECT_ID, REGION));
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -71,9 +75,6 @@ public static void requireEnvVar(String envVarName) {
   @BeforeAll
   public static void setUp() throws Exception {
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    List<String> replicaZones = Arrays.asList(
-            String.format("projects/%s/zones/%s-a", PROJECT_ID, REGION),
-            String.format("projects/%s/zones/%s-b", PROJECT_ID, REGION));
 
     RegionalCreateFromSource.createRegionalDisk(PROJECT_ID, REGION, replicaZones,
             DISK_NAME, DISK_TYPE, 10, Optional.empty(), Optional.empty());
@@ -88,12 +89,15 @@ public static void cleanUp()
 
     RegionalDelete.deleteRegionalDisk(PROJECT_ID, REGION, DISK_NAME);
     RegionalDelete.deleteRegionalDisk(PROJECT_ID, REGION_SECONDARY, SECONDARY_REGIONAL_DISK);
-    // Delete created consistency group
     DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup(
         PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
     DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup(
             PROJECT_ID, REGION_SECONDARY, CONSISTENCY_GROUP_SECONDARY);
 
+    // Clean up existing stale resources.
+    Util.cleanUpExistingRegionalDisks("test-disk-for-consistency-", PROJECT_ID, REGION);
+    Util.cleanUpExistingRegionalDisks(
+            "gcloud-test-disk-secondary-regional-", PROJECT_ID, REGION_SECONDARY);
   }
 
   @Test
@@ -103,7 +107,6 @@ public void testCreateDiskConsistencyGroupResourcePolicy()
     String consistencyGroupLink = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
             PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
 
-    // Verify that the consistency group was created
     assertNotNull(consistencyGroupLink);
     assertThat(consistencyGroupLink.contains(CONSISTENCY_GROUP_NAME));
   }
@@ -115,7 +118,6 @@ public void testAddRegionalDiskToConsistencyGroup()
     Disk disk = AddDiskToConsistencyGroup.addDiskToConsistencyGroup(
             PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME, REGION);
 
-    // Verify that the disk was added to the consistency group
     assertNotNull(disk);
     assertThat(disk.getResourcePoliciesList().get(0).contains(CONSISTENCY_GROUP_NAME));
   }