Skip to content

Commit fb82104

Browse files
Fixed code
1 parent 8916def commit fb82104

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package compute.disks.consistencygroup;
1818

1919
// [START compute_consistency_group_create]
20+
import com.google.cloud.compute.v1.InsertResourcePolicyRequest;
2021
import com.google.cloud.compute.v1.Operation;
2122
import com.google.cloud.compute.v1.ResourcePoliciesClient;
2223
import com.google.cloud.compute.v1.ResourcePolicy;
@@ -53,8 +54,14 @@ public static Operation.Status createDiskConsistencyGroup(
5354
ResourcePolicy.newBuilder().getDiskConsistencyGroupPolicy())
5455
.build();
5556

57+
InsertResourcePolicyRequest request = InsertResourcePolicyRequest.newBuilder()
58+
.setProject(project)
59+
.setRegion(region)
60+
.setResourcePolicyResource(resourcePolicy)
61+
.build();
62+
5663
Operation response =
57-
regionResourcePoliciesClient.insertAsync(project, region, resourcePolicy).get();
64+
regionResourcePoliciesClient.insertAsync(request).get();
5865

5966
if (response.hasError()) {
6067
throw new Error("Error creating consistency group! " + response.getError());

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
import com.google.api.gax.longrunning.OperationFuture;
2828
import com.google.cloud.compute.v1.AddResourcePoliciesRegionDiskRequest;
29+
import com.google.cloud.compute.v1.InsertResourcePolicyRequest;
2930
import com.google.cloud.compute.v1.Operation;
3031
import com.google.cloud.compute.v1.RegionDisksClient;
3132
import com.google.cloud.compute.v1.RemoveResourcePoliciesRegionDiskRequest;
3233
import com.google.cloud.compute.v1.ResourcePoliciesClient;
33-
import com.google.cloud.compute.v1.ResourcePolicy;
3434
import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
3535
import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
3636
import compute.disks.consistencygroup.DeleteDiskConsistencyGroup;
@@ -51,30 +51,22 @@ public class ConsistencyGroupIT {
5151

5252
@Test
5353
public void testCreateDiskConsistencyGroupResourcePolicy() throws Exception {
54-
ResourcePolicy resourcePolicy =
55-
ResourcePolicy.newBuilder()
56-
.setName(CONSISTENCY_GROUP_NAME)
57-
.setRegion(REGION)
58-
.setDiskConsistencyGroupPolicy(
59-
ResourcePolicy.newBuilder().getDiskConsistencyGroupPolicy())
60-
.build();
6154
try (MockedStatic<ResourcePoliciesClient> mockedResourcePoliciesClient =
6255
mockStatic(ResourcePoliciesClient.class)) {
6356
Operation operation = mock(Operation.class);
6457
ResourcePoliciesClient mockClient = mock(ResourcePoliciesClient.class);
6558
OperationFuture mockFuture = mock(OperationFuture.class);
6659

6760
mockedResourcePoliciesClient.when(ResourcePoliciesClient::create).thenReturn(mockClient);
68-
when(mockClient.insertAsync(PROJECT_ID, REGION, resourcePolicy))
61+
when(mockClient.insertAsync(any(InsertResourcePolicyRequest.class)))
6962
.thenReturn(mockFuture);
7063
when(mockFuture.get()).thenReturn(operation);
7164
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
7265

7366
Operation.Status status = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
7467
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
7568

76-
verify(mockClient, times(1))
77-
.insertAsync(PROJECT_ID, REGION, resourcePolicy);
69+
verify(mockClient, times(1)).insertAsync(any(InsertResourcePolicyRequest.class));
7870
verify(mockFuture, times(1)).get();
7971
assertEquals(Operation.Status.DONE, status);
8072
}

0 commit comments

Comments
 (0)