Merge branch 'master' into snippet-gen

Author: software-dov

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+### [0.44.3](https://www.github.com/googleapis/gapic-generator-python/compare/v0.44.2...v0.44.3) (2021-05-03)
+
+
+### Performance Improvements
+
+* reduce unnecessary copies, optimize Address comparison ([#855](https://www.github.com/googleapis/gapic-generator-python/issues/855)) ([e843540](https://www.github.com/googleapis/gapic-generator-python/commit/e8435400257707458e83424019c9b1a16fac9a99))
+
+### [0.44.2](https://www.github.com/googleapis/gapic-generator-python/compare/v0.44.1...v0.44.2) (2021-04-30)
+
+
+### Bug Fixes
+
+* remove auth, policy, and options from the reserved names list ([#851](https://www.github.com/googleapis/gapic-generator-python/issues/851)) ([d3f31a0](https://www.github.com/googleapis/gapic-generator-python/commit/d3f31a0d33411b3248871ddbe51135e83b699a73))
+
+### [0.44.1](https://www.github.com/googleapis/gapic-generator-python/compare/v0.44.0...v0.44.1) (2021-04-28)
+
+
+### Bug Fixes
+
+* fix syntax errors and failing unit tests ([#849](https://www.github.com/googleapis/gapic-generator-python/issues/849)) ([9046261](https://www.github.com/googleapis/gapic-generator-python/commit/90462617e3e2b90eb8684210b6a70e890bdc0d96)), closes [#848](https://www.github.com/googleapis/gapic-generator-python/issues/848)
+
 ## [0.44.0](https://www.github.com/googleapis/gapic-generator-python/compare/v0.43.3...v0.44.0) (2021-04-23)
 
 

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.

gapic/ads-templates/%namespace/%name/%version/%sub/__init__.py.j2

@@ -8,23 +8,23 @@
     them again.
 -#}
 __all__ = (
-    {% filter sort_lines %}
-    {% for subpackage in api.subpackages.keys() %}
+    {% filter sort_lines -%}
+    {% for subpackage in api.subpackages -%}
     '{{ subpackage }}',
-    {% endfor %}
+    {% endfor -%}
     {% for service in api.services.values()
-            if service.meta.address.subpackage == api.subpackage_view %}
+            if service.meta.address.subpackage == api.subpackage_view -%}
     '{{ service.client_name }}',
-    {% endfor %}
+    {% endfor -%}
     {% for proto in api.protos.values()
-            if proto.meta.address.subpackage == api.subpackage_view %}
-    {% for message in proto.messages.values() %}
+            if proto.meta.address.subpackage == api.subpackage_view -%}
+    {% for message in proto.messages.values() -%}
     '{{ message.name }}',
-    {% endfor %}
-    {% for enum in proto.enums.values() %}
+    {% endfor -%}
+    {% for enum in proto.enums.values() -%}
     '{{ enum.name }}',
-    {% endfor %}
-    {% endfor %}
-    {% endfilter %}
+    {% endfor -%}
+    {% endfor -%}
+    {% endfilter -%}
 )
 {% endblock %}

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2

@@ -10,10 +10,10 @@ from typing import Callable, Dict, Optional, {% if service.any_server_streaming
 import pkg_resources
 
 from google.api_core import client_options as client_options_lib  # type: ignore
-from google.api_core import exceptions                            # type: ignore
+from google.api_core import exceptions as core_exceptions         # type: ignore
 from google.api_core import gapic_v1                              # type: ignore
 from google.api_core import retry as retries                      # type: ignore
-from google.auth import credentials                               # type: ignore
+from google.auth import credentials as ga_credentials             # type: ignore
 from google.auth.transport import mtls                            # type: ignore
 from google.auth.transport.grpc import SslCredentials             # type: ignore
 from google.auth.exceptions import MutualTLSChannelError          # type: ignore
@@ -174,7 +174,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
     {% endfor %} {# common resources #}
 
     def __init__(self, *,
-            credentials: Optional[credentials.Credentials] = None,
+            credentials: Optional[ga_credentials.Credentials] = None,
             transport: Union[str, {{ service.name }}Transport, None] = None,
             client_options: Optional[client_options_lib.ClientOptions] = None,
             client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
@@ -305,7 +305,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
             {% if not method.client_streaming %}
             request (:class:`{{ method.input.ident.sphinx }}`):
                 The request object.{{ ' ' }}
-                {{ method.input.meta.doc|wrap(width=72, offset=36, indent=16) }}
+                {{- method.input.meta.doc|wrap(width=72, offset=36, indent=16) }}
             {% for key, field in method.flattened_fields.items() %}
             {{ field.name }} (:class:`{{ field.ident.sphinx }}`):
                 {{ field.meta.doc|rst(width=72, indent=16) }}
@@ -316,7 +316,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
             {% else %}
             requests (Iterator[`{{ method.input.ident.sphinx }}`]):
                 The request object iterator.{{ ' ' }}
-                {{ method.input.meta.doc|wrap(width=72, offset=36, indent=16) }}
+                {{- method.input.meta.doc|wrap(width=72, offset=36, indent=16) }}
             {% endif %}
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -344,7 +344,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
                              'the individual field arguments should be set.')
 
         {% endif %} {# method.flattened_fields #}
-        {% if method.input.ident.package != method.ident.package %} {# request lives in a different package, so there is no proto wrapper #}
+        {% if method.input.ident.package != method.ident.package %}{# request lives in a different package, so there is no proto wrapper #}
         # The request isn't a proto-plus wrapped type.
         # so it must be constructed via keyword expansion.
         if isinstance(request, dict):

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2

@@ -6,13 +6,13 @@ import abc
 import typing
 import pkg_resources
 
-from google import auth
+import google.auth  # type: ignore
 from google.api_core import gapic_v1    # type: ignore
 from google.api_core import retry as retries  # type: ignore
 {% if service.has_lro %}
 from google.api_core import operations_v1  # type: ignore
 {% endif %}
-from google.auth import credentials  # type: ignore
+from google.auth import credentials as ga_credentials  # type: ignore
 
 {% filter sort_lines %}
 {% for method in service.methods.values() %}
@@ -43,7 +43,7 @@ class {{ service.name }}Transport(metaclass=abc.ABCMeta):
     def __init__(
             self, *,
             host: str{% if service.host %} = '{{ service.host }}'{% endif %},
-            credentials: credentials.Credentials = None,
+            credentials: ga_credentials.Credentials = None,
             client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
             ) -> None:
         """Instantiate the transport.
@@ -70,7 +70,7 @@ class {{ service.name }}Transport(metaclass=abc.ABCMeta):
         # If no credentials are provided, then determine the appropriate
         # defaults.
         if credentials is None:
-            credentials, _ = auth.default(scopes=self.AUTH_SCOPES)
+            credentials, _ = google.auth.default(scopes=self.AUTH_SCOPES)
 
         # Save the credentials.
         self._credentials = credentials

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2

@@ -10,8 +10,8 @@ from google.api_core import grpc_helpers   # type: ignore
 from google.api_core import operations_v1  # type: ignore
 {% endif %}
 from google.api_core import gapic_v1       # type: ignore
-from google import auth                    # type: ignore
-from google.auth import credentials        # type: ignore
+import google.auth                         # type: ignore
+from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
 import grpc  # type: ignore
@@ -39,7 +39,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
     """
     def __init__(self, *,
             host: str{% if service.host %} = '{{ service.host }}'{% endif %},
-            credentials: credentials.Credentials = None,
+            credentials: ga_credentials.Credentials = None,
             credentials_file: str = None,
             scopes: Sequence[str] = None,
             channel: grpc.Channel = None,
@@ -105,7 +105,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
             host = api_mtls_endpoint if ":" in api_mtls_endpoint else api_mtls_endpoint + ":443"
 
             if credentials is None:
-                credentials, _ = auth.default(scopes=self.AUTH_SCOPES, quota_project_id=quota_project_id)
+                credentials, _ = google.auth.default(scopes=self.AUTH_SCOPES, quota_project_id=quota_project_id)
 
             # Create SSL credentials with client_cert_source or application
             # default SSL credentials.
@@ -135,7 +135,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
             host = host if ":" in host else host + ":443"
 
             if credentials is None:
-                credentials, _ = auth.default(scopes=self.AUTH_SCOPES)
+                credentials, _ = google.auth.default(scopes=self.AUTH_SCOPES)
 
             # create a new channel. The provided one is ignored.
             self._grpc_channel = type(self).create_channel(
@@ -162,7 +162,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
     @classmethod
     def create_channel(cls,
                        host: str{% if service.host %} = '{{ service.host }}'{% endif %},
-                       credentials: credentials.Credentials = None,
+                       credentials: ga_credentials.Credentials = None,
                        scopes: Optional[Sequence[str]] = None,
                        **kwargs) -> grpc.Channel:
         """Create and return a gRPC channel object.
@@ -217,10 +217,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
     def {{ method.name|snake_case }}(self) -> Callable[
             [{{ method.input.ident }}],
             {{ method.output.ident }}]:
-        r"""Return a callable for the {{ ' ' }}
-        {{ (method.name|snake_case).replace('_',' ')|wrap(
-                width=70, offset=40, indent=8) }}
-        {{ ' ' }} method over gRPC.
+        r"""Return a callable for the{{ ' ' }}
+        {{- (method.name|snake_case).replace('_',' ')|wrap(
+                width=70, offset=40, indent=8) -}}
+        {{ ' ' }}method over gRPC.
 
         {{ method.meta.doc|rst(width=72, indent=8) }}
 

gapic/ads-templates/%namespace/%name/%version/__init__.py.j2

@@ -1,7 +1,7 @@
 {% extends '_base.py.j2' %}
 {% block content %}
 
-{% if opts.lazy_import %} {# lazy import #}
+{% if opts.lazy_import -%} {# lazy import #}
 import importlib
 import sys
 
@@ -50,8 +50,7 @@ def __dir__():
     return globals().get('__all__') or __getattr__('__all__')
 {% else %}                {# do not use lazy import #}
 {#  Import subpackages. -#}
-{% filter sort_lines %}
-{% for subpackage in api.subpackages.keys() %}
+{% for subpackage in api.subpackages|dictsort %}
 from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.') }}.{% endif %}
     {{ api.naming.versioned_module_name }} import {{ subpackage }}
 {% endfor %}
@@ -83,15 +82,13 @@ from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.'
 from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.') }}.{% endif %}
     {{ api.naming.versioned_module_name }}.types.{{ proto.module_name }} import {{ enum.name }}
 {% endfor %}{% endfor %}
-{% endfilter %}
 {#  Define __all__.
     This requires the full set of imported names, so we iterate over
     them again.
 -#}
 __all__ = (
 {% filter indent %}
-{% filter sort_lines %}
-{% for subpackage in api.subpackages.keys() %}
+{% for subpackage in api.subpackages|dictsort %}
 '{{ subpackage }}',
 {% endfor %}
 {% for service in api.services.values()|sort(attribute='name')
@@ -108,7 +105,6 @@ __all__ = (
 '{{ enum.name }}',
 {% endfor %}{% endfor %}
 {% endfilter %}
-{% endfilter %}
 )
 {% endif %} {# lazy import #}
 {% endblock %}

gapic/ads-templates/%namespace/%name/__init__.py.j2

@@ -1,7 +1,7 @@
 {% extends '_base.py.j2' %}
 {% block content %}
 
-{% if opts.lazy_import %} {# lazy import #}
+{% if opts.lazy_import -%} {# lazy import #}
 import importlib
 import sys
 
@@ -48,8 +48,7 @@ def __dir__():
     return globals().get('__all__') or __getattr__('__all__')
 {% else %}                {# do not use lazy import #}
 {#  Import subpackages. -#}
-{% filter sort_lines %}
-{% for subpackage in api.subpackages.keys() %}
+{% for subpackage in api.subpackages|dictsort %}
 from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.') }}.{% endif %}
     {{- api.naming.versioned_module_name }} import {{ subpackage }}
 {% endfor %}
@@ -81,14 +80,12 @@ from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.'
 from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.') }}.{% endif %}
     {{- api.naming.versioned_module_name }}.types.{{ proto.module_name }} import {{ enum.name }}
 {% endfor %}{% endfor %}
-{% endfilter %}
 {#  Define __all__.
     This requires the full set of imported names, so we iterate over
     them again.
 #}
 __all__ = (
 {% filter indent %}
-{% filter sort_lines %}
 {% for subpackage, _ in api.subpackages|dictsort %}
 '{{ subpackage }}',
 {% endfor %}
@@ -106,7 +103,6 @@ __all__ = (
 '{{ enum.name }}',
 {% endfor %}{% endfor %}
 {% endfilter %}
-{% endfilter %}
 )
 {% endif %} {# lazy import #}
 {% endblock %}