Fixed code following recommendations

Author: TetyanaYahodska

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

@@ -17,22 +17,17 @@
 package compute.reservation;
 
 // [START compute_consume_any_matching_reservation]
-
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.ANY_RESERVATION;
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.compute.v1.AllocationSpecificSKUAllocationReservedInstanceProperties;
-import com.google.cloud.compute.v1.AllocationSpecificSKUReservation;
 import com.google.cloud.compute.v1.AttachedDisk;
 import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
 import com.google.cloud.compute.v1.InsertInstanceRequest;
 import com.google.cloud.compute.v1.Instance;
 import com.google.cloud.compute.v1.InstancesClient;
 import com.google.cloud.compute.v1.NetworkInterface;
 import com.google.cloud.compute.v1.Operation;
-import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationAffinity;
-import com.google.cloud.compute.v1.ReservationsClient;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -45,85 +40,38 @@ public static void main(String[] args)
     // TODO(developer): Replace these variables before running the sample.
     // Project ID or project number of the Cloud project you want to use.
     String projectId = "YOUR_PROJECT_ID";
-    // Name of the zone where the reservation is located.
+    // Zone where the VM instance will be created.
     String zone = "us-central1-a";
-    // Name of the reservation you want to query.
-    String reservationName = "YOUR_RESERVATION_NAME";
     // Name of the VM instance you want to query.
     String instanceName = "YOUR_INSTANCE_NAME";
-    // Number of the instances.
-    int numberOfVms = 2;
-
-    createReservation(projectId, reservationName, numberOfVms, zone);
-    createInstance(projectId, zone, instanceName);
-  }
-
-  // Creates reservation with properties that match the VM properties.
-  public static void createReservation(String projectId, String reservationName,
-           int numberOfVms, String zone)
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    // Minimum CPU platform of the instances.
-    String minCpuPlatform = "Intel Skylake";
-    // Machine type of the instances.
-    String machineType = "n1-standard-4";
-
-    // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests.
-    try (ReservationsClient reservationsClient = ReservationsClient.create()) {
-
-      Reservation reservation =
-          Reservation.newBuilder()
-              .setName(reservationName)
-              .setZone(zone)
-              .setSpecificReservation(
-                  AllocationSpecificSKUReservation.newBuilder()
-                      .setCount(numberOfVms)
-                      .setInstanceProperties(
-                          AllocationSpecificSKUAllocationReservedInstanceProperties.newBuilder()
-                              .setMachineType(machineType)
-                              .setMinCpuPlatform(minCpuPlatform)
-                              .build())
-                      .build())
-              .build();
-
-      // Wait for the create reservation operation to complete.
-      Operation response =
-          reservationsClient.insertAsync(projectId, zone, reservation)
-              .get(3, TimeUnit.MINUTES);
-
-      if (response.hasError()) {
-        System.out.println("Reservation creation failed!" + response);
-        return;
-      }
-      System.out.println("Reservation created. Operation Status: " + response.getStatus());
-    }
-  }
-
-  // Create a new instance with the provided "instanceName" value in the specified project and zone.
-  // In this consumption model, existing and new VMs automatically consume a reservation
-  // if their properties match the VM properties specified in the reservation.
-  public static void createInstance(String projectId, String zone, String instanceName)
-      throws IOException, InterruptedException, ExecutionException, TimeoutException {
-    // Below are sample values that can be replaced.
     // machineType: machine type of the VM being created.
-    // *   This value uses the format zones/{zone}/machineTypes/{type_name}.
     // *   For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
+    String machineTypeName = "n1-standard-4";
     // sourceImage: path to the operating system image to mount.
     // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
+    String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
     // diskSizeGb: storage size of the boot disk to attach to the instance.
-    // networkName: network interface to associate with the instance.
-    // Minimum CPU platform of the instances.
-    String machineType = String.format("zones/%s/machineTypes/n1-standard-4", zone);
-    String sourceImage = String
-        .format("projects/debian-cloud/global/images/family/%s", "debian-11");
     long diskSizeGb = 10L;
+    // networkName: network interface to associate with the instance.
     String networkName = "default";
+    // Minimum CPU platform of the instances.
     String minCpuPlatform = "Intel Skylake";
 
+    createInstance(projectId, zone, instanceName, machineTypeName, sourceImage,
+        diskSizeGb, networkName, minCpuPlatform);
+  }
+
+  // Create a virtual machine targeted with the reserveAffinity field.
+  // In this consumption model, existing and new VMs automatically consume a reservation
+  // if their properties match the VM properties specified in the reservation.
+  public static Operation createInstance(String projectId, String zone,
+      String instanceName, String machineTypeName, String sourceImage,
+      long diskSizeGb, String networkName, String minCpuPlatform)
+      throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    String machineType = String.format("zones/%s/machineTypes/%s", zone, machineTypeName);
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
     try (InstancesClient instancesClient = InstancesClient.create()) {
-      // Instance creation requires at least one persistent disk and one network interface.
       AttachedDisk disk =
           AttachedDisk.newBuilder()
               .setBoot(true)
@@ -137,18 +85,15 @@ public static void createInstance(String projectId, String zone, String instance
                       .build())
               .build();
 
-      // Use the network interface provided in the networkName argument.
       NetworkInterface networkInterface = NetworkInterface.newBuilder()
           .setName(networkName)
           .build();
 
-      // Set Reservation Affinity
       ReservationAffinity reservationAffinity =
           ReservationAffinity.newBuilder()
               .setConsumeReservationType(ANY_RESERVATION.toString())
               .build();
 
-      // Bind `instanceName`, `machineType`, `disk`, and `networkInterface` to an instance.
       Instance instanceResource =
           Instance.newBuilder()
               .setName(instanceName)
@@ -159,9 +104,6 @@ public static void createInstance(String projectId, String zone, String instance
               .setReservationAffinity(reservationAffinity)
               .build();
 
-      System.out.printf("Creating instance: %s at %s %n", instanceName, zone);
-
-      // Insert the instance in the specified project and zone.
       InsertInstanceRequest insertInstanceRequest = InsertInstanceRequest.newBuilder()
           .setProject(projectId)
           .setZone(zone)
@@ -171,13 +113,12 @@ public static void createInstance(String projectId, String zone, String instance
       OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
           insertInstanceRequest);
 
-      // Wait for the operation to complete.
       Operation response = operation.get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println("Instance creation failed ! ! " + response);
+        return null;
       }
-      System.out.println("Operation Status: " + response.getStatus());
+      return response;
     }
   }
 }

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

