Skip to content

Commit a705ae4

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#467)
- [ ] 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 7a4682d commit a705ae4

File tree

24 files changed

+385
-616
lines changed

24 files changed

+385
-616
lines changed

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/async_client.py‎

Lines changed: 62 additions & 58 deletions
Large diffs are not rendered by default.

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py‎

Lines changed: 21 additions & 19 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.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin import pagers
@@ -422,7 +424,7 @@ def create_instance(
422424
clusters: Sequence[
423425
bigtable_instance_admin.CreateInstanceRequest.ClustersEntry
424426
] = None,
425-
retry: retries.Retry = gapic_v1.method.DEFAULT,
427+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
426428
timeout: float = None,
427429
metadata: Sequence[Tuple[str, str]] = (),
428430
) -> operation.Operation:
@@ -539,7 +541,7 @@ def get_instance(
539541
request: Union[bigtable_instance_admin.GetInstanceRequest, dict] = None,
540542
*,
541543
name: str = None,
542-
retry: retries.Retry = gapic_v1.method.DEFAULT,
544+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
543545
timeout: float = None,
544546
metadata: Sequence[Tuple[str, str]] = (),
545547
) -> instance.Instance:
@@ -614,7 +616,7 @@ def list_instances(
614616
request: Union[bigtable_instance_admin.ListInstancesRequest, dict] = None,
615617
*,
616618
parent: str = None,
617-
retry: retries.Retry = gapic_v1.method.DEFAULT,
619+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
618620
timeout: float = None,
619621
metadata: Sequence[Tuple[str, str]] = (),
620622
) -> bigtable_instance_admin.ListInstancesResponse:
@@ -685,7 +687,7 @@ def update_instance(
685687
self,
686688
request: Union[instance.Instance, dict] = None,
687689
*,
688-
retry: retries.Retry = gapic_v1.method.DEFAULT,
690+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
689691
timeout: float = None,
690692
metadata: Sequence[Tuple[str, str]] = (),
691693
) -> instance.Instance:
@@ -749,7 +751,7 @@ def partial_update_instance(
749751
*,
750752
instance: gba_instance.Instance = None,
751753
update_mask: field_mask_pb2.FieldMask = None,
752-
retry: retries.Retry = gapic_v1.method.DEFAULT,
754+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
753755
timeout: float = None,
754756
metadata: Sequence[Tuple[str, str]] = (),
755757
) -> operation.Operation:
@@ -849,7 +851,7 @@ def delete_instance(
849851
request: Union[bigtable_instance_admin.DeleteInstanceRequest, dict] = None,
850852
*,
851853
name: str = None,
852-
retry: retries.Retry = gapic_v1.method.DEFAULT,
854+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
853855
timeout: float = None,
854856
metadata: Sequence[Tuple[str, str]] = (),
855857
) -> None:
@@ -916,7 +918,7 @@ def create_cluster(
916918
parent: str = None,
917919
cluster_id: str = None,
918920
cluster: instance.Cluster = None,
919-
retry: retries.Retry = gapic_v1.method.DEFAULT,
921+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
920922
timeout: float = None,
921923
metadata: Sequence[Tuple[str, str]] = (),
922924
) -> operation.Operation:
@@ -1020,7 +1022,7 @@ def get_cluster(
10201022
request: Union[bigtable_instance_admin.GetClusterRequest, dict] = None,
10211023
*,
10221024
name: str = None,
1023-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1025+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10241026
timeout: float = None,
10251027
metadata: Sequence[Tuple[str, str]] = (),
10261028
) -> instance.Cluster:
@@ -1094,7 +1096,7 @@ def list_clusters(
10941096
request: Union[bigtable_instance_admin.ListClustersRequest, dict] = None,
10951097
*,
10961098
parent: str = None,
1097-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1099+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10981100
timeout: float = None,
10991101
metadata: Sequence[Tuple[str, str]] = (),
11001102
) -> bigtable_instance_admin.ListClustersResponse:
@@ -1167,7 +1169,7 @@ def update_cluster(
11671169
self,
11681170
request: Union[instance.Cluster, dict] = None,
11691171
*,
1170-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1172+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11711173
timeout: float = None,
11721174
metadata: Sequence[Tuple[str, str]] = (),
11731175
) -> operation.Operation:
@@ -1232,7 +1234,7 @@ def delete_cluster(
12321234
request: Union[bigtable_instance_admin.DeleteClusterRequest, dict] = None,
12331235
*,
12341236
name: str = None,
1235-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1237+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12361238
timeout: float = None,
12371239
metadata: Sequence[Tuple[str, str]] = (),
12381240
) -> None:
@@ -1299,7 +1301,7 @@ def create_app_profile(
12991301
parent: str = None,
13001302
app_profile_id: str = None,
13011303
app_profile: instance.AppProfile = None,
1302-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1304+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13031305
timeout: float = None,
13041306
metadata: Sequence[Tuple[str, str]] = (),
13051307
) -> instance.AppProfile:
@@ -1392,7 +1394,7 @@ def get_app_profile(
13921394
request: Union[bigtable_instance_admin.GetAppProfileRequest, dict] = None,
13931395
*,
13941396
name: str = None,
1395-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1397+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13961398
timeout: float = None,
13971399
metadata: Sequence[Tuple[str, str]] = (),
13981400
) -> instance.AppProfile:
@@ -1465,7 +1467,7 @@ def list_app_profiles(
14651467
request: Union[bigtable_instance_admin.ListAppProfilesRequest, dict] = None,
14661468
*,
14671469
parent: str = None,
1468-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1470+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14691471
timeout: float = None,
14701472
metadata: Sequence[Tuple[str, str]] = (),
14711473
) -> pagers.ListAppProfilesPager:
@@ -1550,7 +1552,7 @@ def update_app_profile(
15501552
*,
15511553
app_profile: instance.AppProfile = None,
15521554
update_mask: field_mask_pb2.FieldMask = None,
1553-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1555+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15541556
timeout: float = None,
15551557
metadata: Sequence[Tuple[str, str]] = (),
15561558
) -> operation.Operation:
@@ -1643,7 +1645,7 @@ def delete_app_profile(
16431645
request: Union[bigtable_instance_admin.DeleteAppProfileRequest, dict] = None,
16441646
*,
16451647
name: str = None,
1646-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1648+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16471649
timeout: float = None,
16481650
metadata: Sequence[Tuple[str, str]] = (),
16491651
) -> None:
@@ -1708,7 +1710,7 @@ def get_iam_policy(
17081710
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
17091711
*,
17101712
resource: str = None,
1711-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1713+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17121714
timeout: float = None,
17131715
metadata: Sequence[Tuple[str, str]] = (),
17141716
) -> policy_pb2.Policy:
@@ -1835,7 +1837,7 @@ def set_iam_policy(
18351837
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
18361838
*,
18371839
resource: str = None,
1838-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1840+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18391841
timeout: float = None,
18401842
metadata: Sequence[Tuple[str, str]] = (),
18411843
) -> policy_pb2.Policy:
@@ -1962,7 +1964,7 @@ def test_iam_permissions(
19621964
*,
19631965
resource: str = None,
19641966
permissions: Sequence[str] = None,
1965-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1967+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19661968
timeout: float = None,
19671969
metadata: Sequence[Tuple[str, str]] = (),
19681970
) -> iam_policy_pb2.TestIamPermissionsResponse:

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/base.py‎

