Implemented compute_consistency_group_remove_disk sample, created test

Author: TetyanaYahodska

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

@@ -49,7 +49,7 @@ public static void main(String[] args)
         project, location, diskName, consistencyGroupName, consistencyGroupLocation);
   }
 
-  // Adds a disk to a Consistent Group.
+  // Adds a disk to a Consistency Group.
   public static Disk addDiskToConsistencyGroup(
       String project, String location, String diskName,
       String consistencyGroupName, String consistencyGroupLocation)

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

@@ -0,0 +1,93 @@
+/*
+ * 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 compute.disks.consistencygroup;
+
+// [START compute_consistency_group_remove_disk]
+import com.google.cloud.compute.v1.Disk;
+import com.google.cloud.compute.v1.Operation;
+import com.google.cloud.compute.v1.RegionDisksClient;
+import com.google.cloud.compute.v1.RegionDisksRemoveResourcePoliciesRequest;
+import com.google.cloud.compute.v1.RemoveResourcePoliciesRegionDiskRequest;
+// If your disk has zonal location uncomment these lines
+//import com.google.cloud.compute.v1.DisksClient;
+//import com.google.cloud.compute.v1.DisksRemoveResourcePoliciesRequest;
+//import com.google.cloud.compute.v1.RemoveResourcePoliciesDiskRequest;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+
+public class RemoveDiskFromConsistencyGroup {
+
+  public static void main(String[] args)
+      throws IOException, ExecutionException, InterruptedException {
+    // TODO(developer): Replace these variables before running the sample.
+    // The project that contains the disk.
+    String project = "YOUR_PROJECT_ID";
+    // The zone or region of the disk.
+    String location = "us-central1";
+    // The name of the disk.
+    String diskName = "DISK_NAME";
+    // The name of the consistency group.
+    String consistencyGroupName = "CONSISTENCY_GROUP";
+    // The region of the consistency group.
+    String consistencyGroupLocation = "us-central1";
+    removeDiskFromConsistencyGroup(
+        project, location, diskName, consistencyGroupName, consistencyGroupLocation);
+  }
+
+  // Removes a disk from a Consistency Group.
+  public static Disk removeDiskFromConsistencyGroup(
+      String project, String location, String diskName,
+      String consistencyGroupName, String consistencyGroupLocation)
+      throws IOException, ExecutionException, InterruptedException {
+    String consistencyGroupUrl = String.format(
+        "https://www.googleapis.com/compute/v1/projects/%s/regions/%s/resourcePolicies/%s",
+        project, consistencyGroupLocation, consistencyGroupName);
+    // If your disk has zonal location uncomment these lines
+    //      try (DisksClient disksClient = DisksClient.create()) {
+    //        RemoveResourcePoliciesDiskRequest request =
+    //            RemoveResourcePoliciesDiskRequest.newBuilder()
+    //                .setDisk(diskName)
+    //                .setDisksRemoveResourcePoliciesRequestResource(
+    //                    DisksRemoveResourcePoliciesRequest.newBuilder()
+    //                        .addAllResourcePolicies(Arrays.asList(consistencyGroupUrl))
+    //                        .build())
+    //                .setProject(project)
+    //                .setZone(location)
+    //                .build();
+
+    try (RegionDisksClient disksClient = RegionDisksClient.create()) {
+      RemoveResourcePoliciesRegionDiskRequest disksRequest =
+          RemoveResourcePoliciesRegionDiskRequest.newBuilder()
+              .setDisk(diskName)
+              .setRegion(location)
+              .setProject(project)
+              .setRegionDisksRemoveResourcePoliciesRequestResource(
+                  RegionDisksRemoveResourcePoliciesRequest.newBuilder()
+                      .addAllResourcePolicies(Arrays.asList(consistencyGroupUrl))
+                      .build())
+              .build();
+
+      Operation response = disksClient.removeResourcePoliciesAsync(disksRequest).get();
+      if (response.hasError()) {
+        return null;
+      }
+      return disksClient.get(project, location, diskName);
+    }
+  }
+}
+// [END compute_consistency_group_remove_disk]

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

@@ -24,6 +24,7 @@
 import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
 import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
 import compute.disks.consistencygroup.DeleteDiskConsistencyGroup;
+import compute.disks.consistencygroup.RemoveDiskFromConsistencyGroup;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -102,4 +103,16 @@ public void testAddRegionalDiskToConsistencyGroup()
     assertNotNull(disk);
     assertThat(disk.getResourcePoliciesList().get(0).contains(CONSISTENCY_GROUP_NAME));
   }
+
+  @Test
+  @Order(3)
+  public void testRemoveDiskFromConsistencyGroup()
+      throws IOException, ExecutionException, InterruptedException {
+    Disk disk = RemoveDiskFromConsistencyGroup.removeDiskFromConsistencyGroup(
+        PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME, REGION);
+
+    // Verify that the disk was added to the consistency group
+    assertNotNull(disk);
+    assertThat(disk.getResourcePoliciesList()).isEmpty();
+  }
 }