Skip to content

Commit b24ca28

Browse files
hebaalazzehhebaalazzeh
committed
update goldens
1 parent db48c94 commit b24ca28

15 files changed

Lines changed: 1 addition & 960 deletions

File tree

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
"""A compatibility module for older versions of google-api-core."""
17-
18-
from typing import Union
19-
import uuid
20-
21-
import google.protobuf.message
22-
23-
24-
def setup_request_id(
25-
request: Union[google.protobuf.message.Message, dict, None],
26-
field_name: str,
27-
is_proto3_optional: bool,
28-
) -> None:
29-
"""Populate a UUID4 field in the request if it is not already set.
30-
31-
This helper is used to ensure request idempotency by automatically
32-
generating a unique identifier (such as `request_id`) for requests
33-
that support it. If a request is retried, the same identifier can be
34-
sent on subsequent retries, allowing the server to recognize the retried
35-
request and prevent duplicate processing (e.g., creating duplicate
36-
resources).
37-
38-
Args:
39-
request (Union[google.protobuf.message.Message, dict]): The
40-
request object.
41-
field_name (str): The name of the field to populate.
42-
is_proto3_optional (bool): Whether the field is proto3 optional.
43-
"""
44-
if request is None:
45-
return
46-
47-
if isinstance(request, dict):
48-
if is_proto3_optional:
49-
if field_name not in request or request[field_name] is None:
50-
request[field_name] = str(uuid.uuid4())
51-
elif not request.get(field_name):
52-
request[field_name] = str(uuid.uuid4())
53-
return
54-
55-
if is_proto3_optional:
56-
try:
57-
# Pure protobuf messages
58-
if not request.HasField(field_name):
59-
setattr(request, field_name, str(uuid.uuid4()))
60-
except (AttributeError, ValueError):
61-
# Proto-plus messages or other objects
62-
if not getattr(request, field_name, None):
63-
setattr(request, field_name, str(uuid.uuid4()))
64-
else:
65-
if not getattr(request, field_name, None):
66-
setattr(request, field_name, str(uuid.uuid4()))

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

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -14,89 +14,3 @@
1414
# limitations under the License.
1515
#
1616
"""Tests for the compatibility module for older versions of google-api-core."""
17-
18-
19-
import re
20-
import pytest
21-
22-
from google.cloud.asset_v1._compat import setup_request_id
23-
24-
class MockRequest:
25-
def __init__(self, **kwargs):
26-
for k, v in kwargs.items():
27-
setattr(self, k, v)
28-
29-
def __contains__(self, key):
30-
return hasattr(self, key)
31-
32-
33-
class MockProtoRequest:
34-
def __init__(self, **kwargs):
35-
for k, v in kwargs.items():
36-
setattr(self, k, v)
37-
38-
def HasField(self, key):
39-
return hasattr(self, key)
40-
41-
42-
class MockValueErrorRequest:
43-
def HasField(self, key):
44-
raise ValueError("Mismatched field")
45-
46-
def __contains__(self, key):
47-
return hasattr(self, key)
48-
49-
UUID_REGEX = r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
50-
51-
@pytest.mark.parametrize(
52-
"request_obj, is_proto3_optional, expected",
53-
[
54-
(MockRequest(), True, "uuid"),
55-
(MockRequest(request_id="already_set"), True, "already_set"),
56-
(MockRequest(request_id=""), False, "uuid"),
57-
(MockRequest(request_id="already_set"), False, "already_set"),
58-
(MockProtoRequest(), True, "uuid"),
59-
(MockProtoRequest(request_id="already_set"), True, "already_set"),
60-
(MockValueErrorRequest(), True, "uuid"),
61-
({}, True, "uuid"),
62-
({"request_id": None}, True, "uuid"),
63-
({"request_id": "already_set"}, True, "already_set"),
64-
({"request_id": ""}, False, "uuid"),
65-
({"request_id": None}, False, "uuid"),
66-
({"request_id": "already_set"}, False, "already_set"),
67-
(None, True, "none"),
68-
],
69-
ids=[
70-
"proto3_optional_not_in_request",
71-
"proto3_optional_already_in_request",
72-
"non_proto3_optional_empty",
73-
"non_proto3_optional_already_set",
74-
"proto3_optional_not_in_request_proto",
75-
"proto3_optional_already_in_request_proto",
76-
"value_error_fallback",
77-
"dict_proto3_optional_not_in_request",
78-
"dict_proto3_optional_value_none",
79-
"dict_proto3_optional_already_in_request",
80-
"dict_non_proto3_optional_empty",
81-
"dict_non_proto3_optional_value_none",
82-
"dict_non_proto3_optional_already_set",
83-
"none_request",
84-
],
85-
)
86-
def test_setup_request_id(request_obj, is_proto3_optional, expected):
87-
setup_request_id(request_obj, "request_id", is_proto3_optional)
88-
89-
if expected == "none":
90-
assert request_obj is None
91-
return
92-
93-
value = (
94-
request_obj["request_id"]
95-
if isinstance(request_obj, dict)
96-
else request_obj.request_id
97-
)
98-
99-
if expected == "uuid":
100-
assert re.match(UUID_REGEX, value)
101-
else:
102-
assert value == expected

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
"""A compatibility module for older versions of google-api-core."""
17-
18-
from typing import Union
19-
import uuid
20-
21-
import google.protobuf.message
22-
23-
24-
def setup_request_id(
25-
request: Union[google.protobuf.message.Message, dict, None],
26-
field_name: str,
27-
is_proto3_optional: bool,
28-
) -> None:
29-
"""Populate a UUID4 field in the request if it is not already set.
30-
31-
This helper is used to ensure request idempotency by automatically
32-
generating a unique identifier (such as `request_id`) for requests
33-
that support it. If a request is retried, the same identifier can be
34-
sent on subsequent retries, allowing the server to recognize the retried
35-
request and prevent duplicate processing (e.g., creating duplicate
36-
resources).
37-
38-
Args:
39-
request (Union[google.protobuf.message.Message, dict]): The
40-
request object.
41-
field_name (str): The name of the field to populate.
42-
is_proto3_optional (bool): Whether the field is proto3 optional.
43-
"""
44-
if request is None:
45-
return
46-
47-
if isinstance(request, dict):
48-
if is_proto3_optional:
49-
if field_name not in request or request[field_name] is None:
50-
request[field_name] = str(uuid.uuid4())
51-
elif not request.get(field_name):
52-
request[field_name] = str(uuid.uuid4())
53-
return
54-
55-
if is_proto3_optional:
56-
try:
57-
# Pure protobuf messages
58-
if not request.HasField(field_name):
59-
setattr(request, field_name, str(uuid.uuid4()))
60-
except (AttributeError, ValueError):
61-
# Proto-plus messages or other objects
62-
if not getattr(request, field_name, None):
63-
setattr(request, field_name, str(uuid.uuid4()))
64-
else:
65-
if not getattr(request, field_name, None):
66-
setattr(request, field_name, str(uuid.uuid4()))

