Skip to content

Commit 811f7cf

Browse files
hebaalazzehhebaalazzeh
committed
feat(templates): update generated client code across integration test goldens
1 parent 34f7c43 commit 811f7cf

21 files changed

Lines changed: 1535 additions & 3090 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
#
15-
1615
"""A compatibility module for older versions of google-api-core."""
1716

1817
import functools
@@ -93,7 +92,7 @@ def get_universe_domain(
9392
elif universe_domain_env is not None:
9493
universe_domain = universe_domain_env
9594
if len(universe_domain.strip()) == 0:
96-
raise ValueError("Universe Domain cannot be an empty string.")
95+
raise ValueError("Universe Domain cannot be an empty string.")
9796
return universe_domain
9897

9998

‎packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/transports/rest.py‎

Lines changed: 241 additions & 135 deletions
Large diffs are not rendered by default.

‎packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py‎

Lines changed: 1 addition & 466 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
#
15-
1615
"""A compatibility module for older versions of google-api-core."""
1716

1817
import functools
@@ -93,7 +92,7 @@ def get_universe_domain(
9392
elif universe_domain_env is not None:
9493
universe_domain = universe_domain_env
9594
if len(universe_domain.strip()) == 0:
96-
raise ValueError("Universe Domain cannot be an empty string.")
95+
raise ValueError("Universe Domain cannot be an empty string.")
9796
return universe_domain
9897

9998

‎packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/transports/rest.py‎

Lines changed: 41 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from google.auth import credentials as ga_credentials # type: ignore
2121
from google.api_core import exceptions as core_exceptions
2222
from google.api_core import retry as retries
23-
from google.api_core import rest_helpers
23+
from google.iam.credentials_v1 import _compat as rest_helpers
2424
from google.api_core import rest_streaming
2525
from google.api_core import gapic_v1
2626
import google.protobuf
@@ -414,14 +414,17 @@ def __call__(self,
414414
"""
415415

416416
http_options = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options()
417-
418417
request, metadata = self._interceptor.pre_generate_access_token(request, metadata)
419-
transcoded_request = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_transcoded_request(http_options, request)
420-
421-
body = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_request_body_json(transcoded_request)
422-
423-
# Jsonify the query params
424-
query_params = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_query_params_json(transcoded_request)
418+
transcoded_request, body, query_params = rest_helpers.transcode_request(
419+
http_options,
420+
request,
421+
required_fields_default_values=getattr(
422+
_BaseIAMCredentialsRestTransport._BaseGenerateAccessToken,
423+
"_BaseGenerateAccessToken__REQUIRED_FIELDS_DEFAULT_VALUES",
424+
None,
425+
),
426+
rest_numeric_enums=False,
427+
)
425428

426429
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
427430
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -536,14 +539,17 @@ def __call__(self,
536539
"""
537540

538541
http_options = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options()
539-
540542
request, metadata = self._interceptor.pre_generate_id_token(request, metadata)
541-
transcoded_request = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_transcoded_request(http_options, request)
542-
543-
body = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_request_body_json(transcoded_request)
544-
545-
# Jsonify the query params
546-
query_params = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_query_params_json(transcoded_request)
543+
transcoded_request, body, query_params = rest_helpers.transcode_request(
544+
http_options,
545+
request,
546+
required_fields_default_values=getattr(
547+
_BaseIAMCredentialsRestTransport._BaseGenerateIdToken,
548+
"_BaseGenerateIdToken__REQUIRED_FIELDS_DEFAULT_VALUES",
549+
None,
550+
),
551+
rest_numeric_enums=False,
552+
)
547553

548554
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
549555
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -658,14 +664,17 @@ def __call__(self,
658664
"""
659665

660666
http_options = _BaseIAMCredentialsRestTransport._BaseSignBlob._get_http_options()
661-
662667
request, metadata = self._interceptor.pre_sign_blob(request, metadata)
663-
transcoded_request = _BaseIAMCredentialsRestTransport._BaseSignBlob._get_transcoded_request(http_options, request)
664-
665-
body = _BaseIAMCredentialsRestTransport._BaseSignBlob._get_request_body_json(transcoded_request)
666-
667-
# Jsonify the query params
668-
query_params = _BaseIAMCredentialsRestTransport._BaseSignBlob._get_query_params_json(transcoded_request)
668+
transcoded_request, body, query_params = rest_helpers.transcode_request(
669+
http_options,
670+
request,
671+
required_fields_default_values=getattr(
672+
_BaseIAMCredentialsRestTransport._BaseSignBlob,
673+
"_BaseSignBlob__REQUIRED_FIELDS_DEFAULT_VALUES",
674+
None,
675+
),
676+
rest_numeric_enums=False,
677+
)
669678

670679
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
671680
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -780,14 +789,17 @@ def __call__(self,
780789
"""
781790

782791
http_options = _BaseIAMCredentialsRestTransport._BaseSignJwt._get_http_options()
783-
784792
request, metadata = self._interceptor.pre_sign_jwt(request, metadata)
785-
transcoded_request = _BaseIAMCredentialsRestTransport._BaseSignJwt._get_transcoded_request(http_options, request)
786-
787-
body = _BaseIAMCredentialsRestTransport._BaseSignJwt._get_request_body_json(transcoded_request)
788-
789-
# Jsonify the query params
790-
query_params = _BaseIAMCredentialsRestTransport._BaseSignJwt._get_query_params_json(transcoded_request)
793+
transcoded_request, body, query_params = rest_helpers.transcode_request(
794+
http_options,
795+
request,
796+
required_fields_default_values=getattr(
797+
_BaseIAMCredentialsRestTransport._BaseSignJwt,
798+
"_BaseSignJwt__REQUIRED_FIELDS_DEFAULT_VALUES",
799+
None,
800+
),
801+
rest_numeric_enums=False,
802+
)
791803

792804
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
793805
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])

‎packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/transports/rest_base.py‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def __hash__(self): # pragma: NO COVER
9595
@classmethod
9696
def _get_unset_required_fields(cls, message_dict):
9797
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
98-
9998
@staticmethod
10099
def _get_http_options():
101100
http_options: List[Dict[str, str]] = [{
@@ -106,31 +105,6 @@ def _get_http_options():
106105
]
107106
return http_options
108107

109-
@staticmethod
110-
def _get_transcoded_request(http_options, request):
111-
pb_request = common.GenerateAccessTokenRequest.pb(request)
112-
transcoded_request = path_template.transcode(http_options, pb_request)
113-
return transcoded_request
114-
115-
@staticmethod
116-
def _get_request_body_json(transcoded_request):
117-
# Jsonify the request body
118-
119-
body = json_format.MessageToJson(
120-
transcoded_request['body'],
121-
use_integers_for_enums=False
122-
)
123-
return body
124-
@staticmethod
125-
def _get_query_params_json(transcoded_request):
126-
query_params = json.loads(json_format.MessageToJson(
127-
transcoded_request['query_params'],
128-
use_integers_for_enums=False,
129-
))
130-
query_params.update(_BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_unset_required_fields(query_params))
131-
132-
return query_params
133-
134108
class _BaseGenerateIdToken:
135109
def __hash__(self): # pragma: NO COVER
136110
return NotImplementedError("__hash__ must be implemented.")
@@ -141,7 +115,6 @@ def __hash__(self): # pragma: NO COVER
141115
@classmethod
142116
def _get_unset_required_fields(cls, message_dict):
143117
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
144-
145118
@staticmethod
146119
def _get_http_options():
147120
http_options: List[Dict[str, str]] = [{
@@ -152,31 +125,6 @@ def _get_http_options():
152125
]
153126
return http_options
154127

155-
@staticmethod
156-
def _get_transcoded_request(http_options, request):
157-
pb_request = common.GenerateIdTokenRequest.pb(request)
158-
transcoded_request = path_template.transcode(http_options, pb_request)
159-
return transcoded_request
160-
161-
@staticmethod
162-
def _get_request_body_json(transcoded_request):
163-
# Jsonify the request body
164-
165-
body = json_format.MessageToJson(
166-
transcoded_request['body'],
167-
use_integers_for_enums=False
168-
)
169-
return body
170-
@staticmethod
171-
def _get_query_params_json(transcoded_request):
172-
query_params = json.loads(json_format.MessageToJson(
173-
transcoded_request['query_params'],
174-
use_integers_for_enums=False,
175-
))
176-
query_params.update(_BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_unset_required_fields(query_params))
177-
178-
return query_params
179-
180128
class _BaseSignBlob:
181129
def __hash__(self): # pragma: NO COVER
182130
return NotImplementedError("__hash__ must be implemented.")
@@ -187,7 +135,6 @@ def __hash__(self): # pragma: NO COVER
187135
@classmethod
188136
def _get_unset_required_fields(cls, message_dict):
189137
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
190-
191138
@staticmethod
192139
def _get_http_options():
193140
http_options: List[Dict[str, str]] = [{
@@ -198,31 +145,6 @@ def _get_http_options():
198145
]
199146
return http_options
200147

201-
@staticmethod
202-
def _get_transcoded_request(http_options, request):
203-
pb_request = common.SignBlobRequest.pb(request)
204-
transcoded_request = path_template.transcode(http_options, pb_request)
205-
return transcoded_request
206-
207-
@staticmethod
208-
def _get_request_body_json(transcoded_request):
209-
# Jsonify the request body
210-
211-
body = json_format.MessageToJson(
212-
transcoded_request['body'],
213-
use_integers_for_enums=False
214-
)
215-
return body
216-
@staticmethod
217-
def _get_query_params_json(transcoded_request):
218-
query_params = json.loads(json_format.MessageToJson(
219-
transcoded_request['query_params'],
220-
use_integers_for_enums=False,
221-
))
222-
query_params.update(_BaseIAMCredentialsRestTransport._BaseSignBlob._get_unset_required_fields(query_params))
223-
224-
return query_params
225-
226148
class _BaseSignJwt:
227149
def __hash__(self): # pragma: NO COVER
228150
return NotImplementedError("__hash__ must be implemented.")
@@ -233,7 +155,6 @@ def __hash__(self): # pragma: NO COVER
233155
@classmethod
234156
def _get_unset_required_fields(cls, message_dict):
235157
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
236-
237158
@staticmethod
238159
def _get_http_options():
239160
http_options: List[Dict[str, str]] = [{
@@ -244,31 +165,6 @@ def _get_http_options():
244165
]
245166
return http_options
246167

247-
@staticmethod
248-
def _get_transcoded_request(http_options, request):
249-
pb_request = common.SignJwtRequest.pb(request)
250-
transcoded_request = path_template.transcode(http_options, pb_request)
251-
return transcoded_request
252-
253-
@staticmethod
254-
def _get_request_body_json(transcoded_request):
255-
# Jsonify the request body
256-
257-
body = json_format.MessageToJson(
258-
transcoded_request['body'],
259-
use_integers_for_enums=False
260-
)
261-
return body
262-
@staticmethod
263-
def _get_query_params_json(transcoded_request):
264-
query_params = json.loads(json_format.MessageToJson(
265-
transcoded_request['query_params'],
266-
use_integers_for_enums=False,
267-
))
268-
query_params.update(_BaseIAMCredentialsRestTransport._BaseSignJwt._get_unset_required_fields(query_params))
269-
270-
return query_params
271-
272168

273169
__all__=(
274170
'_BaseIAMCredentialsRestTransport',

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
#
15-
1615
"""A compatibility module for older versions of google-api-core."""
1716

1817
import functools
@@ -93,7 +92,7 @@ def get_universe_domain(
9392
elif universe_domain_env is not None:
9493
universe_domain = universe_domain_env
9594
if len(universe_domain.strip()) == 0:
96-
raise ValueError("Universe Domain cannot be an empty string.")
95+
raise ValueError("Universe Domain cannot be an empty string.")
9796
return universe_domain
9897

9998

0 commit comments

Comments
 (0)