Skip to content

Commit 905d2b1

Browse files
committed
fix(generator): fix proto-plus field check in setup_request_id fallback
1 parent e5f8e13 commit 905d2b1

9 files changed

Lines changed: 9 additions & 9 deletions

File tree

  • packages/gapic-generator

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/_compat.py.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ except ImportError: # pragma: NO COVER
3232
setattr(request, field_name, request_id_val)
3333
except (AttributeError, ValueError):
3434
# Proto-plus messages or other objects
35-
if getattr(request, field_name, None) is None:
35+
if not getattr(request, field_name, None):
3636
setattr(request, field_name, request_id_val)
3737
else:
3838
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def setup_request_id(request, field_name: str, is_proto3_optional: bool): # pra
4545
setattr(request, field_name, request_id_val)
4646
except (AttributeError, ValueError):
4747
# Proto-plus messages or other objects
48-
if getattr(request, field_name, None) is None:
48+
if not getattr(request, field_name, None):
4949
setattr(request, field_name, request_id_val)
5050
else:
5151
if not getattr(request, field_name, None):

0 commit comments

Comments
 (0)