fix: update compute sample to account for region-specific operation resources (GoogleCloudPlatform#5505)

itodotimothy6 · web-flow · commit 11eedd17f6ea · 2021-06-29T10:20:36.000-07:00
* add region-specific operations check

* mvn lint change
diff --git a/compute/cmdline/src/main/java/ComputeEngineSample.java b/compute/cmdline/src/main/java/ComputeEngineSample.java
@@ -235,6 +235,14 @@ private static Operation deleteInstance(Compute compute, String instanceName) th
     return delete.execute();
   }
 
+  public static String getLastWordFromUrl(String url) {
+    if (url != null) {
+      String[] bits = url.split("/");
+      url = bits[bits.length - 1];
+    }
+    return url;
+  }
+
   // [START wait_until_complete]
   /**
    * Wait until {@code operation} is completed.
@@ -250,11 +258,8 @@ public static Operation.Error blockUntilComplete(
       Compute compute, Operation operation, long timeout) throws Exception {
     long start = System.currentTimeMillis();
     final long pollInterval = 5 * 1000;
-    String zone = operation.getZone(); // null for global/regional operations
-    if (zone != null) {
-      String[] bits = zone.split("/");
-      zone = bits[bits.length - 1];
-    }
+    String zone = getLastWordFromUrl(operation.getZone()); // null for global/regional operations
+    String region = getLastWordFromUrl(operation.getRegion());
     String status = operation.getStatus();
     String opId = operation.getName();
     while (operation != null && !status.equals("DONE")) {
@@ -267,6 +272,9 @@ public static Operation.Error blockUntilComplete(
       if (zone != null) {
         Compute.ZoneOperations.Get get = compute.zoneOperations().get(PROJECT_ID, zone, opId);
         operation = get.execute();
+      } else if (region != null) {
+        Compute.RegionOperations.Get get = compute.regionOperations().get(PROJECT_ID, region, opId);
+        operation = get.execute();
       } else {
         Compute.GlobalOperations.Get get = compute.globalOperations().get(PROJECT_ID, opId);
         operation = get.execute();
