fix: update Cloud Workflows sample (GoogleCloudPlatform#9836)

averikitsch · web-flow · commit e419fcfc0b21 · 2023-04-28T16:37:50.000-07:00
* fix: update Cloud Workflows sample

* Update state

* fix lint

* update workflow
diff --git a/workflows/cloud-client/main.py b/workflows/cloud-client/main.py
@@ -22,9 +22,9 @@ def execute_workflow(
     # [START workflows_api_quickstart]
     import time
 
-    from google.cloud import workflows_v1beta
-    from google.cloud.workflows import executions_v1beta
-    from google.cloud.workflows.executions_v1beta.types import executions
+    from google.cloud import workflows_v1
+    from google.cloud.workflows import executions_v1
+    from google.cloud.workflows.executions_v1.types import executions
 
     # TODO(developer): Uncomment these lines and replace with your values.
     # project = 'my-project-id'
@@ -35,8 +35,8 @@ def execute_workflow(
         raise Exception('GOOGLE_CLOUD_PROJECT env var is required.')
 
     # Set up API clients.
-    execution_client = executions_v1beta.ExecutionsClient()
-    workflows_client = workflows_v1beta.WorkflowsClient()
+    execution_client = executions_v1.ExecutionsClient()
+    workflows_client = workflows_v1.WorkflowsClient()
 
     # Construct the fully qualified location path.
     parent = workflows_client.workflow_path(project, location, workflow)
@@ -50,18 +50,20 @@ def execute_workflow(
     backoff_delay = 1  # Start wait with delay of 1 second
     print('Poll every second for result...')
     while (not execution_finished):
-        execution = execution_client.get_execution(request={"name": response.name})
+        execution = execution_client.get_execution(
+            request={"name": response.name})
         execution_finished = execution.state != executions.Execution.State.ACTIVE
 
         # If we haven't seen the result yet, wait a second.
         if not execution_finished:
             print('- Waiting for results...')
             time.sleep(backoff_delay)
-            backoff_delay *= 2  # Double the delay to provide exponential backoff.
+            # Double the delay to provide exponential backoff.
+            backoff_delay *= 2
         else:
             print(f'Execution finished with state: {execution.state.name}')
-            print(execution.result)
-            return execution.result
+            print(f'Execution results: {execution.result}')
+            return execution
     # [END workflows_api_quickstart]
 
 
diff --git a/workflows/cloud-client/main_test.py b/workflows/cloud-client/main_test.py
@@ -14,7 +14,8 @@
 
 import os
 
-from google.cloud import workflows_v1beta
+from google.cloud import workflows_v1
+from google.cloud.workflows.executions_v1.types import executions
 
 import main
 
@@ -29,7 +30,7 @@ def test_workflow_execution():
     if not workflow_exists():
         workflow_file = open("myFirstWorkflow.workflows.yaml", "r").read()
 
-        workflows_client = workflows_v1beta.WorkflowsClient()
+        workflows_client = workflows_v1.WorkflowsClient()
         workflows_client.create_workflow(request={
             # Manually construct the location
             # https://github.com/googleapis/python-workflows/issues/21
@@ -42,15 +43,17 @@ def test_workflow_execution():
         })
 
     result = main.execute_workflow(PROJECT)
-    assert len(result) > 0
+    assert result.state == executions.Execution.State.SUCCEEDED
+    assert len(result.result) > 0
 
 
 def workflow_exists():
     """Returns True if the workflow exists in this project
     """
     try:
-        workflows_client = workflows_v1beta.WorkflowsClient()
-        workflow_name = workflows_client.workflow_path(PROJECT, LOCATION, WORKFLOW_ID)
+        workflows_client = workflows_v1.WorkflowsClient()
+        workflow_name = workflows_client.workflow_path(
+            PROJECT, LOCATION, WORKFLOW_ID)
         workflows_client.get_workflow(request={"name": workflow_name})
         return True
     except Exception as e:
diff --git a/workflows/cloud-client/myFirstWorkflow.workflows.yaml b/workflows/cloud-client/myFirstWorkflow.workflows.yaml
@@ -15,15 +15,15 @@
 - getCurrentTime:
     call: http.get
     args:
-      url: https://us-central1-workflowsample.cloudfunctions.net/datetime
+      url: https://timeapi.io/api/Time/current/zone?timeZone=Europe/Amsterdam
     result: currentTime
 - readWikipedia:
     call: http.get
     args:
       url: https://en.wikipedia.org/w/api.php
       query:
         action: opensearch
-        search: ${currentTime.body.dayOfTheWeek}
+        search: ${currentTime.body.dayOfWeek}
     result: wikiResult
 - returnResult:
     return: ${wikiResult.body[1]}
