update goldens

Author: parthea

packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py

@@ -4209,17 +4209,16 @@ def test_create_job_rest_required_fields(request_type=storage_batch_operations.C
                 ),
             ]
             # Ensure that the uuid4 field is set according to AIP 4235
-            # and remove it so the expected/actual comparison succeeds.
-            # Otherwise, the actual will differ from the expected since
-            # this field was automatically populated.
-            found_field = None
             for i, (key, value) in enumerate(req.call_args.kwargs['params']):
                 if key == "requestId":
                     assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", value)
-                    found_field = i
                     break
-            if found_field is not None:
-                del req.call_args.kwargs['params'][found_field]
+
+            # Include requestId within expected_params with value mock.ANY
+            expected_params = [p for p in expected_params if p[0] != "requestId"]
+            expected_params.append(
+                ("requestId", mock.ANY)
+            )
             actual_params = req.call_args.kwargs['params']
             assert sorted(expected_params) == sorted(actual_params)
 
@@ -4388,17 +4387,16 @@ def test_delete_job_rest_required_fields(request_type=storage_batch_operations.D
             expected_params = [
             ]
             # Ensure that the uuid4 field is set according to AIP 4235
-            # and remove it so the expected/actual comparison succeeds.
-            # Otherwise, the actual will differ from the expected since
-            # this field was automatically populated.
-            found_field = None
             for i, (key, value) in enumerate(req.call_args.kwargs['params']):
                 if key == "requestId":
                     assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", value)
-                    found_field = i
                     break
-            if found_field is not None:
-                del req.call_args.kwargs['params'][found_field]
+
+            # Include requestId within expected_params with value mock.ANY
+            expected_params = [p for p in expected_params if p[0] != "requestId"]
+            expected_params.append(
+                ("requestId", mock.ANY)
+            )
             actual_params = req.call_args.kwargs['params']
             assert sorted(expected_params) == sorted(actual_params)
 
@@ -4565,17 +4563,16 @@ def test_cancel_job_rest_required_fields(request_type=storage_batch_operations.C
             expected_params = [
             ]
             # Ensure that the uuid4 field is set according to AIP 4235
-            # and remove it so the expected/actual comparison succeeds.
-            # Otherwise, the actual will differ from the expected since
-            # this field was automatically populated.
-            found_field = None
             for i, (key, value) in enumerate(req.call_args.kwargs['params']):
                 if key == "requestId":
                     assert re.match(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}", value)
-                    found_field = i
                     break
-            if found_field is not None:
-                del req.call_args.kwargs['params'][found_field]
+
+            # Include requestId within expected_params with value mock.ANY
+            expected_params = [p for p in expected_params if p[0] != "requestId"]
+            expected_params.append(
+                ("requestId", mock.ANY)
+            )
             actual_params = req.call_args.kwargs['params']
             assert sorted(expected_params) == sorted(actual_params)