Update dependency google-cloud-tasks to v2 (GoogleCloudPlatform#4622)

renovate-bot · busunkim96 · web-flow · commit 926dd53973b6 · 2020-09-03T09:43:52.000-07:00
* Update dependency google-cloud-tasks to v2

* fix: update appengine tasks samples for google-cloud-tasks v2

* remove location path

* fix datatetime

* fix lint

Co-authored-by: Bu Sun Kim &lt;busunkim@google.com&gt;
diff --git a/appengine/flexible/tasks/create_app_engine_queue_task.py b/appengine/flexible/tasks/create_app_engine_queue_task.py
@@ -23,7 +23,6 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
     """Create a task for a given queue with an arbitrary payload."""
 
     from google.cloud import tasks_v2
-    from google.protobuf import timestamp_pb2
 
     # Create a client.
     client = tasks_v2.CloudTasksClient()
@@ -53,17 +52,13 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
 
     if in_seconds is not None:
         # Convert "seconds from now" into an rfc3339 datetime string.
-        d = datetime.datetime.utcnow() + datetime.timedelta(seconds=in_seconds)
-
-        # Create Timestamp protobuf.
-        timestamp = timestamp_pb2.Timestamp()
-        timestamp.FromDatetime(d)
+        timestamp = datetime.datetime.utcnow() + datetime.timedelta(seconds=in_seconds)
 
         # Add the timestamp to the tasks.
         task['schedule_time'] = timestamp
 
     # Use the client to build and send the task.
-    response = client.create_task(parent, task)
+    response = client.create_task(parent=parent, task=task)
 
     print('Created task {}'.format(response.name))
     return response
diff --git a/appengine/flexible/tasks/requirements.txt b/appengine/flexible/tasks/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.2
 gunicorn==20.0.4
-google-cloud-tasks==1.5.0
+google-cloud-tasks==2.0.0
diff --git a/appengine/flexible/tasks/snippets.py b/appengine/flexible/tasks/snippets.py
@@ -25,7 +25,7 @@ def create_queue(project, location, queue_blue_name, queue_red_name):
     # queue_blue_name = 'queue-blue'
     # queue_red_name = 'queue-red'
 
-    parent = client.location_path(project, location)
+    parent = f"projects/{project}/locations/{location}"
 
     queue_blue = {
         'name': client.queue_path(project, location, queue_blue_name),
@@ -47,7 +47,7 @@ def create_queue(project, location, queue_blue_name, queue_red_name):
 
     queues = [queue_blue, queue_red]
     for queue in queues:
-        response = client.create_queue(parent, queue)
+        response = client.create_queue(parent=parent, queue=queue)
         print(response)
     # [END taskqueues_using_yaml]
     return response
@@ -64,13 +64,13 @@ def update_queue(project, location, queue):
 
     # Get queue object
     queue_path = client.queue_path(project, location, queue)
-    queue = client.get_queue(queue_path)
+    queue = client.get_queue(name=queue_path)
 
     # Update queue object
     queue.rate_limits.max_dispatches_per_second = 20
     queue.rate_limits.max_concurrent_dispatches = 10
 
-    response = client.update_queue(queue)
+    response = client.update_queue(queue=queue)
     print(response)
     # [END taskqueues_processing_rate]
     return response
@@ -99,8 +99,8 @@ def create_task(project, location, queue):
         }
     }
 
-    response = client.create_task(parent, task)
-    eta = response.schedule_time.ToDatetime().strftime("%m/%d/%Y, %H:%M:%S")
+    response = client.create_task(parent=parent, task=task)
+    eta = response.schedule_time.strftime("%m/%d/%Y, %H:%M:%S")
     print('Task {} enqueued, ETA {}.'.format(response.name, eta))
     # [END taskqueues_new_task]
     return response
@@ -142,9 +142,9 @@ def create_tasks_with_data(project, location, queue):
         }
     }
 
-    response = client.create_task(parent, task1)
+    response = client.create_task(parent=parent, task=task1)
     print(response)
-    response = client.create_task(parent, task2)
+    response = client.create_task(parent=parent, task=task2)
     print(response)
     # [END taskqueues_passing_data]
     return response
@@ -169,7 +169,7 @@ def create_task_with_name(project, location, queue, task_name):
             'relative_uri': '/url/path'
         }
     }
-    response = client.create_task(parent, task)
+    response = client.create_task(parent=parent, task=task)
     print(response)
     # [END taskqueues_naming_tasks]
     return response
@@ -185,7 +185,7 @@ def delete_task(project, location, queue):
     # queue = 'queue1'
 
     task_path = client.task_path(project, location, queue, 'foo')
-    response = client.delete_task(task_path)
+    response = client.delete_task(name=task_path)
     # [END taskqueues_deleting_tasks]
     return response
 
@@ -200,7 +200,7 @@ def purge_queue(project, location, queue):
     # queue = 'queue1'
 
     queue_path = client.queue_path(project, location, queue)
-    response = client.purge_queue(queue_path)
+    response = client.purge_queue(name=queue_path)
     # [END taskqueues_purging_tasks]
     return response
 
@@ -215,7 +215,7 @@ def pause_queue(project, location, queue):
     # queue = 'queue1'
 
     queue_path = client.queue_path(project, location, queue)
-    response = client.pause_queue(queue_path)
+    response = client.pause_queue(name=queue_path)
     # [END taskqueues_pause_queue]
     return response
 
@@ -230,7 +230,7 @@ def delete_queue(project, location, queue):
     # queue = 'queue1'
 
     queue_path = client.queue_path(project, location, queue)
-    response = client.delete_queue(queue_path)
+    response = client.delete_queue(name=queue_path)
     # [END taskqueues_deleting_queues]
     return response
 
@@ -248,7 +248,7 @@ def retry_task(project, location, fooqueue, barqueue, bazqueue):
     # barqueue = 'barqueue'
     # bazqueue = 'bazqueue'
 
-    parent = client.location_path(project, location)
+    parent = f"projects/{project}/locations/{location}"
 
     max_retry = duration_pb2.Duration()
     max_retry.seconds = 2*60*60*24
@@ -297,7 +297,7 @@ def retry_task(project, location, fooqueue, barqueue, bazqueue):
 
     queues = [foo, bar, baz]
     for queue in queues:
-        response = client.create_queue(parent, queue)
+        response = client.create_queue(parent=parent, queue=queue)
         print(response)
     # [END taskqueues_retrying_tasks]
     return response
