Skip to content

Commit 9d38995

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#435)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 2a8c8b5 commit 9d38995

File tree

19 files changed

+195
-543
lines changed

19 files changed

+195
-543
lines changed

‎google/cloud/logging_v2/services/config_service_v2/async_client.py

Lines changed: 72 additions & 70 deletions
Large diffs are not rendered by default.

‎google/cloud/logging_v2/services/config_service_v2/client.py

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.cloud.logging_v2.services.config_service_v2 import pagers
3436
from google.cloud.logging_v2.types import logging_config
3537
from google.protobuf import field_mask_pb2 # type: ignore
@@ -405,7 +407,7 @@ def list_buckets(
405407
request: Union[logging_config.ListBucketsRequest, dict] = None,
406408
*,
407409
parent: str = None,
408-
retry: retries.Retry = gapic_v1.method.DEFAULT,
410+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
409411
timeout: float = None,
410412
metadata: Sequence[Tuple[str, str]] = (),
411413
) -> pagers.ListBucketsPager:
@@ -493,7 +495,7 @@ def get_bucket(
493495
self,
494496
request: Union[logging_config.GetBucketRequest, dict] = None,
495497
*,
496-
retry: retries.Retry = gapic_v1.method.DEFAULT,
498+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
497499
timeout: float = None,
498500
metadata: Sequence[Tuple[str, str]] = (),
499501
) -> logging_config.LogBucket:
@@ -540,7 +542,7 @@ def create_bucket(
540542
self,
541543
request: Union[logging_config.CreateBucketRequest, dict] = None,
542544
*,
543-
retry: retries.Retry = gapic_v1.method.DEFAULT,
545+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
544546
timeout: float = None,
545547
metadata: Sequence[Tuple[str, str]] = (),
546548
) -> logging_config.LogBucket:
@@ -589,7 +591,7 @@ def update_bucket(
589591
self,
590592
request: Union[logging_config.UpdateBucketRequest, dict] = None,
591593
*,
592-
retry: retries.Retry = gapic_v1.method.DEFAULT,
594+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
593595
timeout: float = None,
594596
metadata: Sequence[Tuple[str, str]] = (),
595597
) -> logging_config.LogBucket:
@@ -646,7 +648,7 @@ def delete_bucket(
646648
self,
647649
request: Union[logging_config.DeleteBucketRequest, dict] = None,
648650
*,
649-
retry: retries.Retry = gapic_v1.method.DEFAULT,
651+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
650652
timeout: float = None,
651653
metadata: Sequence[Tuple[str, str]] = (),
652654
) -> None:
@@ -690,7 +692,7 @@ def undelete_bucket(
690692
self,
691693
request: Union[logging_config.UndeleteBucketRequest, dict] = None,
692694
*,
693-
retry: retries.Retry = gapic_v1.method.DEFAULT,
695+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
694696
timeout: float = None,
695697
metadata: Sequence[Tuple[str, str]] = (),
696698
) -> None:
@@ -734,7 +736,7 @@ def list_views(
734736
request: Union[logging_config.ListViewsRequest, dict] = None,
735737
*,
736738
parent: str = None,
737-
retry: retries.Retry = gapic_v1.method.DEFAULT,
739+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
738740
timeout: float = None,
739741
metadata: Sequence[Tuple[str, str]] = (),
740742
) -> pagers.ListViewsPager:
@@ -814,7 +816,7 @@ def get_view(
814816
self,
815817
request: Union[logging_config.GetViewRequest, dict] = None,
816818
*,
817-
retry: retries.Retry = gapic_v1.method.DEFAULT,
819+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
818820
timeout: float = None,
819821
metadata: Sequence[Tuple[str, str]] = (),
820822
) -> logging_config.LogView:
@@ -863,7 +865,7 @@ def create_view(
863865
self,
864866
request: Union[logging_config.CreateViewRequest, dict] = None,
865867
*,
866-
retry: retries.Retry = gapic_v1.method.DEFAULT,
868+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
867869
timeout: float = None,
868870
metadata: Sequence[Tuple[str, str]] = (),
869871
) -> logging_config.LogView:
@@ -913,7 +915,7 @@ def update_view(
913915
self,
914916
request: Union[logging_config.UpdateViewRequest, dict] = None,
915917
*,
916-
retry: retries.Retry = gapic_v1.method.DEFAULT,
918+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
917919
timeout: float = None,
918920
metadata: Sequence[Tuple[str, str]] = (),
919921
) -> logging_config.LogView:
@@ -963,7 +965,7 @@ def delete_view(
963965
self,
964966
request: Union[logging_config.DeleteViewRequest, dict] = None,
965967
*,
966-
retry: retries.Retry = gapic_v1.method.DEFAULT,
968+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
967969
timeout: float = None,
968970
metadata: Sequence[Tuple[str, str]] = (),
969971
) -> None:
@@ -1006,7 +1008,7 @@ def list_sinks(
10061008
request: Union[logging_config.ListSinksRequest, dict] = None,
10071009
*,
10081010
parent: str = None,
1009-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1011+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10101012
timeout: float = None,
10111013
metadata: Sequence[Tuple[str, str]] = (),
10121014
) -> pagers.ListSinksPager:
@@ -1091,7 +1093,7 @@ def get_sink(
10911093
request: Union[logging_config.GetSinkRequest, dict] = None,
10921094
*,
10931095
sink_name: str = None,
1094-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1096+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10951097
timeout: float = None,
10961098
metadata: Sequence[Tuple[str, str]] = (),
10971099
) -> logging_config.LogSink:
@@ -1179,7 +1181,7 @@ def create_sink(
11791181
*,
11801182
parent: str = None,
11811183
sink: logging_config.LogSink = None,
1182-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1184+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11831185
timeout: float = None,
11841186
metadata: Sequence[Tuple[str, str]] = (),
11851187
) -> logging_config.LogSink:
@@ -1280,7 +1282,7 @@ def update_sink(
12801282
sink_name: str = None,
12811283
sink: logging_config.LogSink = None,
12821284
update_mask: field_mask_pb2.FieldMask = None,
1283-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1285+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12841286
timeout: float = None,
12851287
metadata: Sequence[Tuple[str, str]] = (),
12861288
) -> logging_config.LogSink:
@@ -1404,7 +1406,7 @@ def delete_sink(
14041406
request: Union[logging_config.DeleteSinkRequest, dict] = None,
14051407
*,
14061408
sink_name: str = None,
1407-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1409+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14081410
timeout: float = None,
14091411
metadata: Sequence[Tuple[str, str]] = (),
14101412
) -> None:
@@ -1479,7 +1481,7 @@ def list_exclusions(
14791481
request: Union[logging_config.ListExclusionsRequest, dict] = None,
14801482
*,
14811483
parent: str = None,
1482-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1484+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14831485
timeout: float = None,
14841486
metadata: Sequence[Tuple[str, str]] = (),
14851487
) -> pagers.ListExclusionsPager:
@@ -1564,7 +1566,7 @@ def get_exclusion(
15641566
request: Union[logging_config.GetExclusionRequest, dict] = None,
15651567
*,
15661568
name: str = None,
1567-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1569+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15681570
timeout: float = None,
15691571
metadata: Sequence[Tuple[str, str]] = (),
15701572
) -> logging_config.LogExclusion:
@@ -1653,7 +1655,7 @@ def create_exclusion(
16531655
*,
16541656
parent: str = None,
16551657
exclusion: logging_config.LogExclusion = None,
1656-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1658+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16571659
timeout: float = None,
16581660
metadata: Sequence[Tuple[str, str]] = (),
16591661
) -> logging_config.LogExclusion:
@@ -1757,7 +1759,7 @@ def update_exclusion(
17571759
name: str = None,
17581760
exclusion: logging_config.LogExclusion = None,
17591761
update_mask: field_mask_pb2.FieldMask = None,
1760-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1762+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17611763
timeout: float = None,
17621764
metadata: Sequence[Tuple[str, str]] = (),
17631765
) -> logging_config.LogExclusion:
@@ -1872,7 +1874,7 @@ def delete_exclusion(
18721874
request: Union[logging_config.DeleteExclusionRequest, dict] = None,
18731875
*,
18741876
name: str = None,
1875-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1877+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18761878
timeout: float = None,
18771879
metadata: Sequence[Tuple[str, str]] = (),
18781880
) -> None:
@@ -1944,7 +1946,7 @@ def get_cmek_settings(
19441946
self,
19451947
request: Union[logging_config.GetCmekSettingsRequest, dict] = None,
19461948
*,
1947-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1949+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19481950
timeout: float = None,
19491951
metadata: Sequence[Tuple[str, str]] = (),
19501952
) -> logging_config.CmekSettings:
@@ -2015,7 +2017,7 @@ def update_cmek_settings(
20152017
self,
20162018
request: Union[logging_config.UpdateCmekSettingsRequest, dict] = None,
20172019
*,
2018-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2020+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20192021
timeout: float = None,
20202022
metadata: Sequence[Tuple[str, str]] = (),
20212023
) -> logging_config.CmekSettings:

