Skip to content

Commit a7a7699

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
fix(deps): require google-api-core>=1.32.0,>=2.8.0 (#608)
feat: add audience parameter feat: Add storage_utilization_gib_per_node to Autoscaling target feat: Cloud Bigtable Undelete Table service and message proto files * feat: add audience parameter PiperOrigin-RevId: 456827138 Source-Link: googleapis/googleapis@23f1a15 Source-Link: googleapis/googleapis-gen@4075a85 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add storage_utilization_gib_per_node to Autoscaling target PiperOrigin-RevId: 457776307 Source-Link: googleapis/googleapis@982bb69 Source-Link: googleapis/googleapis-gen@0aff3eb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMGFmZjNlYmNjOGZiM2MxMGI2NzFlZTM4NmI0ZDI2MzAxMmQzZDAxMyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Cloud Bigtable Undelete Table service and message proto files PiperOrigin-RevId: 457778403 Source-Link: googleapis/googleapis@2b0fe3b Source-Link: googleapis/googleapis-gen@ca2a2c5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2EyYTJjNTVjYWZjYTRiODc2MzA1YjBiMTJmNzZjZTBmMTY2ZGRjYyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: use gapic-generator-python 1.1.1 PiperOrigin-RevId: 459095142 Source-Link: googleapis/googleapis@4f1be99 Source-Link: googleapis/googleapis-gen@ae686d9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Synchronize new proto/yaml changes. PiperOrigin-RevId: 459539123 Source-Link: googleapis/googleapis@2e0497d Source-Link: googleapis/googleapis-gen@d56d71b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDU2ZDcxYmVkOGY4ZDdiYzk3NzEwNTZmOGM1ZjI2NzFlN2YxMTRhMyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix(deps): require google-api-core>=1.32.0,>=2.8.0 * trigger ci Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent 2363e4d commit a7a7699

File tree

28 files changed

+828
-36
lines changed

28 files changed

+828
-36
lines changed

‎google/cloud/bigtable_admin_v2/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
from .types.bigtable_table_admin import RestoreTableRequest
7474
from .types.bigtable_table_admin import SnapshotTableMetadata
7575
from .types.bigtable_table_admin import SnapshotTableRequest
76+
from .types.bigtable_table_admin import UndeleteTableMetadata
77+
from .types.bigtable_table_admin import UndeleteTableRequest
7678
from .types.bigtable_table_admin import UpdateBackupRequest
7779
from .types.common import OperationProgress
7880
from .types.common import StorageType
@@ -164,6 +166,8 @@
164166
"SnapshotTableRequest",
165167
"StorageType",
166168
"Table",
169+
"UndeleteTableMetadata",
170+
"UndeleteTableRequest",
167171
"UpdateAppProfileMetadata",
168172
"UpdateAppProfileRequest",
169173
"UpdateBackupRequest",

‎google/cloud/bigtable_admin_v2/gapic_metadata.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,11 @@
339339
"test_iam_permissions"
340340
]
341341
},
342+
"UndeleteTable": {
343+
"methods": [
344+
"undelete_table"
345+
]
346+
},
342347
"UpdateBackup": {
343348
"methods": [
344349
"update_backup"
@@ -454,6 +459,11 @@
454459
"test_iam_permissions"
455460
]
456461
},
462+
"UndeleteTable": {
463+
"methods": [
464+
"undelete_table"
465+
]
466+
},
457467
"UpdateBackup": {
458468
"methods": [
459469
"update_backup"

‎google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ def __init__(
548548
quota_project_id=client_options.quota_project_id,
549549
client_info=client_info,
550550
always_use_jwt_access=True,
551+
api_audience=client_options.api_audience,
551552
)
552553

553554
def create_instance(

‎google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/base.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def __init__(
6868
quota_project_id: Optional[str] = None,
6969
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
7070
always_use_jwt_access: Optional[bool] = False,
71+
api_audience: Optional[str] = None,
7172
**kwargs,
7273
) -> None:
7374
"""Instantiate the transport.
@@ -95,11 +96,6 @@ def __init__(
9596
be used for service account credentials.
9697
"""
9798

98-
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
99-
if ":" not in host:
100-
host += ":443"
101-
self._host = host
102-
10399
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
104100

105101
# Save the scopes.
@@ -120,6 +116,11 @@ def __init__(
120116
credentials, _ = google.auth.default(
121117
**scopes_kwargs, quota_project_id=quota_project_id
122118
)
119+
# Don't apply audience if the credentials file passed from user.
120+
if hasattr(credentials, "with_gdch_audience"):
121+
credentials = credentials.with_gdch_audience(
122+
api_audience if api_audience else host
123+
)
123124

124125
# If the credentials are service account credentials, then always try to use self signed JWT.
125126
if (
@@ -132,6 +133,11 @@ def __init__(
132133
# Save the credentials.
133134
self._credentials = credentials
134135

136+
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
137+
if ":" not in host:
138+
host += ":443"
139+
self._host = host
140+
135141
def _prep_wrapped_messages(self, client_info):
136142
# Precompute the wrapped methods.
137143
self._wrapped_methods = {

‎google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def __init__(
6767
quota_project_id: Optional[str] = None,
6868
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6969
always_use_jwt_access: Optional[bool] = False,
70+
api_audience: Optional[str] = None,
7071
) -> None:
7172
"""Instantiate the transport.
7273
@@ -163,6 +164,7 @@ def __init__(
163164
quota_project_id=quota_project_id,
164165
client_info=client_info,
165166
always_use_jwt_access=always_use_jwt_access,
167+
api_audience=api_audience,
166168
)
167169

168170
if not self._grpc_channel:

‎google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def __init__(
112112
quota_project_id=None,
113113
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
114114
always_use_jwt_access: Optional[bool] = False,
115+
api_audience: Optional[str] = None,
115116
) -> None:
116117
"""Instantiate the transport.
117118
@@ -208,6 +209,7 @@ def __init__(
208209
quota_project_id=quota_project_id,
209210
client_info=client_info,
210211
always_use_jwt_access=always_use_jwt_access,
212+
api_audience=api_audience,
211213
)
212214

213215
if not self._grpc_channel:

‎google/cloud/bigtable_admin_v2/services/bigtable_table_admin/async_client.py‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,95 @@ async def delete_table(
715715
metadata=metadata,
716716
)
717717

718+
async def undelete_table(
719+
self,
720+
request: Union[bigtable_table_admin.UndeleteTableRequest, dict] = None,
721+
*,
722+
name: str = None,
723+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
724+
timeout: float = None,
725+
metadata: Sequence[Tuple[str, str]] = (),
726+
) -> operation_async.AsyncOperation:
727+
r"""Restores a specified table which was accidentally
728+
deleted.
729+
730+
Args:
731+
request (Union[google.cloud.bigtable_admin_v2.types.UndeleteTableRequest, dict]):
732+
The request object. Request message for
733+
[google.bigtable.admin.v2.BigtableTableAdmin.UndeleteTable][google.bigtable.admin.v2.BigtableTableAdmin.UndeleteTable]
734+
name (:class:`str`):
735+
Required. The unique name of the table to be restored.
736+
Values are of the form
737+
``projects/{project}/instances/{instance}/tables/{table}``.
738+
739+
This corresponds to the ``name`` field
740+
on the ``request`` instance; if ``request`` is provided, this
741+
should not be set.
742+
retry (google.api_core.retry.Retry): Designation of what errors, if any,
743+
should be retried.
744+
timeout (float): The timeout for this request.
745+
metadata (Sequence[Tuple[str, str]]): Strings which should be
746+
sent along with the request as metadata.
747+
748+
Returns:
749+
google.api_core.operation_async.AsyncOperation:
750+
An object representing a long-running operation.
751+
752+
The result type for the operation will be :class:`google.cloud.bigtable_admin_v2.types.Table` A collection of user data indexed by row, column, and timestamp.
753+
Each table is served using the resources of its
754+
parent cluster.
755+
756+
"""
757+
# Create or coerce a protobuf request object.
758+
# Quick check: If we got a request object, we should *not* have
759+
# gotten any keyword arguments that map to the request.
760+
has_flattened_params = any([name])
761+
if request is not None and has_flattened_params:
762+
raise ValueError(
763+
"If the `request` argument is set, then none of "
764+
"the individual field arguments should be set."
765+
)
766+
767+
request = bigtable_table_admin.UndeleteTableRequest(request)
768+
769+
# If we have keyword arguments corresponding to fields on the
770+
# request, apply these.
771+
if name is not None:
772+
request.name = name
773+
774+
# Wrap the RPC method; this adds retry and timeout information,
775+
# and friendly error handling.
776+
rpc = gapic_v1.method_async.wrap_method(
777+
self._client._transport.undelete_table,
778+
default_timeout=None,
779+
client_info=DEFAULT_CLIENT_INFO,
780+
)
781+
782+
# Certain fields should be provided within the metadata header;
783+
# add these here.
784+
metadata = tuple(metadata) + (
785+
gapic_v1.routing_header.to_grpc_metadata((("name", request.name),)),
786+
)
787+
788+
# Send the request.
789+
response = await rpc(
790+
request,
791+
retry=retry,
792+
timeout=timeout,
793+
metadata=metadata,
794+
)
795+
796+
# Wrap the response in an operation future.
797+
response = operation_async.from_gapic(
798+
response,
799+
self._client._transport.operations_client,
800+
table.Table,
801+
metadata_type=bigtable_table_admin.UndeleteTableMetadata,
802+
)
803+
804+
# Done; return the response.
805+
return response
806+
718807
async def modify_column_families(
719808
self,
720809
request: Union[bigtable_table_admin.ModifyColumnFamiliesRequest, dict] = None,

‎google/cloud/bigtable_admin_v2/services/bigtable_table_admin/client.py‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ def __init__(
550550
quota_project_id=client_options.quota_project_id,
551551
client_info=client_info,
552552
always_use_jwt_access=True,
553+
api_audience=client_options.api_audience,
553554
)
554555

555556
def create_table(
@@ -1019,6 +1020,95 @@ def delete_table(
10191020
metadata=metadata,
10201021
)
10211022

1023+
def undelete_table(
1024+
self,
1025+
request: Union[bigtable_table_admin.UndeleteTableRequest, dict] = None,
1026+
*,
1027+
name: str = None,
1028+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1029+
timeout: float = None,
1030+
metadata: Sequence[Tuple[str, str]] = (),
1031+
) -> operation.Operation:
1032+
r"""Restores a specified table which was accidentally
1033+
deleted.
1034+
1035+
Args:
1036+
request (Union[google.cloud.bigtable_admin_v2.types.UndeleteTableRequest, dict]):
1037+
The request object. Request message for
1038+
[google.bigtable.admin.v2.BigtableTableAdmin.UndeleteTable][google.bigtable.admin.v2.BigtableTableAdmin.UndeleteTable]
1039+
name (str):
1040+
Required. The unique name of the table to be restored.
1041+
Values are of the form
1042+
``projects/{project}/instances/{instance}/tables/{table}``.
1043+
1044+
This corresponds to the ``name`` field
1045+
on the ``request`` instance; if ``request`` is provided, this
1046+
should not be set.
1047+
retry (google.api_core.retry.Retry): Designation of what errors, if any,
1048+
should be retried.
1049+
timeout (float): The timeout for this request.
1050+
metadata (Sequence[Tuple[str, str]]): Strings which should be
1051+
sent along with the request as metadata.
1052+
1053+
Returns:
1054+
google.api_core.operation.Operation:
1055+
An object representing a long-running operation.
1056+
1057+
The result type for the operation will be :class:`google.cloud.bigtable_admin_v2.types.Table` A collection of user data indexed by row, column, and timestamp.
1058+
Each table is served using the resources of its
1059+
parent cluster.
1060+
1061+
"""
1062+
# Create or coerce a protobuf request object.
1063+
# Quick check: If we got a request object, we should *not* have
1064+
# gotten any keyword arguments that map to the request.
1065+
has_flattened_params = any([name])
1066+
if request is not None and has_flattened_params:
1067+
raise ValueError(
1068+
"If the `request` argument is set, then none of "
1069+
"the individual field arguments should be set."
1070+
)
1071+
1072+
# Minor optimization to avoid making a copy if the user passes
1073+
# in a bigtable_table_admin.UndeleteTableRequest.
1074+
# There's no risk of modifying the input as we've already verified
1075+
# there are no flattened fields.
1076+
if not isinstance(request, bigtable_table_admin.UndeleteTableRequest):
1077+
request = bigtable_table_admin.UndeleteTableRequest(request)
1078+
# If we have keyword arguments corresponding to fields on the
1079+
# request, apply these.
1080+
if name is not None:
1081+
request.name = name
1082+
1083+
# Wrap the RPC method; this adds retry and timeout information,
1084+
# and friendly error handling.
1085+
rpc = self._transport._wrapped_methods[self._transport.undelete_table]
1086+
1087+
# Certain fields should be provided within the metadata header;
1088+
# add these here.
1089+
metadata = tuple(metadata) + (
1090+
gapic_v1.routing_header.to_grpc_metadata((("name", request.name),)),
1091+
)
1092+
1093+
# Send the request.
1094+
response = rpc(
1095+
request,
1096+
retry=retry,
1097+
timeout=timeout,
1098+
metadata=metadata,
1099+
)
1100+
1101+
# Wrap the response in an operation future.
1102+
response = operation.from_gapic(
1103+
response,
1104+
self._transport.operations_client,
1105+
table.Table,
1106+
metadata_type=bigtable_table_admin.UndeleteTableMetadata,
1107+
)
1108+
1109+
# Done; return the response.
1110+
return response
1111+
10221112
def modify_column_families(
10231113
self,
10241114
request: Union[bigtable_table_admin.ModifyColumnFamiliesRequest, dict] = None,

‎google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/base.py‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def __init__(
6868
quota_project_id: Optional[str] = None,
6969
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
7070
always_use_jwt_access: Optional[bool] = False,
71+
api_audience: Optional[str] = None,
7172
**kwargs,
7273
) -> None:
7374
"""Instantiate the transport.
@@ -95,11 +96,6 @@ def __init__(
9596
be used for service account credentials.
9697
"""
9798

98-
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
99-
if ":" not in host:
100-
host += ":443"
101-
self._host = host
102-
10399
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
104100

105101
# Save the scopes.
@@ -120,6 +116,11 @@ def __init__(
120116
credentials, _ = google.auth.default(
121117
**scopes_kwargs, quota_project_id=quota_project_id
122118
)
119+
# Don't apply audience if the credentials file passed from user.
120+
if hasattr(credentials, "with_gdch_audience"):
121+
credentials = credentials.with_gdch_audience(
122+
api_audience if api_audience else host
123+
)
123124

124125
# If the credentials are service account credentials, then always try to use self signed JWT.
125126
if (
@@ -132,6 +133,11 @@ def __init__(
132133
# Save the credentials.
133134
self._credentials = credentials
134135

136+
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
137+
if ":" not in host:
138+
host += ":443"
139+
self._host = host
140+
135141
def _prep_wrapped_messages(self, client_info):
136142
# Precompute the wrapped methods.
137143
self._wrapped_methods = {
@@ -180,6 +186,11 @@ def _prep_wrapped_messages(self, client_info):
180186
default_timeout=60.0,
181187
client_info=client_info,
182188
),
189+
self.undelete_table: gapic_v1.method.wrap_method(
190+
self.undelete_table,
191+
default_timeout=None,
192+
client_info=client_info,
193+
),
183194
self.modify_column_families: gapic_v1.method.wrap_method(
184195
self.modify_column_families,
185196
default_timeout=300.0,
@@ -409,6 +420,15 @@ def delete_table(
409420
]:
410421
raise NotImplementedError()
411422

423+
@property
424+
def undelete_table(
425+
self,
426+
) -> Callable[
427+
[bigtable_table_admin.UndeleteTableRequest],
428+
Union[operations_pb2.Operation, Awaitable[operations_pb2.Operation]],
429+
]:
430+
raise NotImplementedError()
431+
412432
@property
413433
def modify_column_families(
414434
self,

0 commit comments

Comments
 (0)