ci: address comments

grant · grant · commit 46e0ab7cd2f6 · 2021-06-08T13:47:56.000-05:00
Signed-off-by: Grant Timmerman &lt;timmerman+devrel@google.com&gt;
diff --git a/workflows/cloud-client/pom.xml b/workflows/cloud-client/pom.xml
@@ -1,5 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
-  Copyright 2018, Google Inc.
+  Copyright 2021, 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
@@ -10,10 +11,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.example.texttospeech</groupId>
-  <artifactId>tts-samples</artifactId>
+  <groupId>com.example.workflows</groupId>
+  <artifactId>workflows-quickstart</artifactId>
   <packaging>jar</packaging>
 
   <!--
@@ -40,7 +41,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>20.4.0</version>
+        <version>20.6.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/workflows/cloud-client/src/main/java/com/example/workflows/WorkflowsQuickstart.java b/workflows/cloud-client/src/main/java/com/example/workflows/WorkflowsQuickstart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,13 @@
 
 // Imports the Google Cloud client library
 
+import com.google.cloud.workflows.executions.v1.CreateExecutionRequest;
 import com.google.cloud.workflows.executions.v1.Execution;
 import com.google.cloud.workflows.executions.v1.ExecutionsClient;
 import com.google.cloud.workflows.executions.v1.WorkflowName;
 
+import java.io.IOException;
+
 /**
  * Cloud Workflows API sample. Executes a workflow and waits for results.
  * Example usage:
@@ -35,11 +38,13 @@ public class WorkflowsQuickstart {
   private static String LOCATION = System.getenv("LOCATION");
   private static String WORKFLOW = System.getenv("WORKFLOW");
 
-  public static String workflowsQuickstart(String projectId, String location, String workflow) {
+  public static String workflowsQuickstart(String projectId, String location, String workflow) throws InterruptedException, IOException {
     // Execute workflow
     try (ExecutionsClient workflowExecutionsClient = ExecutionsClient.create()) {
       WorkflowName parent = WorkflowName.of(projectId, location, workflow);
       Execution initialExecution = Execution.newBuilder().build();
+
+      // Creates the execution object.
       Execution createExecutionRes = workflowExecutionsClient
           .createExecution(parent, initialExecution);
 
@@ -49,11 +54,17 @@ public static String workflowsQuickstart(String projectId, String location, Stri
       // Wait for execution to finish, then print results.
       boolean executionFinished = false;
       long backoffDelay = 1_000; // Start wait with delay of 1,000 ms
+      final long BACKOFF_TIMEOUT = 10 * 60_000; // Time out at 10 minutes
       System.out.println("Poll for results...");
       while (!executionFinished) {
         Execution execution = workflowExecutionsClient.getExecution(executionName);
         executionFinished = execution.getState() != Execution.State.ACTIVE;
 
+        // We've passed the max
+        if (backoffDelay > BACKOFF_TIMEOUT) {
+          return "";
+        }
+
         // If we haven't seen the results yet, wait.
         if (!executionFinished) {
           System.out.println("- Waiting for results");
@@ -65,18 +76,14 @@ public static String workflowsQuickstart(String projectId, String location, Stri
           return execution.getResult();
         }
       }
-      // This return is never reached.
-      return "";
-    } catch (Exception e) {
-      System.out.printf("Error executing workflow: %s%n", e);
-      return "";
     }
+    return "";
   }
 
   /**
    * Demonstrates using the Workflows API.
    */
-  public static void main(String... args) {
+  public static void main(String... args) throws IOException, InterruptedException {
     if (GOOGLE_CLOUD_PROJECT.isEmpty()) {
       System.out.println("GOOGLE_CLOUD_PROJECT is empty");
     }
diff --git a/workflows/cloud-client/src/test/java/com/example/workflows/WorkflowsQuickstartTest.java b/workflows/cloud-client/src/test/java/com/example/workflows/WorkflowsQuickstartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,14 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.workflows.v1.OperationMetadata;
 import com.google.cloud.workflows.v1.Workflow;
 import com.google.cloud.workflows.v1.WorkflowName;
 import com.google.cloud.workflows.v1.WorkflowsClient;
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -48,9 +52,7 @@ public static void beforeClass() {
   }
 
   @Test
-  public void testQuickstart() throws IOException, InterruptedException {
-    System.out.println("testing!!");
-
+  public void testQuickstart() throws IOException, InterruptedException, ExecutionException {
     // Deploy the workflow
     deployWorkflow(projectId, LOCATION_ID, WORKFLOW_ID);
 
@@ -63,17 +65,16 @@ public void testQuickstart() throws IOException, InterruptedException {
   }
 
   private boolean deployWorkflow(String projectId, String location, String workflowId)
-          throws IOException, InterruptedException {
+          throws IOException, InterruptedException, ExecutionException {
     // Create a new workflow if it doesn't exist
-    if (!workflowExists(projectId, location, workflowId)) {
+//    if (!workflowExists(projectId, location, workflowId)) {
       System.out.println("START DEPLOY");
       WorkflowsClient workflowsClient = WorkflowsClient.create();
       // Deploy workflow
       Workflow workflow = Workflow.newBuilder()
           .setName(workflowId)
           .setSourceContents(WORKFLOW_SOURCE)
           .build();
-      workflowsClient.createWorkflowAsync(location, workflow, workflowId);
 
       // Wait until workflow is active
       Workflow deployedWorkflow = null;
@@ -93,8 +94,6 @@ private boolean deployWorkflow(String projectId, String location, String workflo
 
       // Return true if the workflow is now active
       return deployedWorkflow.getState() != Workflow.State.ACTIVE;
-    }
-    return false;
   }
 
   /**
