feat: enable self signed jwt for http (#1000)

googleapis · Sep 30, 2021 · 5f87973 · 5f87973
1 parent 0c40194
commit 5f87973
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 46 deletions.
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
@@ -305,10 +305,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
                 {% if "grpc" in opts.transport %}
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
                 {% endif %}
             )
 

diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
@@ -208,9 +208,7 @@ def test_{{ service.client_name|snake_case }}_client_options(client_class, trans
             client_cert_source_for_mtls=None,
             quota_project_id=None,
             client_info=transports.base.DEFAULT_CLIENT_INFO,
-            {% if 'grpc' in opts.transport %}
             always_use_jwt_access=True,
-            {% endif %}
         )
 
     # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -227,9 +225,7 @@ def test_{{ service.client_name|snake_case }}_client_options(client_class, trans
                 client_cert_source_for_mtls=None,
                 quota_project_id=None,
                 client_info=transports.base.DEFAULT_CLIENT_INFO,
-                {% if 'grpc' in opts.transport %}
                 always_use_jwt_access=True,
-                {% endif %}
             )
 
     # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -246,9 +242,7 @@ def test_{{ service.client_name|snake_case }}_client_options(client_class, trans
                 client_cert_source_for_mtls=None,
                 quota_project_id=None,
                 client_info=transports.base.DEFAULT_CLIENT_INFO,
-                {% if 'grpc' in opts.transport %}
                 always_use_jwt_access=True,
-                {% endif %}
             )
 
     # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has
@@ -275,9 +269,7 @@ def test_{{ service.client_name|snake_case }}_client_options(client_class, trans
             client_cert_source_for_mtls=None,
             quota_project_id="octopus",
             client_info=transports.base.DEFAULT_CLIENT_INFO,
-            {% if 'grpc' in opts.transport %}
             always_use_jwt_access=True,
-            {% endif %}
         )
 
 @pytest.mark.parametrize("client_class,transport_class,transport_name,use_client_cert_env", [
@@ -323,9 +315,7 @@ def test_{{ service.client_name|snake_case }}_mtls_env_auto(client_class, transp
                 client_cert_source_for_mtls=expected_client_cert_source,
                 quota_project_id=None,
                 client_info=transports.base.DEFAULT_CLIENT_INFO,
-                {% if 'grpc' in opts.transport %}
                 always_use_jwt_access=True,
-                {% endif %}
             )
 
     # Check the case ADC client cert is provided. Whether client cert is used depends on
@@ -351,9 +341,7 @@ def test_{{ service.client_name|snake_case }}_mtls_env_auto(client_class, transp
                         client_cert_source_for_mtls=expected_client_cert_source,
                         quota_project_id=None,
                         client_info=transports.base.DEFAULT_CLIENT_INFO,
-                        {% if 'grpc' in opts.transport %}
                         always_use_jwt_access=True,
-                        {% endif %}
                     )
 
     # Check the case client_cert_source and ADC client cert are not provided.
@@ -370,9 +358,7 @@ def test_{{ service.client_name|snake_case }}_mtls_env_auto(client_class, transp
                     client_cert_source_for_mtls=None,
                     quota_project_id=None,
                     client_info=transports.base.DEFAULT_CLIENT_INFO,
-                    {% if 'grpc' in opts.transport %}
                     always_use_jwt_access=True,
-                    {% endif %}
                 )
 
 
@@ -400,9 +386,7 @@ def test_{{ service.client_name|snake_case }}_client_options_scopes(client_class
             client_cert_source_for_mtls=None,
             quota_project_id=None,
             client_info=transports.base.DEFAULT_CLIENT_INFO,
-            {% if 'grpc' in opts.transport %}
             always_use_jwt_access=True,
-            {% endif %}
         )
 
 @pytest.mark.parametrize("client_class,transport_class,transport_name", [
@@ -429,9 +413,7 @@ def test_{{ service.client_name|snake_case }}_client_options_credentials_file(cl
             client_cert_source_for_mtls=None,
             quota_project_id=None,
             client_info=transports.base.DEFAULT_CLIENT_INFO,
-            {% if 'grpc' in opts.transport %}
             always_use_jwt_access=True,
-            {% endif %}
         )
 {% if 'grpc' in opts.transport %}
 

diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py
@@ -344,10 +344,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def export_assets(self,

diff --git a/...egration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py b/...egration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
@@ -340,10 +340,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def generate_access_token(self,

diff --git a/.../integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py b/.../integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py
@@ -375,10 +375,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def list_buckets(self,

diff --git a/...integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py b/...integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py
@@ -331,10 +331,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def delete_log(self,

diff --git a/...integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py b/...integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py
@@ -332,10 +332,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def list_log_metrics(self,

diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
@@ -355,10 +355,7 @@ def __init__(self, *,
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def list_instances(self,