update goldens

Author: hebaalazzeh

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

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 """A compatibility module for older versions of google-api-core."""
-<<<<<<< HEAD
 
 from typing import Union
 import uuid
@@ -27,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -48,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return
@@ -65,5 +64,3 @@ def setup_request_id(
     else:
         if not getattr(request, field_name, None):
             setattr(request, field_name, str(uuid.uuid4()))
-=======
->>>>>>> main

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_compat.py

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 """Tests for the compatibility module for older versions of google-api-core."""
-<<<<<<< HEAD
 
 
 import re
@@ -101,5 +100,3 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
         assert re.match(UUID_REGEX, value)
     else:
         assert value == expected
-=======
->>>>>>> main

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return

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

@@ -26,7 +26,7 @@ def setup_request_id(
     field_name: str,
     is_proto3_optional: bool,
 ) -> None:
-    """Populate a UUID4 field in the request if it is not already set.Expand commentComment on line R35Resolved
+    """Populate a UUID4 field in the request if it is not already set.
 
     This helper is used to ensure request idempotency by automatically
     generating a unique identifier (such as `request_id`) for requests
@@ -47,7 +47,7 @@ def setup_request_id(
     if isinstance(request, dict):
         if is_proto3_optional:
             if field_name not in request or request[field_name] is None:
-                request[field_name] = str(uuid.uuid4())Expand commentComment on lines R54 to R56Resolved
+                request[field_name] = str(uuid.uuid4())
         elif not request.get(field_name):
             request[field_name] = str(uuid.uuid4())
         return