Skip to content

fix(rest): Use strict encoding to lowercase query string bools #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parthea merged 2 commits into from
Sep 9, 2022
Merged

fix(rest): Use strict encoding to lowercase query string bools #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3768635
fix(rest): Use strict encoding to lowercase query string bools
vchudnov-g Sep 8, 2022
aec3ccc
Stringify test expected value to adapt to google-api-core changes
vchudnov-g Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/rest.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ class {{service.name}}RestTransport({{service.name}}Transport):
"{host}{uri}".format(host=self._host, uri=uri),
timeout=timeout,
headers=headers,
params=rest_helpers.flatten_query_params(query_params),
params=rest_helpers.flatten_query_params(query_params, strict=True),
{% if body_spec %}
data=body,
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion gapic/ads-templates/setup.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ setuptools.setup(
install_requires=(
{# TODO(dovs): remove when 1.x deprecation is complete #}
{% if 'rest' in opts.transport %}
'google-api-core[grpc] >= 2.4.0, < 3.0.0dev',
'google-api-core[grpc] >= 2.10.0, < 3.0.0dev',
{% else %}
'google-api-core[grpc] >= 1.28.0, < 3.0.0dev',
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
{% if req_field.field_pb.type == 9 %}
"{{ req_field.field_pb.default_value }}",
{% else %}
{{ req_field.type.python_type(req_field.field_pb.default_value or 0) }},
str({{ req_field.type.python_type(req_field.field_pb.default_value or 0) }}),
Copy link
Contributor

@vam-google vam-google Sep 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not seem right, and it fails generated unit tests for compute

Copy link
Contributor Author

@vchudnov-g vchudnov-g Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you mention it, yes, I think you're right. This "else" should be an "elseif" specific to bools. Yikes! That was quite an oversight on my part. Thanks for catching it.

{% endif %}{# default is str #}
),
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class {{service.name}}RestTransport({{service.name}}Transport):
"{host}{uri}".format(host=self._host, uri=uri),
timeout=timeout,
headers=headers,
params=rest_helpers.flatten_query_params(query_params),
params=rest_helpers.flatten_query_params(query_params, strict=True),
{% if body_spec %}
data=body,
{% endif %}
Expand Down
5 changes: 0 additions & 5 deletions gapic/templates/setup.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ setuptools.setup(
platforms='Posix; MacOS X; Windows',
include_package_data=True,
install_requires=(
{# TODO(dovs): remove when 1.x deprecation is complete #}
{% if 'rest' in opts.transport %}
'google-api-core[grpc] >= 2.10.0, < 3.0.0dev',
{% else %}
'google-api-core[grpc] >= 2.10.0, < 3.0.0dev',
{% endif %}
'libcst >= 0.2.5',
'googleapis-common-protos >= 1.55.0, <2.0.0dev',
'proto-plus >= 1.19.7',
Expand Down
2 changes: 1 addition & 1 deletion gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
{% if req_field.field_pb.type == 9 %}
"{{ req_field.field_pb.default_value }}",
{% else %}
{{ req_field.type.python_type(req_field.field_pb.default_value or 0) }},
str({{ req_field.type.python_type(req_field.field_pb.default_value or 0) }}),
{% endif %}{# default is str #}
),
{% endfor %}
Expand Down