Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit d14dc96

Browse files
ohmayrohmayr
committed
update goldens
1 parent cd35dea commit d14dc96

File tree

11 files changed

+0
-198
lines changed

11 files changed

+0
-198
lines changed

‎tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
106106
Returns:
107107
AssetServiceAsyncClient: The constructed client.
108108
"""
109-
<<<<<<< HEAD
110-
<<<<<<< HEAD
111109
sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore
112110
return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs)
113-
=======
114-
return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
115-
>>>>>>> 70d9f452 (update goldens)
116-
=======
117-
sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore
118-
return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs)
119-
>>>>>>> 10a19604 (fix line length)
120111

121112
@classmethod
122113
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -132,17 +123,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
132123
Returns:
133124
AssetServiceAsyncClient: The constructed client.
134125
"""
135-
<<<<<<< HEAD
136-
<<<<<<< HEAD
137-
sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore
138-
return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs)
139-
=======
140-
return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
141-
>>>>>>> 70d9f452 (update goldens)
142-
=======
143126
sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore
144127
return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs)
145-
>>>>>>> 10a19604 (fix line length)
146128

147129
from_service_account_json = from_service_account_file
148130

‎tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9797
Returns:
9898
IAMCredentialsAsyncClient: The constructed client.
9999
"""
100-
<<<<<<< HEAD
101-
<<<<<<< HEAD
102100
sa_info_func = IAMCredentialsClient.from_service_account_info.__func__ # type: ignore
103101
return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs)
104-
=======
105-
return IAMCredentialsClient.from_service_account_info.__func__(IAMCredentialsAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
106-
>>>>>>> 70d9f452 (update goldens)
107-
=======
108-
sa_info_func = IAMCredentialsClient.from_service_account_info.__func__ # type: ignore
109-
return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs)
110-
>>>>>>> 10a19604 (fix line length)
111102

112103
@classmethod
113104
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -123,17 +114,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
123114
Returns:
124115
IAMCredentialsAsyncClient: The constructed client.
125116
"""
126-
<<<<<<< HEAD
127-
<<<<<<< HEAD
128-
sa_file_func = IAMCredentialsClient.from_service_account_file.__func__ # type: ignore
129-
return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs)
130-
=======
131-
return IAMCredentialsClient.from_service_account_file.__func__(IAMCredentialsAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
132-
>>>>>>> 70d9f452 (update goldens)
133-
=======
134117
sa_file_func = IAMCredentialsClient.from_service_account_file.__func__ # type: ignore
135118
return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs)
136-
>>>>>>> 10a19604 (fix line length)
137119

138120
from_service_account_json = from_service_account_file
139121

‎tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
124124
Returns:
125125
EventarcAsyncClient: The constructed client.
126126
"""
127-
<<<<<<< HEAD
128-
<<<<<<< HEAD
129127
sa_info_func = EventarcClient.from_service_account_info.__func__ # type: ignore
130128
return sa_info_func(EventarcAsyncClient, info, *args, **kwargs)
131-
=======
132-
return EventarcClient.from_service_account_info.__func__(EventarcAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
133-
>>>>>>> 70d9f452 (update goldens)
134-
=======
135-
sa_info_func = EventarcClient.from_service_account_info.__func__ # type: ignore
136-
return sa_info_func(EventarcAsyncClient, info, *args, **kwargs)
137-
>>>>>>> 10a19604 (fix line length)
138129

139130
@classmethod
140131
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -150,17 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
150141
Returns:
151142
EventarcAsyncClient: The constructed client.
152143
"""
153-
<<<<<<< HEAD
154-
<<<<<<< HEAD
155-
sa_file_func = EventarcClient.from_service_account_file.__func__ # type: ignore
156-
return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs)
157-
=======
158-
return EventarcClient.from_service_account_file.__func__(EventarcAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
159-
>>>>>>> 70d9f452 (update goldens)
160-
=======
161144
sa_file_func = EventarcClient.from_service_account_file.__func__ # type: ignore
162145
return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs)
163-
>>>>>>> 10a19604 (fix line length)
164146

