Merge pull request GoogleCloudPlatform#1137 from andrewsg/tasks

andrewsg · web-flow · commit e1f688334782 · 2017-09-25T10:56:51.000-07:00
Update Task Queue samples for beta
diff --git a/appengine/flexible/tasks/create_app_engine_queue_task.py b/appengine/flexible/tasks/create_app_engine_queue_task.py
@@ -19,8 +19,6 @@
 import datetime
 import json
 
-from googleapiclient import discovery
-
 
 def seconds_from_now_to_rfc3339_datetime(seconds):
     """Return an RFC 3339 datetime string for a number of seconds from now."""
@@ -31,16 +29,15 @@ def seconds_from_now_to_rfc3339_datetime(seconds):
 def create_task(project, queue, location, payload=None, in_seconds=None):
     """Create a task for a given queue with an arbitrary payload."""
 
+    import googleapiclient.discovery
+
     # Create a client.
-    DISCOVERY_URL = (
-        'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
-    client = discovery.build(
-        'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
+    client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
 
     url = '/log_payload'
     body = {
         'task': {
-            'app_engine_task_target': {
+            'app_engine_http_request': {
                 'http_method': 'POST',
                 'relative_url': url
             }
@@ -50,7 +47,7 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
     if payload is not None:
         # Payload is a string (unicode), and must be encoded for base64.
         # The finished request body is JSON, which requires unicode.
-        body['task']['app_engine_task_target']['payload'] = base64.b64encode(
+        body['task']['app_engine_http_request']['payload'] = base64.b64encode(
             payload.encode()).decode()
 
     if in_seconds is not None:
@@ -65,10 +62,6 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
     response = client.projects().locations().queues().tasks().create(
         parent=queue_name, body=body).execute()
 
-    # By default CreateTaskRequest.responseView is BASIC, so not all
-    # information is retrieved by default because some data, such as payloads,
-    # might be desirable to return only when needed because of its large size
-    # or because of the sensitivity of data that it contains.
     print('Created task {}'.format(response['name']))
     return response
 
diff --git a/appengine/flexible/tasks/main.py b/appengine/flexible/tasks/main.py
@@ -14,8 +14,6 @@
 
 """App Engine app to serve as an endpoint for App Engine queue samples."""
 
-import logging
-
 from flask import Flask, request
 
 app = Flask(__name__)
@@ -24,9 +22,9 @@
 @app.route('/log_payload', methods=['POST'])
 def log_payload():
     """Log the request payload."""
-    payload = request.data or "empty payload"
-    logging.warn(payload)
-    return 'Logged request payload: {}'.format(payload)
+    payload = request.get_data(as_text=True) or '(empty payload)'
+    print('Received task with payload: {}'.format(payload))
+    return 'Printed task payload: {}'.format(payload)
 
 
 @app.route('/')
diff --git a/tasks/pull_queue_snippets.py b/tasks/pull_queue_snippets.py
@@ -23,21 +23,19 @@
 import argparse
 import base64
 
-from googleapiclient import discovery
-
 
 def create_task(project, queue, location):
     """Create a task for a given queue with an arbitrary payload."""
 
-    DISCOVERY_URL = (
-        'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
-    client = discovery.build(
-        'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
+    import googleapiclient.discovery
+
+    # Create a client.
+    client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
 
     payload = 'a message for the recipient'
     task = {
         'task': {
-            'pull_task_target': {
+            'pull_message': {
                 'payload': base64.b64encode(payload.encode()).decode()
             }
         }
@@ -56,10 +54,10 @@ def create_task(project, queue, location):
 def pull_task(project, queue, location):
     """Pull a single task from a given queue and lease it for 10 minutes."""
 
-    DISCOVERY_URL = (
-        'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
-    client = discovery.build(
-        'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
+    import googleapiclient.discovery
+
+    # Create a client.
+    client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
 
     duration_seconds = '600s'
     pull_options = {
@@ -81,10 +79,10 @@ def pull_task(project, queue, location):
 def acknowledge_task(task):
     """Acknowledge a given task."""
 
-    DISCOVERY_URL = (
-        'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
-    client = discovery.build(
-        'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
+    import googleapiclient.discovery
+
+    # Create a client.
+    client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
 
     body = {'scheduleTime': task['scheduleTime']}
     client.projects().locations().queues().tasks().acknowledge(