‎packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_compat.py‎

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -14,89 +14,3 @@
1414
# limitations under the License.
1515
#
1616
"""Tests for the compatibility module for older versions of google-api-core."""
17-
18-
19-
import re
20-
import pytest
21-
22-
from google.iam.credentials_v1._compat import setup_request_id
23-
24-
class MockRequest:
25-
def __init__(self, **kwargs):
26-
for k, v in kwargs.items():
27-
setattr(self, k, v)
28-
29-
def __contains__(self, key):
30-
return hasattr(self, key)
31-
32-
33-
class MockProtoRequest:
34-
def __init__(self, **kwargs):
35-
for k, v in kwargs.items():
36-
setattr(self, k, v)
37-
38-
def HasField(self, key):
39-
return hasattr(self, key)
40-
41-
42-
class MockValueErrorRequest:
43-
def HasField(self, key):
44-
raise ValueError("Mismatched field")
45-
46-
def __contains__(self, key):
47-
return hasattr(self, key)
48-
49-
UUID_REGEX = r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
50-
51-
@pytest.mark.parametrize(
52-
"request_obj, is_proto3_optional, expected",
53-
[
54-
(MockRequest(), True, "uuid"),
55-
(MockRequest(request_id="already_set"), True, "already_set"),
56-
(MockRequest(request_id=""), False, "uuid"),
57-
(MockRequest(request_id="already_set"), False, "already_set"),
58-
(MockProtoRequest(), True, "uuid"),
59-
(MockProtoRequest(request_id="already_set"), True, "already_set"),
60-
(MockValueErrorRequest(), True, "uuid"),
61-
({}, True, "uuid"),
62-
({"request_id": None}, True, "uuid"),
63-
({"request_id": "already_set"}, True, "already_set"),
64-
({"request_id": ""}, False, "uuid"),
65-
({"request_id": None}, False, "uuid"),
66-
({"request_id": "already_set"}, False, "already_set"),
67-
(None, True, "none"),
68-
],
69-
ids=[
70-
"proto3_optional_not_in_request",
71-
"proto3_optional_already_in_request",
72-
"non_proto3_optional_empty",
73-
"non_proto3_optional_already_set",
74-
"proto3_optional_not_in_request_proto",
75-
"proto3_optional_already_in_request_proto",
76-
"value_error_fallback",
77-
"dict_proto3_optional_not_in_request",
78-
"dict_proto3_optional_value_none",
79-
"dict_proto3_optional_already_in_request",
80-
"dict_non_proto3_optional_empty",
81-
"dict_non_proto3_optional_value_none",
82-
"dict_non_proto3_optional_already_set",
83-
"none_request",
84-
],
85-
)
86-
def test_setup_request_id(request_obj, is_proto3_optional, expected):
87-
setup_request_id(request_obj, "request_id", is_proto3_optional)
88-
89-
if expected == "none":
90-
assert request_obj is None
91-
return
92-
93-
value = (
94-
request_obj["request_id"]
95-
if isinstance(request_obj, dict)
96-
else request_obj.request_id
97-
)
98-
99-
if expected == "uuid":
100-
assert re.match(UUID_REGEX, value)
101-
else:
102-
assert value == expected

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
"""A compatibility module for older versions of google-api-core."""
17-
18-
from typing import Union
19-
import uuid
20-
21-
import google.protobuf.message
22-
23-
24-
def setup_request_id(
25-
request: Union[google.protobuf.message.Message, dict, None],
26-
field_name: str,
27-
is_proto3_optional: bool,
28-
) -> None:
29-
"""Populate a UUID4 field in the request if it is not already set.
30-
31-
This helper is used to ensure request idempotency by automatically
32-
generating a unique identifier (such as `request_id`) for requests
33-
that support it. If a request is retried, the same identifier can be
34-
sent on subsequent retries, allowing the server to recognize the retried
35-
request and prevent duplicate processing (e.g., creating duplicate
36-
resources).
37-
38-
Args:
39-
request (Union[google.protobuf.message.Message, dict]): The
40-
request object.
41-
field_name (str): The name of the field to populate.
42-
is_proto3_optional (bool): Whether the field is proto3 optional.
43-
"""
44-
if request is None:
45-
return
46-
47-
if isinstance(request, dict):
48-
if is_proto3_optional:
49-
if field_name not in request or request[field_name] is None:
50-
request[field_name] = str(uuid.uuid4())
51-
elif not request.get(field_name):
52-
request[field_name] = str(uuid.uuid4())
53-
return
54-
55-
if is_proto3_optional:
56-
try:
57-
# Pure protobuf messages
58-
if not request.HasField(field_name):
59-
setattr(request, field_name, str(uuid.uuid4()))
60-
except (AttributeError, ValueError):
61-
# Proto-plus messages or other objects
62-
if not getattr(request, field_name, None):
63-
setattr(request, field_name, str(uuid.uuid4()))
64-
else:
65-
if not getattr(request, field_name, None):
66-
setattr(request, field_name, str(uuid.uuid4()))

0 commit comments

Comments
 (0)