165147
from_service_account_json = from_service_account_file
166148

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
104104
Returns:
105105
ConfigServiceV2AsyncClient: The constructed client.
106106
"""
107-
<<<<<<< HEAD
108-
<<<<<<< HEAD
109107
sa_info_func = ConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
110108
return sa_info_func(ConfigServiceV2AsyncClient, info, *args, **kwargs)
111-
=======
112-
return ConfigServiceV2Client.from_service_account_info.__func__(ConfigServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
113-
>>>>>>> 70d9f452 (update goldens)
114-
=======
115-
sa_info_func = ConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
116-
return sa_info_func(ConfigServiceV2AsyncClient, info, *args, **kwargs)
117-
>>>>>>> 10a19604 (fix line length)
118109

119110
@classmethod
120111
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -130,17 +121,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
130121
Returns:
131122
ConfigServiceV2AsyncClient: The constructed client.
132123
"""
133-
<<<<<<< HEAD
134-
<<<<<<< HEAD
135-
sa_file_func = ConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
136-
return sa_file_func(ConfigServiceV2AsyncClient, filename, *args, **kwargs)
137-
=======
138-
return ConfigServiceV2Client.from_service_account_file.__func__(ConfigServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
139-
>>>>>>> 70d9f452 (update goldens)
140-
=======
141124
sa_file_func = ConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
142125
return sa_file_func(ConfigServiceV2AsyncClient, filename, *args, **kwargs)
143-
>>>>>>> 10a19604 (fix line length)
144126

145127
from_service_account_json = from_service_account_file
146128

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
8989
Returns:
9090
LoggingServiceV2AsyncClient: The constructed client.
9191
"""
92-
<<<<<<< HEAD
93-
<<<<<<< HEAD
9492
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
9593
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
96-
=======
97-
return LoggingServiceV2Client.from_service_account_info.__func__(LoggingServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
98-
>>>>>>> 70d9f452 (update goldens)
99-
=======
100-
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
101-
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
102-
>>>>>>> 10a19604 (fix line length)
10394

10495
@classmethod
10596
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -115,17 +106,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
115106
Returns:
116107
LoggingServiceV2AsyncClient: The constructed client.
117108
"""
118-
<<<<<<< HEAD
119-
<<<<<<< HEAD
120-
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
121-
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
122-
=======
123-
return LoggingServiceV2Client.from_service_account_file.__func__(LoggingServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
124-
>>>>>>> 70d9f452 (update goldens)
125-
=======
126109
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
127110
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
128-
>>>>>>> 10a19604 (fix line length)
129111

130112
from_service_account_json = from_service_account_file
131113

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9090
Returns:
9191
MetricsServiceV2AsyncClient: The constructed client.
9292
"""
93-
<<<<<<< HEAD
94-
<<<<<<< HEAD
9593
sa_info_func = MetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
9694
return sa_info_func(MetricsServiceV2AsyncClient, info, *args, **kwargs)
97-
=======
98-
return MetricsServiceV2Client.from_service_account_info.__func__(MetricsServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
99-
>>>>>>> 70d9f452 (update goldens)
100-
=======
101-
sa_info_func = MetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
102-
return sa_info_func(MetricsServiceV2AsyncClient, info, *args, **kwargs)
103-
>>>>>>> 10a19604 (fix line length)
10495

10596
@classmethod
10697
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -116,17 +107,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
116107
Returns:
117108
MetricsServiceV2AsyncClient: The constructed client.
118109
"""
119-
<<<<<<< HEAD
120-
<<<<<<< HEAD
121-
sa_file_func = MetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
122-
return sa_file_func(MetricsServiceV2AsyncClient, filename, *args, **kwargs)
123-
=======
124-
return MetricsServiceV2Client.from_service_account_file.__func__(MetricsServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
125-
>>>>>>> 70d9f452 (update goldens)
126-
=======
127110
sa_file_func = MetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
128111
return sa_file_func(MetricsServiceV2AsyncClient, filename, *args, **kwargs)
129-
>>>>>>> 10a19604 (fix line length)
130112

131113
from_service_account_json = from_service_account_file
132114

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/config_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
104104
Returns:
105105
BaseConfigServiceV2AsyncClient: The constructed client.
106106
"""
107-
<<<<<<< HEAD
108-
<<<<<<< HEAD
109107
sa_info_func = BaseConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
110108
return sa_info_func(BaseConfigServiceV2AsyncClient, info, *args, **kwargs)
111-
=======
112-
return BaseConfigServiceV2Client.from_service_account_info.__func__(BaseConfigServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
113-
>>>>>>> 70d9f452 (update goldens)
114-
=======
115-
sa_info_func = BaseConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
116-
return sa_info_func(BaseConfigServiceV2AsyncClient, info, *args, **kwargs)
117-
>>>>>>> 10a19604 (fix line length)
118109

119110
@classmethod
120111
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -130,17 +121,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
130121
Returns:
131122
BaseConfigServiceV2AsyncClient: The constructed client.
132123
"""
133-
<<<<<<< HEAD
134-
<<<<<<< HEAD
135-
sa_file_func = BaseConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
136-
return sa_file_func(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs)
137-
=======
138-
return BaseConfigServiceV2Client.from_service_account_file.__func__(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
139-
>>>>>>> 70d9f452 (update goldens)
140-
=======
141124
sa_file_func = BaseConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
142125
return sa_file_func(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs)
143-
>>>>>>> 10a19604 (fix line length)
144126

145127
from_service_account_json = from_service_account_file
146128

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/logging_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
8989
Returns:
9090
LoggingServiceV2AsyncClient: The constructed client.
9191
"""
92-
<<<<<<< HEAD
93-
<<<<<<< HEAD
9492
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
9593
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
96-
=======
97-
return LoggingServiceV2Client.from_service_account_info.__func__(LoggingServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
98-
>>>>>>> 70d9f452 (update goldens)
99-
=======
100-
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
101-
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
102-
>>>>>>> 10a19604 (fix line length)
10394

10495
@classmethod
10596
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -115,17 +106,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
115106
Returns:
116107
LoggingServiceV2AsyncClient: The constructed client.
117108
"""
118-
<<<<<<< HEAD
119-
<<<<<<< HEAD
120-
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
121-
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
122-
=======
123-
return LoggingServiceV2Client.from_service_account_file.__func__(LoggingServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
124-
>>>>>>> 70d9f452 (update goldens)
125-
=======
126109
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
127110
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
128-
>>>>>>> 10a19604 (fix line length)
129111

130112
from_service_account_json = from_service_account_file
131113

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9090
Returns:
9191
BaseMetricsServiceV2AsyncClient: The constructed client.
9292
"""
93-
<<<<<<< HEAD
94-
<<<<<<< HEAD
9593
sa_info_func = BaseMetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
9694
return sa_info_func(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs)
97-
=======
98-
return BaseMetricsServiceV2Client.from_service_account_info.__func__(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
99-
>>>>>>> 70d9f452 (update goldens)
100-
=======
101-
sa_info_func = BaseMetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
102-
return sa_info_func(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs)
103-
>>>>>>> 10a19604 (fix line length)
10495

10596
@classmethod
10697
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -116,17 +107,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
116107
Returns:
117108
BaseMetricsServiceV2AsyncClient: The constructed client.
118109
"""
119-
<<<<<<< HEAD
120-
<<<<<<< HEAD
121-
sa_file_func = BaseMetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
122-
return sa_file_func(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs)
123-
=======
124-
return BaseMetricsServiceV2Client.from_service_account_file.__func__(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
125-
>>>>>>> 70d9f452 (update goldens)
126-
=======
127110
sa_file_func = BaseMetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
128111
return sa_file_func(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs)
129-
>>>>>>> 10a19604 (fix line length)
130112

131113
from_service_account_json = from_service_account_file
132114

‎tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
114114
Returns:
115115
CloudRedisAsyncClient: The constructed client.
116116
"""
117-
<<<<<<< HEAD
118-
<<<<<<< HEAD
119117
sa_info_func = CloudRedisClient.from_service_account_info.__func__ # type: ignore
120118
return sa_info_func(CloudRedisAsyncClient, info, *args, **kwargs)
121-
=======
122-
return CloudRedisClient.from_service_account_info.__func__(CloudRedisAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
123-
>>>>>>> 70d9f452 (update goldens)
124-
=======
125-
sa_info_func = CloudRedisClient.from_service_account_info.__func__ # type: ignore
126-
return sa_info_func(CloudRedisAsyncClient, info, *args, **kwargs)
127-
>>>>>>> 10a19604 (fix line length)
128119

129120
@classmethod
130121
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -140,17 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
140131
Returns:
141132
CloudRedisAsyncClient: The constructed client.
142133
"""
143-
<<<<<<< HEAD
144-
<<<<<<< HEAD
145-
sa_file_func = CloudRedisClient.from_service_account_file.__func__ # type: ignore
146-
return sa_file_func(CloudRedisAsyncClient, filename, *args, **kwargs)
147-
=======
148-
return CloudRedisClient.from_service_account_file.__func__(CloudRedisAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
149-
>>>>>>> 70d9f452 (update goldens)
150-
=======
151134
sa_file_func = CloudRedisClient.from_service_account_file.__func__ # type: ignore
152135
return sa_file_func(CloudRedisAsyncClient, filename, *args, **kwargs)
153-
>>>>>>> 10a19604 (fix line length)
154136

155137
from_service_account_json = from_service_account_file
156138

0 commit comments

Comments
 (0)