‎google/cloud/logging_v2/services/config_service_v2/transports/base.py

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -36,15 +35,6 @@
3635
except pkg_resources.DistributionNotFound:
3736
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3837

39-
try:
40-
# google.auth.__version__ was added in 1.26.0
41-
_GOOGLE_AUTH_VERSION = google.auth.__version__
42-
except AttributeError:
43-
try: # try pkg_resources if it is available
44-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
45-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
46-
_GOOGLE_AUTH_VERSION = None
47-
4838

4939
class ConfigServiceV2Transport(abc.ABC):
5040
"""Abstract transport class for ConfigServiceV2."""
@@ -99,7 +89,7 @@ def __init__(
9989
host += ":443"
10090
self._host = host
10191

102-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
92+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10393

10494
# Save the scopes.
10595
self._scopes = scopes
@@ -132,29 +122,6 @@ def __init__(
132122
# Save the credentials.
133123
self._credentials = credentials
134124

135-
# TODO(busunkim): This method is in the base transport
136-
# to avoid duplicating code across the transport classes. These functions
137-
# should be deleted once the minimum required versions of google-auth is increased.
138-
139-
# TODO: Remove this function once google-auth >= 1.25.0 is required
140-
@classmethod
141-
def _get_scopes_kwargs(
142-
cls, host: str, scopes: Optional[Sequence[str]]
143-
) -> Dict[str, Optional[Sequence[str]]]:
144-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
145-
146-
scopes_kwargs = {}
147-
148-
if _GOOGLE_AUTH_VERSION and (
149-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
150-
>= packaging.version.parse("1.25.0")
151-
):
152-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
153-
else:
154-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
155-
156-
return scopes_kwargs
157-
158125
def _prep_wrapped_messages(self, client_info):
159126
# Precompute the wrapped methods.
160127
self._wrapped_methods = {

‎google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

0 commit comments

Comments
 (0)