Lines changed: 2 additions & 35 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
@@ -43,15 +42,6 @@
4342
except pkg_resources.DistributionNotFound:
4443
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4544

46-
try:
47-
# google.auth.__version__ was added in 1.26.0
48-
_GOOGLE_AUTH_VERSION = google.auth.__version__
49-
except AttributeError:
50-
try: # try pkg_resources if it is available
51-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
52-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
53-
_GOOGLE_AUTH_VERSION = None
54-
5545

5646
class BigtableInstanceAdminTransport(abc.ABC):
5747
"""Abstract transport class for BigtableInstanceAdmin."""
@@ -109,7 +99,7 @@ def __init__(
10999
host += ":443"
110100
self._host = host
111101

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

114104
# Save the scopes.
115105
self._scopes = scopes
@@ -142,29 +132,6 @@ def __init__(
142132
# Save the credentials.
143133
self._credentials = credentials
144134

145-
# TODO(busunkim): This method is in the base transport
146-
# to avoid duplicating code across the transport classes. These functions
147-
# should be deleted once the minimum required versions of google-auth is increased.
148-
149-
# TODO: Remove this function once google-auth >= 1.25.0 is required
150-
@classmethod
151-
def _get_scopes_kwargs(
152-
cls, host: str, scopes: Optional[Sequence[str]]
153-
) -> Dict[str, Optional[Sequence[str]]]:
154-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
155-
156-
scopes_kwargs = {}
157-
158-
if _GOOGLE_AUTH_VERSION and (
159-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
160-
>= packaging.version.parse("1.25.0")
161-
):
162-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
163-
else:
164-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
165-
166-
return scopes_kwargs
167-
168135
def _prep_wrapped_messages(self, client_info):
169136
# Precompute the wrapped methods.
170137
self._wrapped_methods = {
@@ -381,7 +348,7 @@ def close(self):
381348
raise NotImplementedError()
382349

383350
@property
384-
def operations_client(self) -> operations_v1.OperationsClient:
351+
def operations_client(self):
385352
"""Return the client designed to process long-running operations."""
386353
raise NotImplementedError()
387354

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def __init__(
119119
self._grpc_channel = None
120120
self._ssl_channel_credentials = ssl_channel_credentials
121121
self._stubs: Dict[str, Callable] = {}
122-
self._operations_client = None
122+
self._operations_client: Optional[operations_v1.OperationsClient] = None
123123

124124
if api_mtls_endpoint:
125125
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc_asyncio.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -166,7 +165,7 @@ def __init__(
166165
self._grpc_channel = None
167166
self._ssl_channel_credentials = ssl_channel_credentials
168167
self._stubs: Dict[str, Callable] = {}
169-
self._operations_client = None
168+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
170169

171170
if api_mtls_endpoint:
172171
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)