Skip to content

Commit 8dbac4c

Browse files
hebaalazzehhebaalazzeh
committed
chore: revert google-api-core pyproject.toml edit
1 parent d0b42c8 commit 8dbac4c

15 files changed

Lines changed: 947 additions & 3321 deletions

File tree

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

Lines changed: 145 additions & 110 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: 23 additions & 567 deletions
Large diffs are not rendered by default.

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737

3838

3939
from .rest_base import _BaseIAMCredentialsRestTransport
40+
from google.iam.credentials_v1.iam_credentials._compat import transcode_request
41+
from google.iam.credentials_v1._compat import transcode_request
4042
from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO
4143

4244
try:
@@ -416,12 +418,12 @@ def __call__(self,
416418
http_options = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options()
417419

418420
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)
421+
transcoded_request, body, query_params = transcode_request(
422+
http_options,
423+
request,
424+
_BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._REQUIRED_FIELDS_DEFAULT_VALUES,
425+
False,
426+
)
425427

426428
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
427429
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -538,12 +540,12 @@ def __call__(self,
538540
http_options = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options()
539541

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 = transcode_request(
544+
http_options,
545+
request,
546+
_BaseIAMCredentialsRestTransport._BaseGenerateIdToken._REQUIRED_FIELDS_DEFAULT_VALUES,
547+
False,
548+
)
547549

548550
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
549551
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -660,12 +662,12 @@ def __call__(self,
660662
http_options = _BaseIAMCredentialsRestTransport._BaseSignBlob._get_http_options()
661663

662664
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)
665+
transcoded_request, body, query_params = transcode_request(
666+
http_options,
667+
request,
668+
_BaseIAMCredentialsRestTransport._BaseSignBlob._REQUIRED_FIELDS_DEFAULT_VALUES,
669+
False,
670+
)
669671

670672
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
671673
request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
@@ -782,12 +784,12 @@ def __call__(self,
782784
http_options = _BaseIAMCredentialsRestTransport._BaseSignJwt._get_http_options()
783785

784786
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)
787+
transcoded_request, body, query_params = transcode_request(
788+
http_options,
789+
request,
790+
_BaseIAMCredentialsRestTransport._BaseSignJwt._REQUIRED_FIELDS_DEFAULT_VALUES,
791+
False,
792+
)
791793

792794
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(logging.DEBUG): # pragma: NO COVER
793795
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: 3 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
import json # type: ignore
17-
from google.api_core import path_template
1816
from google.api_core import gapic_v1
1917

20-
from google.protobuf import json_format
2118
from .base import IAMCredentialsTransport, DEFAULT_CLIENT_INFO
2219

2320
import re
2421
from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
2522

26-
2723
from google.iam.credentials_v1.types import common
2824

29-
3025
class _BaseIAMCredentialsRestTransport(IAMCredentialsTransport):
3126
"""Base REST backend transport for IAMCredentials.
3227
@@ -89,13 +84,9 @@ class _BaseGenerateAccessToken:
8984
def __hash__(self): # pragma: NO COVER
9085
return NotImplementedError("__hash__ must be implemented.")
9186

92-
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
87+
_REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
9388
}
9489

95-
@classmethod
96-
def _get_unset_required_fields(cls, message_dict):
97-
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
98-
9990
@staticmethod
10091
def _get_http_options():
10192
http_options: List[Dict[str, str]] = [{
@@ -106,42 +97,13 @@ def _get_http_options():
10697
]
10798
return http_options
10899

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-
134100
class _BaseGenerateIdToken:
135101
def __hash__(self): # pragma: NO COVER
136102
return NotImplementedError("__hash__ must be implemented.")
137103

138-
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
104+
_REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
139105
}
140106

141-
@classmethod
142-
def _get_unset_required_fields(cls, message_dict):
143-
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
144-
145107
@staticmethod
146108
def _get_http_options():
147109
http_options: List[Dict[str, str]] = [{
@@ -152,42 +114,13 @@ def _get_http_options():
152114
]
153115
return http_options
154116

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-
180117
class _BaseSignBlob:
181118
def __hash__(self): # pragma: NO COVER
182119
return NotImplementedError("__hash__ must be implemented.")
183120

184-
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
121+
_REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
185122
}
186123

187-
@classmethod
188-
def _get_unset_required_fields(cls, message_dict):
189-
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
190-
191124
@staticmethod
192125
def _get_http_options():
193126
http_options: List[Dict[str, str]] = [{
@@ -198,42 +131,13 @@ def _get_http_options():
198131
]
199132
return http_options
200133

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-
226134
class _BaseSignJwt:
227135
def __hash__(self): # pragma: NO COVER
228136
return NotImplementedError("__hash__ must be implemented.")
229137

230138
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
231139
}
232140

233-
@classmethod
234-
def _get_unset_required_fields(cls, message_dict):
235-
return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
236-
237141
@staticmethod
238142
def _get_http_options():
239143
http_options: List[Dict[str, str]] = [{
@@ -244,32 +148,3 @@ def _get_http_options():
244148
]
245149
return http_options
246150

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-
272-
273-
__all__=(
274-
'_BaseIAMCredentialsRestTransport',
275-
)

0 commit comments

Comments
 (0)