Skip to content

Commit 6288aa3

Browse files
committed
fix(api-core): use truthiness check in setup_request_id to support proto-plus messages
1 parent 6167e41 commit 6288aa3

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

packages/google-api-core/google/api_core/gapic_v1/requests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def setup_request_id(
6565
setattr(request, field_name, str(uuid.uuid4()))
6666
except (AttributeError, ValueError):
6767
# Proto-plus messages or other objects
68-
if getattr(request, field_name, None) is None:
68+
if not getattr(request, field_name, None):
6969
setattr(request, field_name, str(uuid.uuid4()))
7070
else:
7171
if not getattr(request, field_name, None):

packages/google-api-core/tests/unit/gapic/test_requests.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def HasField(self, key):
5353
# MockRequest cases
5454
(MockRequest(), True, "uuid"),
5555
(MockRequest(request_id="already_set"), True, "already_set"),
56-
(MockRequest(request_id=""), True, ""),
5756
(MockRequest(request_id=""), False, "uuid"),
5857
(MockRequest(request_id="already_set"), False, "already_set"),
5958
# MockProtoRequest cases
@@ -65,7 +64,6 @@ def HasField(self, key):
6564
({}, True, "uuid"),
6665
({"request_id": None}, True, "uuid"),
6766
({"request_id": "already_set"}, True, "already_set"),
68-
({"request_id": ""}, True, ""),
6967
({"request_id": ""}, False, "uuid"),
7068
({"request_id": None}, False, "uuid"),
7169
({"request_id": "already_set"}, False, "already_set"),
@@ -75,7 +73,6 @@ def HasField(self, key):
7573
ids=[
7674
"proto3_optional_not_in_request",
7775
"proto3_optional_already_in_request",
78-
"proto3_optional_explicit_empty",
7976
"non_proto3_optional_empty",
8077
"non_proto3_optional_already_set",
8178
"proto3_optional_not_in_request_proto",
@@ -84,7 +81,6 @@ def HasField(self, key):
8481
"dict_proto3_optional_not_in_request",
8582
"dict_proto3_optional_value_none",
8683
"dict_proto3_optional_already_in_request",
87-
"dict_proto3_optional_explicit_empty",
8884
"dict_non_proto3_optional_empty",
8985
"dict_non_proto3_optional_value_none",
9086
"dict_non_proto3_optional_already_set",

0 commit comments

Comments
 (0)