diff --git a/tasks/README.rst b/tasks/README.rst index 503605b9d7b3..78eb5f2685b8 100644 --- a/tasks/README.rst +++ b/tasks/README.rst @@ -8,9 +8,9 @@ is in Alpha. - `Product Documentation`_ .. _Alpha: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst -.. _Cloud Tasks API: https://cloud.google.com/cloudtasks -.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/cloudtasks/usage.html -.. _Product Documentation: https://cloud.google.com/cloudtasks +.. _Cloud Tasks API: https://cloud.google.com/tasks +.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/tasks/usage.html +.. _Product Documentation: https://cloud.google.com/tasks Quick Start ----------- @@ -24,7 +24,7 @@ In order to use this library, you first need to go through the following steps: .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project .. _Enable billing for your project.: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project -.. _Enable the Cloud Tasks API.: https://cloud.google.com/cloudtasks +.. _Enable the Cloud Tasks API.: https://cloud.google.com/tasks .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/core/auth.html Installation @@ -49,7 +49,7 @@ Mac/Linux pip install virtualenv virtualenv source /bin/activate - /bin/pip install google-cloud-cloudtasks + /bin/pip install google-cloud-tasks Windows @@ -60,7 +60,7 @@ Windows pip install virtualenv virtualenv \Scripts\activate - \Scripts\pip.exe install google-cloud-cloudtasks + \Scripts\pip.exe install google-cloud-tasks Next Steps ~~~~~~~~~~ @@ -72,5 +72,5 @@ Next Steps - View this `repository’s main README`_ to see the full list of Cloud APIs that we cover. -.. _Cloud Tasks API Product documentation: https://cloud.google.com/cloudtasks +.. _Cloud Tasks API Product documentation: https://cloud.google.com/tasks .. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst \ No newline at end of file diff --git a/tasks/docs/conf.py b/tasks/docs/conf.py index b2ccdea214f1..73c9cc949e92 100644 --- a/tasks/docs/conf.py +++ b/tasks/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# google-cloud-cloudtasks documentation build configuration file +# google-cloud-tasks documentation build configuration file # # This file is execfile()d with the current directory set to its # containing dir. @@ -59,7 +59,7 @@ master_doc = 'index' # General information about the project. -project = u'google-cloud-cloudtasks' +project = u'google-cloud-tasks' copyright = u'2017, Google' author = u'Google APIs' @@ -212,7 +212,7 @@ #html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. -htmlhelp_basename = 'google-cloud-cloudtasks-doc' +htmlhelp_basename = 'google-cloud-tasks-doc' # -- Options for LaTeX output --------------------------------------------- @@ -234,8 +234,8 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'google-cloud-cloudtasks.tex', - u'google-cloud-cloudtasks Documentation', author, 'manual'), + (master_doc, 'google-cloud-tasks.tex', + u'google-cloud-tasks Documentation', author, 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -262,8 +262,8 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [(master_doc, 'google-cloud-cloudtasks', - u'google-cloud-cloudtasks Documentation', [author], 1)] +man_pages = [(master_doc, 'google-cloud-tasks', + u'google-cloud-tasks Documentation', [author], 1)] # If true, show URL addresses after external links. #man_show_urls = False @@ -274,9 +274,9 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'google-cloud-cloudtasks', - u'google-cloud-cloudtasks Documentation', author, - 'google-cloud-cloudtasks', + (master_doc, 'google-cloud-tasks', + u'google-cloud-tasks Documentation', author, + 'google-cloud-tasks', 'GAPIC library for the {metadata.shortName} v2beta2 service', 'APIs'), ] diff --git a/tasks/docs/index.rst b/tasks/docs/index.rst index 7eb985531f8c..0687e839d4fc 100644 --- a/tasks/docs/index.rst +++ b/tasks/docs/index.rst @@ -8,9 +8,9 @@ is in Alpha. - `Product Documentation`_ .. _Alpha: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst -.. _Cloud Tasks API: https://cloud.google.com/cloudtasks -.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/cloudtasks/usage.html -.. _Product Documentation: https://cloud.google.com/cloudtasks +.. _Cloud Tasks API: https://cloud.google.com/cloud-tasks +.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/cloud-tasks/usage.html +.. _Product Documentation: https://cloud.google.com/cloud-tasks Quick Start ----------- @@ -24,7 +24,7 @@ In order to use this library, you first need to go through the following steps: .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project .. _Enable billing for your project.: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project -.. _Enable the Cloud Tasks API.: https://cloud.google.com/cloudtasks +.. _Enable the Cloud Tasks API.: https://cloud.google.com/cloud-tasks .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/core/auth.html Installation @@ -49,7 +49,7 @@ Mac/Linux pip install virtualenv virtualenv source /bin/activate - /bin/pip install google-cloud-cloudtasks + /bin/pip install google-cloud-tasks Windows @@ -60,7 +60,7 @@ Windows pip install virtualenv virtualenv \Scripts\activate - \Scripts\pip.exe install google-cloud-cloudtasks + \Scripts\pip.exe install google-cloud-tasks Next Steps ~~~~~~~~~~ @@ -72,7 +72,7 @@ Next Steps - View this `repository’s main README`_ to see the full list of Cloud APIs that we cover. -.. _Cloud Tasks API Product documentation: https://cloud.google.com/cloudtasks +.. _Cloud Tasks API Product documentation: https://cloud.google.com/cloud-tasks .. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst Api Reference diff --git a/tasks/google/cloud/tasks_v2beta2/gapic/cloud_tasks_client.py b/tasks/google/cloud/tasks_v2beta2/gapic/cloud_tasks_client.py index ef5ba265b2ae..3cac655f83c5 100644 --- a/tasks/google/cloud/tasks_v2beta2/gapic/cloud_tasks_client.py +++ b/tasks/google/cloud/tasks_v2beta2/gapic/cloud_tasks_client.py @@ -19,6 +19,7 @@ import google.api_core.gapic_v1.client_info import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method +import google.api_core.gapic_v1.routing_header import google.api_core.grpc_helpers import google.api_core.page_iterator import google.api_core.path_template @@ -240,6 +241,9 @@ def list_queues(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'list_queues' not in self._inner_api_calls: self._inner_api_calls[ 'list_queues'] = google.api_core.gapic_v1.method.wrap_method( @@ -254,6 +258,11 @@ def list_queues(self, filter=filter_, page_size=page_size, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('parent', parent)], ) + metadata.append(routing_header) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -309,6 +318,9 @@ def get_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'get_queue' not in self._inner_api_calls: self._inner_api_calls[ 'get_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -319,6 +331,11 @@ def get_queue(self, ) request = cloudtasks_pb2.GetQueueRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['get_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -388,6 +405,9 @@ def create_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'create_queue' not in self._inner_api_calls: self._inner_api_calls[ 'create_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -402,6 +422,11 @@ def create_queue(self, parent=parent, queue=queue, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('parent', parent)], ) + metadata.append(routing_header) + return self._inner_api_calls['create_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -473,6 +498,9 @@ def update_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'update_queue' not in self._inner_api_calls: self._inner_api_calls[ 'update_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -487,6 +515,12 @@ def update_queue(self, queue=queue, update_mask=update_mask, ) + + if hasattr(queue, 'name'): + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('queue.name', queue.name)], ) + metadata.append(routing_header) + return self._inner_api_calls['update_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -539,6 +573,9 @@ def delete_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'delete_queue' not in self._inner_api_calls: self._inner_api_calls[ 'delete_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -550,6 +587,11 @@ def delete_queue(self, ) request = cloudtasks_pb2.DeleteQueueRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + self._inner_api_calls['delete_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -599,6 +641,9 @@ def purge_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'purge_queue' not in self._inner_api_calls: self._inner_api_calls[ 'purge_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -609,6 +654,11 @@ def purge_queue(self, ) request = cloudtasks_pb2.PurgeQueueRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['purge_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -659,6 +709,9 @@ def pause_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'pause_queue' not in self._inner_api_calls: self._inner_api_calls[ 'pause_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -669,6 +722,11 @@ def pause_queue(self, ) request = cloudtasks_pb2.PauseQueueRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['pause_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -724,6 +782,9 @@ def resume_queue(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'resume_queue' not in self._inner_api_calls: self._inner_api_calls[ 'resume_queue'] = google.api_core.gapic_v1.method.wrap_method( @@ -735,6 +796,11 @@ def resume_queue(self, ) request = cloudtasks_pb2.ResumeQueueRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['resume_queue']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -785,6 +851,9 @@ def get_iam_policy(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'get_iam_policy' not in self._inner_api_calls: self._inner_api_calls[ 'get_iam_policy'] = google.api_core.gapic_v1.method.wrap_method( @@ -796,6 +865,11 @@ def get_iam_policy(self, ) request = iam_policy_pb2.GetIamPolicyRequest(resource=resource, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('resource', resource)], ) + metadata.append(routing_header) + return self._inner_api_calls['get_iam_policy']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -858,6 +932,9 @@ def set_iam_policy(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'set_iam_policy' not in self._inner_api_calls: self._inner_api_calls[ 'set_iam_policy'] = google.api_core.gapic_v1.method.wrap_method( @@ -872,6 +949,11 @@ def set_iam_policy(self, resource=resource, policy=policy, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('resource', resource)], ) + metadata.append(routing_header) + return self._inner_api_calls['set_iam_policy']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -929,6 +1011,9 @@ def test_iam_permissions(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'test_iam_permissions' not in self._inner_api_calls: self._inner_api_calls[ 'test_iam_permissions'] = google.api_core.gapic_v1.method.wrap_method( @@ -944,6 +1029,11 @@ def test_iam_permissions(self, resource=resource, permissions=permissions, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('resource', resource)], ) + metadata.append(routing_header) + return self._inner_api_calls['test_iam_permissions']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1030,6 +1120,9 @@ def list_tasks(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'list_tasks' not in self._inner_api_calls: self._inner_api_calls[ 'list_tasks'] = google.api_core.gapic_v1.method.wrap_method( @@ -1045,6 +1138,11 @@ def list_tasks(self, order_by=order_by, page_size=page_size, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('parent', parent)], ) + metadata.append(routing_header) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -1113,6 +1211,9 @@ def get_task(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'get_task' not in self._inner_api_calls: self._inner_api_calls[ 'get_task'] = google.api_core.gapic_v1.method.wrap_method( @@ -1126,6 +1227,11 @@ def get_task(self, name=name, response_view=response_view, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['get_task']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1238,6 +1344,9 @@ def create_task(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'create_task' not in self._inner_api_calls: self._inner_api_calls[ 'create_task'] = google.api_core.gapic_v1.method.wrap_method( @@ -1252,6 +1361,11 @@ def create_task(self, task=task, response_view=response_view, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('parent', parent)], ) + metadata.append(routing_header) + return self._inner_api_calls['create_task']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1297,6 +1411,9 @@ def delete_task(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'delete_task' not in self._inner_api_calls: self._inner_api_calls[ 'delete_task'] = google.api_core.gapic_v1.method.wrap_method( @@ -1307,6 +1424,11 @@ def delete_task(self, ) request = cloudtasks_pb2.DeleteTaskRequest(name=name, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + self._inner_api_calls['delete_task']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1433,6 +1555,9 @@ def lease_tasks(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'lease_tasks' not in self._inner_api_calls: self._inner_api_calls[ 'lease_tasks'] = google.api_core.gapic_v1.method.wrap_method( @@ -1449,6 +1574,11 @@ def lease_tasks(self, response_view=response_view, filter=filter_, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('parent', parent)], ) + metadata.append(routing_header) + return self._inner_api_calls['lease_tasks']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1520,6 +1650,9 @@ def acknowledge_task(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'acknowledge_task' not in self._inner_api_calls: self._inner_api_calls[ 'acknowledge_task'] = google.api_core.gapic_v1.method.wrap_method( @@ -1535,6 +1668,11 @@ def acknowledge_task(self, name=name, schedule_time=schedule_time, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + self._inner_api_calls['acknowledge_task']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1622,6 +1760,9 @@ def renew_lease(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'renew_lease' not in self._inner_api_calls: self._inner_api_calls[ 'renew_lease'] = google.api_core.gapic_v1.method.wrap_method( @@ -1637,6 +1778,11 @@ def renew_lease(self, lease_duration=lease_duration, response_view=response_view, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['renew_lease']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1712,6 +1858,9 @@ def cancel_lease(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'cancel_lease' not in self._inner_api_calls: self._inner_api_calls[ 'cancel_lease'] = google.api_core.gapic_v1.method.wrap_method( @@ -1727,6 +1876,11 @@ def cancel_lease(self, schedule_time=schedule_time, response_view=response_view, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['cancel_lease']( request, retry=retry, timeout=timeout, metadata=metadata) @@ -1810,6 +1964,9 @@ def run_task(self, to a retryable error and retry attempts failed. ValueError: If the parameters are invalid. """ + if metadata is None: + metadata = [] + metadata = list(metadata) if 'run_task' not in self._inner_api_calls: self._inner_api_calls[ 'run_task'] = google.api_core.gapic_v1.method.wrap_method( @@ -1823,5 +1980,10 @@ def run_task(self, name=name, response_view=response_view, ) + + routing_header = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + [('name', name)], ) + metadata.append(routing_header) + return self._inner_api_calls['run_task']( request, retry=retry, timeout=timeout, metadata=metadata) diff --git a/tasks/google/cloud/tasks_v2beta2/types.py b/tasks/google/cloud/tasks_v2beta2/types.py index 1a399d3e1149..3bb4011b0050 100644 --- a/tasks/google/cloud/tasks_v2beta2/types.py +++ b/tasks/google/cloud/tasks_v2beta2/types.py @@ -15,7 +15,13 @@ from __future__ import absolute_import import sys +from google.api_core.protobuf_helpers import get_messages + from google.api import http_pb2 +from google.cloud.tasks_v2beta2.proto import cloudtasks_pb2 +from google.cloud.tasks_v2beta2.proto import queue_pb2 +from google.cloud.tasks_v2beta2.proto import target_pb2 +from google.cloud.tasks_v2beta2.proto import task_pb2 from google.iam.v1 import iam_policy_pb2 from google.iam.v1 import policy_pb2 from google.protobuf import any_pb2 @@ -26,13 +32,7 @@ from google.protobuf import timestamp_pb2 from google.rpc import status_pb2 -from google.api_core.protobuf_helpers import get_messages -from google.cloud.tasks_v2beta2.proto import cloudtasks_pb2 -from google.cloud.tasks_v2beta2.proto import queue_pb2 -from google.cloud.tasks_v2beta2.proto import target_pb2 -from google.cloud.tasks_v2beta2.proto import task_pb2 - - +names = [] _shared_modules = [ http_pb2, iam_policy_pb2, @@ -53,8 +53,6 @@ task_pb2, ] -names = [] - for module in _shared_modules: for name, message in get_messages(module).items(): setattr(sys.modules[__name__], name, message) @@ -66,4 +64,5 @@ setattr(sys.modules[__name__], name, message) names.append(name) + __all__ = tuple(sorted(names)) diff --git a/tasks/synth.py b/tasks/synth.py new file mode 100644 index 000000000000..0a5e1a32ed61 --- /dev/null +++ b/tasks/synth.py @@ -0,0 +1,123 @@ +# Copyright 2018 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This script is used to synthesize generated parts of this library.""" + +import synthtool as s +import synthtool.gcp as gcp +import logging + +logging.basicConfig(level=logging.DEBUG) + +gapic = gcp.GAPICGenerator() +common = gcp.CommonTemplates() + +# tasks has two product names, and a poorly named artman yaml +v2beta2_library = gapic._generate_code( + 'tasks', 'v2beta2', 'python', + config_path='artman_cloudtasks.yaml', + artman_output_name='cloud-tasks-v2beta2') + +s.copy(v2beta2_library) + +# Set Release Status +release_status = 'Development Status :: 3 - Alpha' +s.replace('setup.py', + '(release_status = )(.*)$', + f"\\1'{release_status}'") + +# Add Dependencies +s.replace('setup.py', + 'dependencies = \[\n*(^.*,\n)+', + "\\g<0> 'grpc-google-iam-v1<0.12dev,>=0.11.4',\n") + +# Correct Naming of package +s.replace('**/*.rst', + 'google-cloud-cloud-tasks', + 'google-cloud-tasks') +s.replace('**/*.py', + 'google-cloud-cloud-tasks', + 'google-cloud-tasks') +s.replace('README.rst', + '/cloud-tasks', + '/tasks') + +# Correct calls to routing_header +# https://github.com/googleapis/gapic-generator/issues/2016 +s.replace( + "google/cloud/*/gapic/*_client.py", + "routing_header\(", + "routing_header.to_grpc_metadata(") + +# metadata in tests in none but should be empty list. +# https://github.com/googleapis/gapic-generator/issues/2014 +s.replace( + "google/cloud/*/gapic/*_client.py", + 'def .*\(([^\)]+)\n.*metadata=None\):\n\s+"""(.*\n)*?\s+"""\n', + '\g<0>' + ' if metadata is None:\n' + ' metadata = []\n' + ' metadata = list(metadata)\n') + + +# empty objects trying to get attrs +# https://github.com/googleapis/gapic-generator/issues/2015 +s.replace( + "google/cloud/*/gapic/*_client.py", + "(^ )(routing_header = google.api_core.gapic_v1.routing_header" + ".to_grpc_metadata\(\n)" + "(\s+)(\[\('[a-z\_]*?\.name', )([a-z\_]*?)(.name\)\], \)\n)" + "(\s+metadata.append\(routing_header\)\n)", + "\g<1>if hasattr(\g<5>, 'name'):\n" + "\g<1> \g<2>\g<3> \g<4>\g<5>\g<6> \g<7>" +) + + +# fix the combined shared/local modules. +# https://github.com/GoogleCloudPlatform/google-cloud-python/pull/5364 +# https://github.com/googleapis/gapic-generator/issues/2058 +s.replace( + "google/cloud/*/types.py", + "for module in \(\n(.*\n)*?\):\n( .*\n)+", + """_shared_modules = [ + http_pb2, + iam_policy_pb2, + policy_pb2, + any_pb2, + descriptor_pb2, + duration_pb2, + empty_pb2, + field_mask_pb2, + timestamp_pb2, + status_pb2, +] + +_local_modules = [ + cloudtasks_pb2, + queue_pb2, + target_pb2, + task_pb2, +] + +for module in _shared_modules: + for name, message in get_messages(module).items(): + setattr(sys.modules[__name__], name, message) + names.append(name) + +for module in _local_modules: + for name, message in get_messages(module).items(): + message.__module__ = 'google.cloud.tasks_v2beta2.types' + setattr(sys.modules[__name__], name, message) + names.append(name) +""")