From cd4d4731b809e38d2a95c6a7cd965e6da2a60c08 Mon Sep 17 00:00:00 2001
From: Andrew Gorcester <andrew.gorcester@gmail.com>
Date: Tue, 19 Dec 2017 12:42:02 -0800
Subject: [PATCH] Standardize on CamelCase, reword confusing endpoint name
 (#1288)

---
 .../flexible/tasks/create_app_engine_queue_task.py | 14 +++++++-------
 appengine/flexible/tasks/main.py                   |  4 ++--
 appengine/flexible/tasks/main_test.py              |  4 ++--
 tasks/pull_queue_snippets.py                       |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/appengine/flexible/tasks/create_app_engine_queue_task.py b/appengine/flexible/tasks/create_app_engine_queue_task.py
index 150ec60a5398..b08e694e46c8 100644
--- a/appengine/flexible/tasks/create_app_engine_queue_task.py
+++ b/appengine/flexible/tasks/create_app_engine_queue_task.py
@@ -30,12 +30,12 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
     client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
 
     # Construct the request body.
-    url = '/log_payload'
+    url = '/example_task_handler'
     body = {
         'task': {
-            'app_engine_http_request': {  # Specify the type of request.
-                'http_method': 'POST',
-                'relative_url': url
+            'appEngineHttpRequest': {  # Specify the type of request.
+                'httpMethod': 'POST',
+                'relativeUrl': url
             }
         }
     }
@@ -50,7 +50,7 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
         converted_payload = base64_encoded_payload.decode()
 
         # Add the payload to the request.
-        body['task']['app_engine_http_request']['payload'] = converted_payload
+        body['task']['appEngineHttpRequest']['payload'] = converted_payload
 
     if in_seconds is not None:
         # Convert "seconds from now" into an rfc3339 datetime string.
@@ -58,7 +58,7 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
         scheduled_time = d.isoformat('T') + 'Z'
 
         # Add the rfc3339 datetime string to the request.
-        body['task']['schedule_time'] = scheduled_time
+        body['task']['scheduleTime'] = scheduled_time
 
     # Construct the fully qualified queue name.
     queue_name = 'projects/{}/locations/{}/queues/{}'.format(
@@ -104,7 +104,7 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
     )
 
     parser.add_argument(
-        '--in_seconds',
+        '--in_seconds', type=int,
         help='The number of seconds from now to schedule task attempt.'
     )
 
diff --git a/appengine/flexible/tasks/main.py b/appengine/flexible/tasks/main.py
index 174e8a3f7735..8b6c666d43cd 100644
--- a/appengine/flexible/tasks/main.py
+++ b/appengine/flexible/tasks/main.py
@@ -20,8 +20,8 @@
 app = Flask(__name__)
 
 
-@app.route('/log_payload', methods=['POST'])
-def log_payload():
+@app.route('/example_task_handler', methods=['POST'])
+def example_task_handler():
     """Log the request payload."""
     payload = request.get_data(as_text=True) or '(empty payload)'
     print('Received task with payload: {}'.format(payload))
diff --git a/appengine/flexible/tasks/main_test.py b/appengine/flexible/tasks/main_test.py
index 18bf93e51ba4..d47072d1c363 100644
--- a/appengine/flexible/tasks/main_test.py
+++ b/appengine/flexible/tasks/main_test.py
@@ -30,7 +30,7 @@ def test_index(app):
 def test_log_payload(capsys, app):
     payload = 'test_payload'
 
-    r = app.post('/log_payload', data=payload)
+    r = app.post('/example_task_handler', data=payload)
     assert r.status_code == 200
 
     out, _ = capsys.readouterr()
@@ -38,7 +38,7 @@ def test_log_payload(capsys, app):
 
 
 def test_empty_payload(capsys, app):
-    r = app.post('/log_payload')
+    r = app.post('/example_task_handler')
     assert r.status_code == 200
 
     out, _ = capsys.readouterr()
diff --git a/tasks/pull_queue_snippets.py b/tasks/pull_queue_snippets.py
index c2c0c50b4069..360ceb2b6410 100644
--- a/tasks/pull_queue_snippets.py
+++ b/tasks/pull_queue_snippets.py
@@ -47,7 +47,7 @@ def create_task(project, queue, location):
     # Construct the request body.
     task = {
         'task': {
-            'pull_message': {
+            'pullMessage': {
                 'payload': converted_payload
             }
         }
@@ -77,7 +77,7 @@ def pull_task(project, queue, location):
 
     duration_seconds = '600s'
     pull_options = {
-        'max_tasks': 1,
+        'maxTasks': 1,
         'leaseDuration': duration_seconds,
         'responseView': 'FULL'
     }