@@ -17,22 +17,17 @@
 package compute.reservation;
 
 // [START compute_consume_single_project_reservation]
-
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.SPECIFIC_RESERVATION;
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.compute.v1.AllocationSpecificSKUAllocationReservedInstanceProperties;
-import com.google.cloud.compute.v1.AllocationSpecificSKUReservation;
 import com.google.cloud.compute.v1.AttachedDisk;
 import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
 import com.google.cloud.compute.v1.InsertInstanceRequest;
 import com.google.cloud.compute.v1.Instance;
 import com.google.cloud.compute.v1.InstancesClient;
 import com.google.cloud.compute.v1.NetworkInterface;
 import com.google.cloud.compute.v1.Operation;
-import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationAffinity;
-import com.google.cloud.compute.v1.ReservationsClient;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -50,78 +45,33 @@ public static void main(String[] args)
     String reservationName = "YOUR_RESERVATION_NAME";
     // Name of the VM instance you want to query.
     String instanceName = "YOUR_INSTANCE_NAME";
-    // Number of the instances.
-    int numberOfVms = 2;
-
-    createReservation(projectId, reservationName, numberOfVms, zone);
-    createInstance(projectId, zone, instanceName, reservationName);
-  }
-
-  // Creates reservation with the given parameters.
-  public static void createReservation(
-      String projectId, String reservationName, int numberOfVms, String zone)
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    // Machine type of the instances.
-    String machineType = "n1-standard-4";
-    // Minimum CPU platform of the instances.
-    String minCpuPlatform = "Intel Skylake";
-    boolean specificReservationRequired = true;
-
-    // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests.
-    try (ReservationsClient reservationsClient = ReservationsClient.create()) {
-
-      Reservation reservation =
-          Reservation.newBuilder()
-              .setName(reservationName)
-              .setZone(zone)
-              .setSpecificReservationRequired(specificReservationRequired)
-              .setSpecificReservation(
-                  AllocationSpecificSKUReservation.newBuilder()
-                      .setCount(numberOfVms)
-                      .setInstanceProperties(
-                          AllocationSpecificSKUAllocationReservedInstanceProperties.newBuilder()
-                              .setMachineType(machineType)
-                              .setMinCpuPlatform(minCpuPlatform)
-                              .build())
-                      .build())
-              .build();
-
-      // Wait for the create reservation operation to complete.
-      Operation response =
-          reservationsClient.insertAsync(projectId, zone, reservation).get(3, TimeUnit.MINUTES);
-
-      if (response.hasError()) {
-        System.out.println("Reservation creation failed!" + response);
-        return;
-      }
-      System.out.println("Reservation created. Operation Status: " + response.getStatus());
-    }
-  }
-
-  // Create a new instance with the provided "instanceName" value in the specified project and zone.
-  // Ensure that the VM's properties match the reservation's VM properties.
-  public static void createInstance(
-      String projectId, String zone, String instanceName, String reservationName)
-      throws IOException, InterruptedException, ExecutionException, TimeoutException {
-    // Below are sample values that can be replaced.
+    // machineType: machine type of the VM being created.
+    // *   For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
+    String machineTypeName = "n1-standard-4";
     // sourceImage: path to the operating system image to mount.
     // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
+    String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
     // diskSizeGb: storage size of the boot disk to attach to the instance.
-    // networkName: network interface to associate with the instance.
-    // Machine type of the instances.
-    // Minimum CPU platform of the instances.
-    String sourceImage = String
-        .format("projects/debian-cloud/global/images/family/%s", "debian-11");
     long diskSizeGb = 10L;
+    // networkName: network interface to associate with the instance.
     String networkName = "default";
-    String machineType = String.format("zones/%s/machineTypes/n1-standard-4", zone);
+    // Minimum CPU platform of the instances.
     String minCpuPlatform = "Intel Skylake";
 
+    createInstance(projectId, zone, instanceName, reservationName, machineTypeName, sourceImage,
+        diskSizeGb, networkName, minCpuPlatform);
+  }
+
+  // Create a virtual machine targeted with the reserveAffinity field.
+  // Ensure that the VM's properties match the reservation's VM properties.
+  public static Operation createInstance(String projectId, String zone, String instanceName,
+      String reservationName, String machineTypeName, String sourceImage, long diskSizeGb,
+      String networkName, String minCpuPlatform)
+      throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    String machineType = String.format("zones/%s/machineTypes/%s", zone, machineTypeName);
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
     try (InstancesClient instancesClient = InstancesClient.create()) {
-      // Instance creation requires at least one persistent disk and one network interface.
       AttachedDisk disk =
           AttachedDisk.newBuilder()
               .setBoot(true)
@@ -135,12 +85,10 @@ public static void createInstance(
                       .build())
               .build();
 
-      // Use the network interface provided in the networkName argument.
       NetworkInterface networkInterface = NetworkInterface.newBuilder()
           .setName(networkName)
           .build();
 
-      // Set Reservation Affinity
       ReservationAffinity reservationAffinity =
           ReservationAffinity.newBuilder()
               .setConsumeReservationType(SPECIFIC_RESERVATION.toString())
@@ -149,7 +97,6 @@ public static void createInstance(
               .addValues(reservationName)
               .build();
 
-      // Bind `instanceName`, `machineType`, `disk`, and `networkInterface` to an instance.
       Instance instanceResource =
           Instance.newBuilder()
               .setName(instanceName)
@@ -160,9 +107,6 @@ public static void createInstance(
               .setReservationAffinity(reservationAffinity)
               .build();
 
-      System.out.printf("Creating instance: %s at %s %n", instanceName, zone);
-
-      // Insert the instance in the specified project and zone.
       InsertInstanceRequest insertInstanceRequest = InsertInstanceRequest.newBuilder()
           .setProject(projectId)
           .setZone(zone)
@@ -171,14 +115,12 @@ public static void createInstance(
 
       OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
           insertInstanceRequest);
-
-      // Wait for the operation to complete.
       Operation response = operation.get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println("Instance creation failed ! ! " + response);
+        return null;
       }
-      System.out.println("Operation Status: " + response.getStatus());
+      return response;
     }
   }
 }