merge branch 'feat/gapic-centralization-api-core-request-id' into feat/gapic-generator-centralization-request-id

Author: hebaalazzeh

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

@@ -52,7 +52,7 @@ def setup_request_id(
 
     if isinstance(request, dict):
         if is_proto3_optional:
-            if field_name not in request:
+            if field_name not in request or request[field_name] is None:
                 request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())

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

@@ -69,8 +69,10 @@ def __contains__(self, key):
         (MockValueErrorRequest(), True, "uuid"),
         # Dict cases
         ({}, True, "uuid"),
+        ({"request_id": None}, True, "uuid"),
         ({"request_id": "already_set"}, True, "already_set"),
         ({"request_id": ""}, False, "uuid"),
+        ({"request_id": None}, False, "uuid"),
         ({"request_id": "already_set"}, False, "already_set"),
         # None case
         (None, True, "none"),
@@ -84,8 +86,10 @@ def __contains__(self, key):
         "proto3_optional_already_in_request_proto",
         "value_error_fallback",
         "dict_proto3_optional_not_in_request",
+        "dict_proto3_optional_value_none",
         "dict_proto3_optional_already_in_request",
         "dict_non_proto3_optional_empty",
+        "dict_non_proto3_optional_value_none",
         "dict_non_proto3_optional_already_set",
         "none_request",
     ],