Skip to content

Commit 1d120c7

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
chore: Update gapic-generator-python to v1.23.2 (#529)
* chore: remove body selector from http rule PiperOrigin-RevId: 693215877 Source-Link: googleapis/googleapis@bb6b53e Source-Link: googleapis/googleapis-gen@db8b5a9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 chore: Configure Ruby clients for google-ads-ad_manager PiperOrigin-RevId: 689139590 Source-Link: googleapis/googleapis@296f2ac Source-Link: googleapis/googleapis-gen@2692736 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjY5MjczNjJlMGFhMTI5MzI1OGZjMjNmZTNjZTgzYzVjMjFkNWZiYiJ9 chore: Update gapic-generator-python to v1.19.1 PiperOrigin-RevId: 684571179 Source-Link: googleapis/googleapis@fbdc238 Source-Link: googleapis/googleapis-gen@3a2cdcf Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2EyY2RjZmI4MGMyZDBmNWVjMGNjNjYzYzJiYWIwYTk0ODYyMjlkMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add support for opt-in debug logging fix: Fix typing issue with gRPC metadata when key ends in -bin chore: Update gapic-generator-python to v1.21.0 PiperOrigin-RevId: 705285820 Source-Link: googleapis/googleapis@f9b8b91 Source-Link: googleapis/googleapis-gen@ca1e0a1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2ExZTBhMWU0NzJkNmU2ZjVkZTg4M2E1Y2I1NDcyNGYxMTJjZTM0OCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add REST Interceptors which support reading metadata feat: Add support for reading selective GAPIC generation methods from service YAML chore: Update gapic-generator-python to v1.22.0 PiperOrigin-RevId: 724026024 Source-Link: googleapis/googleapis@ad99638 Source-Link: googleapis/googleapis-gen@e291c4d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTI5MWM0ZGQxZDY3MGVkYTE5OTk4ZGU3NmY5NjdlMTYwM2E0ODk5MyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update gapic-generator-python to v1.23.2 PiperOrigin-RevId: 732281673 Source-Link: googleapis/googleapis@2f37e0a Source-Link: googleapis/googleapis-gen@016b753 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDE2Yjc1MzhiYTVhNzk4ZjJhZTQyM2Q0Y2NkN2Y4MmIwNmNkZjZkMiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent ffd913f commit 1d120c7

File tree

27 files changed

+4482
-2276
lines changed

27 files changed

+4482
-2276
lines changed

‎google/cloud/errorreporting_v1beta1/services/error_group_service/async_client.py‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
import logging as std_logging
1617
from collections import OrderedDict
1718
import re
1819
from typing import (
@@ -49,6 +50,15 @@
4950
from .transports.grpc_asyncio import ErrorGroupServiceGrpcAsyncIOTransport
5051
from .client import ErrorGroupServiceClient
5152

53+
try:
54+
from google.api_core import client_logging # type: ignore
55+
56+
CLIENT_LOGGING_SUPPORTED = True # pragma: NO COVER
57+
except ImportError: # pragma: NO COVER
58+
CLIENT_LOGGING_SUPPORTED = False
59+
60+
_LOGGER = std_logging.getLogger(__name__)
61+
5262

5363
class ErrorGroupServiceAsyncClient:
5464
"""Service for retrieving and updating individual error groups."""
@@ -260,14 +270,36 @@ def __init__(
260270
client_info=client_info,
261271
)
262272

273+
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
274+
std_logging.DEBUG
275+
): # pragma: NO COVER
276+
_LOGGER.debug(
277+
"Created client `google.devtools.clouderrorreporting_v1beta1.ErrorGroupServiceAsyncClient`.",
278+
extra={
279+
"serviceName": "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService",
280+
"universeDomain": getattr(
281+
self._client._transport._credentials, "universe_domain", ""
282+
),
283+
"credentialsType": f"{type(self._client._transport._credentials).__module__}.{type(self._client._transport._credentials).__qualname__}",
284+
"credentialsInfo": getattr(
285+
self.transport._credentials, "get_cred_info", lambda: None
286+
)(),
287+
}
288+
if hasattr(self._client._transport, "_credentials")
289+
else {
290+
"serviceName": "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService",
291+
"credentialsType": None,
292+
},
293+
)
294+
263295
async def get_group(
264296
self,
265297
request: Optional[Union[error_group_service.GetGroupRequest, dict]] = None,
266298
*,
267299
group_name: Optional[str] = None,
268300
retry: OptionalRetry = gapic_v1.method.DEFAULT,
269301
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
270-
metadata: Sequence[Tuple[str, str]] = (),
302+
metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
271303
) -> common.ErrorGroup:
272304
r"""Get the specified group.
273305
@@ -329,8 +361,10 @@ async def sample_get_group():
329361
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
330362
should be retried.
331363
timeout (float): The timeout for this request.
332-
metadata (Sequence[Tuple[str, str]]): Strings which should be
333-
sent along with the request as metadata.
364+
metadata (Sequence[Tuple[str, Union[str, bytes]]]): Key/value pairs which should be
365+
sent along with the request as metadata. Normally, each value must be of type `str`,
366+
but for metadata keys ending with the suffix `-bin`, the corresponding values must
367+
be of type `bytes`.
334368
335369
Returns:
336370
google.cloud.errorreporting_v1beta1.types.ErrorGroup:
@@ -341,7 +375,10 @@ async def sample_get_group():
341375
# Create or coerce a protobuf request object.
342376
# - Quick check: If we got a request object, we should *not* have
343377
# gotten any keyword arguments that map to the request.
344-
has_flattened_params = any([group_name])
378+
flattened_params = [group_name]
379+
has_flattened_params = (
380+
len([param for param in flattened_params if param is not None]) > 0
381+
)
345382
if request is not None and has_flattened_params:
346383
raise ValueError(
347384
"If the `request` argument is set, then none of "
@@ -393,7 +430,7 @@ async def update_group(
393430
group: Optional[common.ErrorGroup] = None,
394431
retry: OptionalRetry = gapic_v1.method.DEFAULT,
395432
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
396-
metadata: Sequence[Tuple[str, str]] = (),
433+
metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
397434
) -> common.ErrorGroup:
398435
r"""Replace the data for the specified group.
399436
Fails if the group does not exist.
@@ -437,8 +474,10 @@ async def sample_update_group():
437474
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
438475
should be retried.
439476
timeout (float): The timeout for this request.
440-
metadata (Sequence[Tuple[str, str]]): Strings which should be
441-
sent along with the request as metadata.
477+
metadata (Sequence[Tuple[str, Union[str, bytes]]]): Key/value pairs which should be
478+
sent along with the request as metadata. Normally, each value must be of type `str`,
479+
but for metadata keys ending with the suffix `-bin`, the corresponding values must
480+
be of type `bytes`.
442481
443482
Returns:
444483
google.cloud.errorreporting_v1beta1.types.ErrorGroup:
@@ -449,7 +488,10 @@ async def sample_update_group():
449488
# Create or coerce a protobuf request object.
450489
# - Quick check: If we got a request object, we should *not* have
451490
# gotten any keyword arguments that map to the request.
452-
has_flattened_params = any([group])
491+
flattened_params = [group]
492+
has_flattened_params = (
493+
len([param for param in flattened_params if param is not None]) > 0
494+
)
453495
if request is not None and has_flattened_params:
454496
raise ValueError(
455497
"If the `request` argument is set, then none of "

‎google/cloud/errorreporting_v1beta1/services/error_group_service/client.py‎

Lines changed: 86 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
# limitations under the License.
1515
#
1616
from collections import OrderedDict
17+
from http import HTTPStatus
18+
import json
19+
import logging as std_logging
1720
import os
1821
import re
1922
from typing import (
@@ -48,6 +51,15 @@
4851
except AttributeError: # pragma: NO COVER
4952
OptionalRetry = Union[retries.Retry, object, None] # type: ignore
5053

54+
try:
55+
from google.api_core import client_logging # type: ignore
56+
57+
CLIENT_LOGGING_SUPPORTED = True # pragma: NO COVER
58+
except ImportError: # pragma: NO COVER
59+
CLIENT_LOGGING_SUPPORTED = False
60+
61+
_LOGGER = std_logging.getLogger(__name__)
62+
5163
from google.cloud.errorreporting_v1beta1.types import common
5264
from google.cloud.errorreporting_v1beta1.types import error_group_service
5365
from .transports.base import ErrorGroupServiceTransport, DEFAULT_CLIENT_INFO
@@ -455,52 +467,45 @@ def _get_universe_domain(
455467
raise ValueError("Universe Domain cannot be an empty string.")
456468
return universe_domain
457469

458-
@staticmethod
459-
def _compare_universes(
460-
client_universe: str, credentials: ga_credentials.Credentials
461-
) -> bool:
462-
"""Returns True iff the universe domains used by the client and credentials match.
463-
464-
Args:
465-
client_universe (str): The universe domain configured via the client options.
466-
credentials (ga_credentials.Credentials): The credentials being used in the client.
470+
def _validate_universe_domain(self):
471+
"""Validates client's and credentials' universe domains are consistent.
467472
468473
Returns:
469-
bool: True iff client_universe matches the universe in credentials.
474+
bool: True iff the configured universe domain is valid.
470475
471476
Raises:
472-
ValueError: when client_universe does not match the universe in credentials.
477+
ValueError: If the configured universe domain is not valid.
473478
"""
474479

475-
default_universe = ErrorGroupServiceClient._DEFAULT_UNIVERSE
476-
credentials_universe = getattr(credentials, "universe_domain", default_universe)
477-
478-
if client_universe != credentials_universe:
479-
raise ValueError(
480-
"The configured universe domain "
481-
f"({client_universe}) does not match the universe domain "
482-
f"found in the credentials ({credentials_universe}). "
483-
"If you haven't configured the universe domain explicitly, "
484-
f"`{default_universe}` is the default."
485-
)
480+
# NOTE (b/349488459): universe validation is disabled until further notice.
486481
return True
487482

488-
def _validate_universe_domain(self):
489-
"""Validates client's and credentials' universe domains are consistent.
490-
491-
Returns:
492-
bool: True iff the configured universe domain is valid.
483+
def _add_cred_info_for_auth_errors(
484+
self, error: core_exceptions.GoogleAPICallError
485+
) -> None:
486+
"""Adds credential info string to error details for 401/403/404 errors.
493487
494-
Raises:
495-
ValueError: If the configured universe domain is not valid.
488+
Args:
489+
error (google.api_core.exceptions.GoogleAPICallError): The error to add the cred info.
496490
"""
497-
self._is_universe_domain_valid = (
498-
self._is_universe_domain_valid
499-
or ErrorGroupServiceClient._compare_universes(
500-
self.universe_domain, self.transport._credentials
501-
)
502-
)
503-
return self._is_universe_domain_valid
491+
if error.code not in [
492+
HTTPStatus.UNAUTHORIZED,
493+
HTTPStatus.FORBIDDEN,
494+
HTTPStatus.NOT_FOUND,
495+
]:
496+
return
497+
498+
cred = self._transport._credentials
499+
500+
# get_cred_info is only available in google-auth>=2.35.0
501+
if not hasattr(cred, "get_cred_info"):
502+
return
503+
504+
# ignore the type check since pypy test fails when get_cred_info
505+
# is not available
506+
cred_info = cred.get_cred_info() # type: ignore
507+
if cred_info and hasattr(error._details, "append"):
508+
error._details.append(json.dumps(cred_info))
504509

505510
@property
506511
def api_endpoint(self):
@@ -610,6 +615,10 @@ def __init__(
610615
# Initialize the universe domain validation.
611616
self._is_universe_domain_valid = False
612617

618+
if CLIENT_LOGGING_SUPPORTED: # pragma: NO COVER
619+
# Setup logging.
620+
client_logging.initialize_logging()
621+
613622
api_key_value = getattr(self._client_options, "api_key", None)
614623
if api_key_value and credentials:
615624
raise ValueError(
@@ -676,14 +685,37 @@ def __init__(
676685
api_audience=self._client_options.api_audience,
677686
)
678687

688+
if "async" not in str(self._transport):
689+
if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
690+
std_logging.DEBUG
691+
): # pragma: NO COVER
692+
_LOGGER.debug(
693+
"Created client `google.devtools.clouderrorreporting_v1beta1.ErrorGroupServiceClient`.",
694+
extra={
695+
"serviceName": "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService",
696+
"universeDomain": getattr(
697+
self._transport._credentials, "universe_domain", ""
698+
),
699+
"credentialsType": f"{type(self._transport._credentials).__module__}.{type(self._transport._credentials).__qualname__}",
700+
"credentialsInfo": getattr(
701+
self.transport._credentials, "get_cred_info", lambda: None
702+
)(),
703+
}
704+
if hasattr(self._transport, "_credentials")
705+
else {
706+
"serviceName": "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService",
707+
"credentialsType": None,
708+
},
709+
)
710+
679711
def get_group(
680712
self,
681713
request: Optional[Union[error_group_service.GetGroupRequest, dict]] = None,
682714
*,
683715
group_name: Optional[str] = None,
684716
retry: OptionalRetry = gapic_v1.method.DEFAULT,
685717
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
686-
metadata: Sequence[Tuple[str, str]] = (),
718+
metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
687719
) -> common.ErrorGroup:
688720
r"""Get the specified group.
689721
@@ -745,8 +777,10 @@ def sample_get_group():
745777
retry (google.api_core.retry.Retry): Designation of what errors, if any,
746778
should be retried.
747779
timeout (float): The timeout for this request.
748-
metadata (Sequence[Tuple[str, str]]): Strings which should be
749-
sent along with the request as metadata.
780+
metadata (Sequence[Tuple[str, Union[str, bytes]]]): Key/value pairs which should be
781+
sent along with the request as metadata. Normally, each value must be of type `str`,
782+
but for metadata keys ending with the suffix `-bin`, the corresponding values must
783+
be of type `bytes`.
750784
751785
Returns:
752786
google.cloud.errorreporting_v1beta1.types.ErrorGroup:
@@ -757,7 +791,10 @@ def sample_get_group():
757791
# Create or coerce a protobuf request object.
758792
# - Quick check: If we got a request object, we should *not* have
759793
# gotten any keyword arguments that map to the request.
760-
has_flattened_params = any([group_name])
794+
flattened_params = [group_name]
795+
has_flattened_params = (
796+
len([param for param in flattened_params if param is not None]) > 0
797+
)
761798
if request is not None and has_flattened_params:
762799
raise ValueError(
763800
"If the `request` argument is set, then none of "
@@ -806,7 +843,7 @@ def update_group(
806843
group: Optional[common.ErrorGroup] = None,
807844
retry: OptionalRetry = gapic_v1.method.DEFAULT,
808845
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
809-
metadata: Sequence[Tuple[str, str]] = (),
846+
metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
810847
) -> common.ErrorGroup:
811848
r"""Replace the data for the specified group.
812849
Fails if the group does not exist.
@@ -850,8 +887,10 @@ def sample_update_group():
850887
retry (google.api_core.retry.Retry): Designation of what errors, if any,
851888
should be retried.
852889
timeout (float): The timeout for this request.
853-
metadata (Sequence[Tuple[str, str]]): Strings which should be
854-
sent along with the request as metadata.
890+
metadata (Sequence[Tuple[str, Union[str, bytes]]]): Key/value pairs which should be
891+
sent along with the request as metadata. Normally, each value must be of type `str`,
892+
but for metadata keys ending with the suffix `-bin`, the corresponding values must
893+
be of type `bytes`.
855894
856895
Returns:
857896
google.cloud.errorreporting_v1beta1.types.ErrorGroup:
@@ -862,7 +901,10 @@ def sample_update_group():
862901
# Create or coerce a protobuf request object.
863902
# - Quick check: If we got a request object, we should *not* have
864903
# gotten any keyword arguments that map to the request.
865-
has_flattened_params = any([group])
904+
flattened_params = [group]
905+
has_flattened_params = (
906+
len([param for param in flattened_params if param is not None]) > 0
907+
)
866908
if request is not None and has_flattened_params:
867909
raise ValueError(
868910
"If the `request` argument is set, then none of "

‎google/cloud/errorreporting_v1beta1/services/error_group_service/transports/README.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
transport inheritance structure
3+
_______________________________
4+
5+
`ErrorGroupServiceTransport` is the ABC for all transports.
6+
- public child `ErrorGroupServiceGrpcTransport` for sync gRPC transport (defined in `grpc.py`).
7+
- public child `ErrorGroupServiceGrpcAsyncIOTransport` for async gRPC transport (defined in `grpc_asyncio.py`).
8+
- private child `_BaseErrorGroupServiceRestTransport` for base REST transport with inner classes `_BaseMETHOD` (defined in `rest_base.py`).
9+
- public child `ErrorGroupServiceRestTransport` for sync REST transport with inner classes `METHOD` derived from the parent's corresponding `_BaseMETHOD` classes (defined in `rest.py`).

0 commit comments

Comments
 (0)