fix: syntax fix for required_fields struct in rest transport (#1103)

googleapis · Dec 9, 2021 · 3d7128c · 3d7128c
1 parent 6d78f5e
commit 3d7128c
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 13 deletions.
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
@@ -170,7 +170,7 @@ class {{service.name}}RestTransport({{service.name}}Transport):
     {% if method.input.required_fields %}
     __{{ method.name | snake_case }}_required_fields_default_values =  {
     {% for req_field in method.input.required_fields if req_field.is_primitive %}
-        "{{ req_field.name | camel_case }}" : {% if req_field.field_pb.default_value is string %}"{{req_field.field_pb.default_value }}"{% else %}{{ req_field.field_pb.default_value }}{% endif %}{# default is str #}
+        "{{ req_field.name | camel_case }}" : {% if req_field.field_pb.default_value is string %}"{{req_field.field_pb.default_value }}"{% else %}{{ req_field.field_pb.default_value }}{% endif %},{# default is str #}
     {% endfor %}
     }
 

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
@@ -7,7 +7,9 @@ import mock
 
 import grpc
 from grpc.experimental import aio
+{% if "rest" in opts.transport %}
 import json
+{% endif %}
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule
@@ -37,11 +39,12 @@ from google.api_core import grpc_helpers_async
 from google.api_core import path_template
 {% if service.has_lro %}
 from google.api_core import future
-from google.api_core import operation
 from google.api_core import operations_v1
 from google.longrunning import operations_pb2
+{% if "rest" in opts.transport %}
 from google.protobuf import json_format
-{% endif %}
+{% endif %}{# rest transport #}
+{% endif %}{# lro #}
 from google.api_core import gapic_v1
 {% for method in service.methods.values() %}
 {% for ref_type in method.ref_types

diff --git a/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py b/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule
@@ -30,7 +29,6 @@
 from google.api_core import gapic_v1
 from google.api_core import grpc_helpers
 from google.api_core import grpc_helpers_async
-from google.api_core import operation
 from google.api_core import operation_async  # type: ignore
 from google.api_core import operations_v1
 from google.api_core import path_template
@@ -46,7 +44,6 @@
 from google.oauth2 import service_account
 from google.protobuf import duration_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import json_format
 from google.protobuf import timestamp_pb2  # type: ignore
 from google.type import expr_pb2  # type: ignore
 import google.auth

diff --git a/...s/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py b/...s/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule

diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule

diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule

diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule

diff --git a/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py b/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py
@@ -18,7 +18,6 @@
 
 import grpc
 from grpc.experimental import aio
-import json
 import math
 import pytest
 from proto.marshal.rules.dates import DurationRule, TimestampRule
@@ -30,7 +29,6 @@
 from google.api_core import gapic_v1
 from google.api_core import grpc_helpers
 from google.api_core import grpc_helpers_async
-from google.api_core import operation
 from google.api_core import operation_async  # type: ignore
 from google.api_core import operations_v1
 from google.api_core import path_template
@@ -44,7 +42,6 @@
 from google.longrunning import operations_pb2
 from google.oauth2 import service_account
 from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import json_format
 from google.protobuf import timestamp_pb2  # type: ignore
 import google.auth