Merge branch 'master' into self-signed-jwt

busunkim96 · web-flow · commit b284a465310d · 2021-04-14T17:35:01.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+### [0.43.3](https://www.github.com/googleapis/gapic-generator-python/compare/v0.43.2...v0.43.3) (2021-04-12)
+
+
+### Bug Fixes
+
+* sort subpackages in %namespace/%name/__init__.py ([#836](https://www.github.com/googleapis/gapic-generator-python/issues/836)) ([90cf882](https://www.github.com/googleapis/gapic-generator-python/commit/90cf882b20f430499f692e6b9b23497b3555e928))
+
+### [0.43.2](https://www.github.com/googleapis/gapic-generator-python/compare/v0.43.1...v0.43.2) (2021-03-24)
+
+
+### Bug Fixes
+
+* add certain raw imports to RESERVED_NAMES ([#824](https://www.github.com/googleapis/gapic-generator-python/issues/824)) ([04bd8aa](https://www.github.com/googleapis/gapic-generator-python/commit/04bd8aaf0fc2c2c0615105cab39dc33266b66775))
+* Update module alias to resolve naming conflict ([#820](https://www.github.com/googleapis/gapic-generator-python/issues/820)) ([f5e9f36](https://www.github.com/googleapis/gapic-generator-python/commit/f5e9f367ec6a72b4272f559a93f6fbb3d7e54b8b)), closes [#819](https://www.github.com/googleapis/gapic-generator-python/issues/819)
+
+### [0.43.1](https://www.github.com/googleapis/gapic-generator-python/compare/v0.43.0...v0.43.1) (2021-03-19)
+
+
+### Bug Fixes
+
+* use correct retry deadline in publisher methods ([#814](https://www.github.com/googleapis/gapic-generator-python/issues/814)) ([92a2cfc](https://www.github.com/googleapis/gapic-generator-python/commit/92a2cfc47b24c4b1a041d5bbb944d69a67a962a2))
+
+## [0.43.0](https://www.github.com/googleapis/gapic-generator-python/compare/v0.42.2...v0.43.0) (2021-03-11)
+
+
+### Features
+
+* add bazel support for gapic metadata ([#811](https://www.github.com/googleapis/gapic-generator-python/issues/811)) ([7ced24a](https://www.github.com/googleapis/gapic-generator-python/commit/7ced24a0b20cb6505587b946c03b1b038eef4b4a))
+* update templates to permit enum aliases ([#809](https://www.github.com/googleapis/gapic-generator-python/issues/809)) ([2e7ea11](https://www.github.com/googleapis/gapic-generator-python/commit/2e7ea11f80210459106f9780e5f013e2a0381d29))
+
 ### [0.42.2](https://www.github.com/googleapis/gapic-generator-python/compare/v0.42.1...v0.42.2) (2021-03-05)
 
 
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project,
+and in the interest of fostering an open and welcoming community,
+we pledge to respect all people who contribute through reporting issues,
+posting feature requests, updating documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project
+a harassment-free experience for everyone,
+regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information,
+such as physical or electronic
+addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct.
+By adopting this Code of Conduct,
+project maintainers commit themselves to fairly and consistently
+applying these principles to every aspect of managing this project.
+Project maintainers who do not follow or enforce the Code of Conduct
+may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue
+or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0,
+available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2
@@ -93,6 +93,7 @@ class {{ service.name }}Transport(metaclass=abc.ABCMeta):
                         exceptions.{{ ex.__name__ }},
                         {%- endfor %}
                     ),
+                    deadline={{ method.timeout }},
                 ),
                 {%- endif %}
                 default_timeout={{ method.timeout }},
diff --git a/gapic/schema/metadata.py b/gapic/schema/metadata.py
@@ -115,9 +115,12 @@ def module_alias(self) -> str:
             return '_'.join(
                 (
                     ''.join(
-                        i[0]
-                        for i in self.package
-                        if i != self.api_naming.version
+                        [
+                            partial_name[0]
+                            for i in self.package
+                            for partial_name in i.split("_")
+                            if i != self.api_naming.version
+                        ]
                     ),
                     self.module,
                 )
diff --git a/gapic/templates/%namespace/%name/__init__.py.j2 b/gapic/templates/%namespace/%name/__init__.py.j2
@@ -46,7 +46,7 @@ from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.'
 __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')
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2
@@ -254,6 +254,7 @@ class {{ service.async_client_name }}:
                     exceptions.{{ ex.__name__ }},
                     {%- endfor %}
                 ),
+                deadline={{ method.timeout }},
             ),
             {%- endif %}
             default_timeout={{ method.timeout }},
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/base.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/base.py.j2
@@ -178,6 +178,7 @@ class {{ service.name }}Transport(abc.ABC):
                         exceptions.{{ ex.__name__ }},
                         {%- endfor %}
                     ),
+                    deadline={{ method.timeout }},
                 ),
                 {%- endif %}
                 default_timeout={{ method.timeout }},
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2
@@ -119,7 +119,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
             # If a channel was explicitly provided, set it.
             self._grpc_channel = channel
             self._ssl_channel_credentials = None
-        
+
         else:
             if api_mtls_endpoint:
                 host = api_mtls_endpoint
@@ -133,14 +133,14 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
                     )
                 else:
                     self._ssl_channel_credentials = SslCredentials().ssl_credentials
-            
+
             else:
                 if client_cert_source_for_mtls and not ssl_channel_credentials:
                     cert, key = client_cert_source_for_mtls()
                     self._ssl_channel_credentials = grpc.ssl_channel_credentials(
                         certificate_chain=cert, private_key=key
                     )
-        
+
         # The base transport sets the host, credentials and scopes
         super().__init__(
             host=host,
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2
@@ -124,7 +124,7 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
                 If provided, it overrides the ``host`` argument and tries to create
                 a mutual TLS channel with client SSL credentials from
                 ``client_cert_source`` or applicatin default SSL credentials.
-            client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): 
+            client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]):
                 Deprecated. A callback to provide client SSL certificate bytes and
                 private key bytes, both in PEM format. It is ignored if
                 ``api_mtls_endpoint`` is None.
@@ -136,10 +136,10 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
                 ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.
-            client_info (google.api_core.gapic_v1.client_info.ClientInfo):	
-                The client info used to send a user-agent string along with	
-                API requests. If ``None``, then default info will be used.	
-                Generally, you only need to set this if you're developing	
+            client_info (google.api_core.gapic_v1.client_info.ClientInfo):
+                The client info used to send a user-agent string along with
+                API requests. If ``None``, then default info will be used.
+                Generally, you only need to set this if you're developing
                 your own client library.
 
         Raises:
@@ -154,7 +154,7 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
         {%- if service.has_lro %}
         self._operations_client = None
         {%- endif %}
-    
+
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)
         if client_cert_source:
@@ -179,7 +179,7 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
                     )
                 else:
                     self._ssl_channel_credentials = SslCredentials().ssl_credentials
-            
+
             else:
                 if client_cert_source_for_mtls and not ssl_channel_credentials:
                     cert, key = client_cert_source_for_mtls()
@@ -353,7 +353,7 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
                 response_deserializer=iam_policy.TestIamPermissionsResponse.FromString,
             )
         return self._stubs["test_iam_permissions"]
-    {% endif %} 
+    {% endif %}
 
 __all__ = (
     '{{ service.name }}GrpcAsyncIOTransport',
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2
@@ -62,7 +62,7 @@ class {{ service.name }}RestTransport({{ service.name }}Transport):
                 credentials identify the application to the service; if none
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
-            
+
             credentials_file (Optional[str]): A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
                 This argument is ignored if ``channel`` is provided.
@@ -73,10 +73,10 @@ class {{ service.name }}RestTransport({{ service.name }}Transport):
                 if ``channel`` is provided.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.
-            client_info (google.api_core.gapic_v1.client_info.ClientInfo):	
-                The client info used to send a user-agent string along with	
-                API requests. If ``None``, then default info will be used.	
-                Generally, you only need to set this if you're developing	
+            client_info (google.api_core.gapic_v1.client_info.ClientInfo):
+                The client info used to send a user-agent string along with
+                API requests. If ``None``, then default info will be used.
+                Generally, you only need to set this if you're developing
                 your own client library.
         """
         # Run the base constructor
@@ -97,7 +97,7 @@ class {{ service.name }}RestTransport({{ service.name }}Transport):
         self._prep_wrapped_messages(client_info)
 
     {%- if service.has_lro %}
-    
+
     @property
     def operations_client(self) -> operations_v1.OperationsClient:
         """Create the client designed to process long-running operations.
@@ -152,7 +152,7 @@ class {{ service.name }}RestTransport({{ service.name }}Transport):
         {%- endif %}
         """
 
-        {# TODO(yon-mg): refactor when implementing grpc transcoding 
+        {# TODO(yon-mg): refactor when implementing grpc transcoding
                          - parse request pb & assign body, path params
                          - shove leftovers into query params
                          - make sure dotted nested fields preserved
diff --git a/gapic/utils/reserved_names.py b/gapic/utils/reserved_names.py
@@ -21,7 +21,15 @@
 # They are explicitly allowed message, module, and field names.
 RESERVED_NAMES = frozenset(
     itertools.chain(
+        # We CANNOT make exceptions for keywords.
         keyword.kwlist,
+        # We make SOME exceptions for certain names that collide with builtins.
         set(dir(builtins)) - {"filter", "map", "id", "input", "property"},
+        # This is a hand-maintained list of modules that are directly imported
+        # in templates, i.e. they are not added as dependencies to any type,
+        # the raw text is just there in the template.
+        # More can be added as collisions are discovered.
+        # See issue #819 for additional info.
+        {"auth", "credentials", "exceptions", "future", "options", "policy", "math"}
     )
 )
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
 click==7.1.2
-google-api-core==1.26.1
+google-api-core==1.26.3
 googleapis-common-protos==1.53.0
 jinja2==2.11.3
 MarkupSafe==1.1.1
-protobuf==3.15.5
+protobuf==3.15.8
 pypandoc==1.5
 PyYAML==5.4.1
 dataclasses==0.6  # TODO(busunkim) remove when 3.6 support is dropped
diff --git a/rules_python_gapic/py_gapic.bzl b/rules_python_gapic/py_gapic.bzl
@@ -18,13 +18,20 @@ def py_gapic_library(
         name,
         srcs,
         grpc_service_config = None,
-        plugin_args = [],
-        opt_args = [],
+        plugin_args = None,
+        opt_args = None,
+        metadata = True,
         **kwargs):
     #    srcjar_target_name = "%s_srcjar" % name
     srcjar_target_name = name
     srcjar_output_suffix = ".srcjar"
 
+    plugin_args = plugin_args or []
+    opt_args = opt_args or []
+
+    if metadata:
+        plugin_args.append("metadata")
+
     file_args = {}
     if grpc_service_config:
         file_args[grpc_service_config] =  "retry-config"
diff --git a/tests/unit/schema/test_metadata.py b/tests/unit/schema/test_metadata.py
@@ -184,6 +184,14 @@ def test_address_name_builtin_keyword():
     )
     assert addr_kword.module_alias == "gp_class"
 
+    addr_kword = metadata.Address(
+        name="Class",
+        module="class",
+        package=("google", "appengine_admin"),
+        api_naming=naming.NewNaming(proto_package="foo.bar.baz.v1"),
+    )
+    assert addr_kword.module_alias == "gaa_class"
+
 
 def test_doc_nothing():
     meta = metadata.Metadata()
