Skip to content

Commit b508e33

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: refreshes Bigtable Admin API(s) protos (#589)
* feat: refreshes Bigtable Admin API(s) protos PiperOrigin-RevId: 448988001 Source-Link: googleapis/googleapis@b6fa58e Source-Link: googleapis/googleapis-gen@fc8b8db Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZmM4YjhkYmM3ZGExYTc4NDVkNTcxMzRmNDExMzAyZDEwNmVhMmVmMiJ9 * 🦉 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>
1 parent cff30e5 commit b508e33

File tree

5 files changed

+75
-41
lines changed

5 files changed

+75
-41
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,17 +1262,7 @@ async def partial_update_cluster(
12621262
# and friendly error handling.
12631263
rpc = gapic_v1.method_async.wrap_method(
12641264
self._client._transport.partial_update_cluster,
1265-
default_retry=retries.Retry(
1266-
initial=1.0,
1267-
maximum=60.0,
1268-
multiplier=2,
1269-
predicate=retries.if_exception_type(
1270-
core_exceptions.DeadlineExceeded,
1271-
core_exceptions.ServiceUnavailable,
1272-
),
1273-
deadline=60.0,
1274-
),
1275-
default_timeout=60.0,
1265+
default_timeout=None,
12761266
client_info=DEFAULT_CLIENT_INFO,
12771267
)
12781268

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,7 @@ def _prep_wrapped_messages(self, client_info):
257257
),
258258
self.partial_update_cluster: gapic_v1.method.wrap_method(
259259
self.partial_update_cluster,
260-
default_retry=retries.Retry(
261-
initial=1.0,
262-
maximum=60.0,
263-
multiplier=2,
264-
predicate=retries.if_exception_type(
265-
core_exceptions.DeadlineExceeded,
266-
core_exceptions.ServiceUnavailable,
267-
),
268-
deadline=60.0,
269-
),
270-
default_timeout=60.0,
260+
default_timeout=None,
271261
client_info=client_info,
272262
),
273263
self.delete_cluster: gapic_v1.method.wrap_method(

‎google/cloud/bigtable_admin_v2/types/bigtable_instance_admin.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,54 @@ class CreateClusterMetadata(proto.Message):
415415
finish_time (google.protobuf.timestamp_pb2.Timestamp):
416416
The time at which the operation failed or was
417417
completed successfully.
418+
tables (Mapping[str, google.cloud.bigtable_admin_v2.types.CreateClusterMetadata.TableProgress]):
419+
Keys: the full ``name`` of each table that existed in the
420+
instance when CreateCluster was first called, i.e.
421+
``projects/<project>/instances/<instance>/tables/<table>``.
422+
Any table added to the instance by a later API call will be
423+
created in the new cluster by that API call, not this one.
424+
425+
Values: information on how much of a table's data has been
426+
copied to the newly-created cluster so far.
418427
"""
419428

429+
class TableProgress(proto.Message):
430+
r"""Progress info for copying a table's data to the new cluster.
431+
432+
Attributes:
433+
estimated_size_bytes (int):
434+
Estimate of the size of the table to be
435+
copied.
436+
estimated_copied_bytes (int):
437+
Estimate of the number of bytes copied so far for this
438+
table. This will eventually reach 'estimated_size_bytes'
439+
unless the table copy is CANCELLED.
440+
state (google.cloud.bigtable_admin_v2.types.CreateClusterMetadata.TableProgress.State):
441+
442+
"""
443+
444+
class State(proto.Enum):
445+
r""""""
446+
STATE_UNSPECIFIED = 0
447+
PENDING = 1
448+
COPYING = 2
449+
COMPLETED = 3
450+
CANCELLED = 4
451+
452+
estimated_size_bytes = proto.Field(
453+
proto.INT64,
454+
number=2,
455+
)
456+
estimated_copied_bytes = proto.Field(
457+
proto.INT64,
458+
number=3,
459+
)
460+
state = proto.Field(
461+
proto.ENUM,
462+
number=4,
463+
enum="CreateClusterMetadata.TableProgress.State",
464+
)
465+
420466
original_request = proto.Field(
421467
proto.MESSAGE,
422468
number=1,
@@ -432,6 +478,12 @@ class CreateClusterMetadata(proto.Message):
432478
number=3,
433479
message=timestamp_pb2.Timestamp,
434480
)
481+
tables = proto.MapField(
482+
proto.STRING,
483+
proto.MESSAGE,
484+
number=4,
485+
message=TableProgress,
486+
)
435487

436488

437489
class UpdateClusterMetadata(proto.Message):

‎google/cloud/bigtable_admin_v2/types/instance.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,14 @@ class Cluster(proto.Message):
169169
The unique name of the cluster. Values are of the form
170170
``projects/{project}/instances/{instance}/clusters/[a-z][-a-z0-9]*``.
171171
location (str):
172-
(``CreationOnly``) The location where this cluster's nodes
173-
and storage reside. For best performance, clients should be
172+
Immutable. The location where this cluster's nodes and
173+
storage reside. For best performance, clients should be
174174
located as close as possible to this cluster. Currently only
175175
zones are supported, so values should be of the form
176176
``projects/{project}/locations/{zone}``.
177177
state (google.cloud.bigtable_admin_v2.types.Cluster.State):
178-
The current state of the cluster.
178+
Output only. The current state of the
179+
cluster.
179180
serve_nodes (int):
180181
The number of nodes allocated to this
181182
cluster. More nodes enable higher throughput and
@@ -185,9 +186,9 @@ class Cluster(proto.Message):
185186
186187
This field is a member of `oneof`_ ``config``.
187188
default_storage_type (google.cloud.bigtable_admin_v2.types.StorageType):
188-
(``CreationOnly``) The type of storage used by this cluster
189-
to serve its parent instance's tables, unless explicitly
190-
overridden.
189+
Immutable. The type of storage used by this
190+
cluster to serve its parent instance's tables,
191+
unless explicitly overridden.
191192
encryption_config (google.cloud.bigtable_admin_v2.types.Cluster.EncryptionConfig):
192193
Immutable. The encryption configuration for
193194
CMEK-protected clusters.
@@ -254,6 +255,9 @@ class EncryptionConfig(proto.Message):
254255
key.
255256
2) Only regional keys can be used and the region of the CMEK
256257
key must match the region of the cluster.
258+
3) All clusters within an instance must use the same CMEK
259+
key. Values are of the form
260+
``projects/{project}/locations/{location}/keyRings/{keyring}/cryptoKeys/{key}``
257261
"""
258262

259263
kms_key_name = proto.Field(
@@ -309,8 +313,7 @@ class AppProfile(proto.Message):
309313
310314
Attributes:
311315
name (str):
312-
(``OutputOnly``) The unique name of the app profile. Values
313-
are of the form
316+
The unique name of the app profile. Values are of the form
314317
``projects/{project}/instances/{instance}/appProfiles/[_a-zA-Z0-9][-_.a-zA-Z0-9]*``.
315318
etag (str):
316319
Strongly validated etag for optimistic concurrency control.
@@ -324,8 +327,8 @@ class AppProfile(proto.Message):
324327
7232 <https://tools.ietf.org/html/rfc7232#section-2.3>`__
325328
for more details.
326329
description (str):
327-
Optional long form description of the use
328-
case for this AppProfile.
330+
Long form description of the use case for
331+
this AppProfile.
329332
multi_cluster_routing_use_any (google.cloud.bigtable_admin_v2.types.AppProfile.MultiClusterRoutingUseAny):
330333
Use a multi-cluster routing policy.
331334

‎google/cloud/bigtable_admin_v2/types/table.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,13 @@ class Table(proto.Message):
8989
with UNKNOWN ``replication_status``. Views:
9090
``REPLICATION_VIEW``, ``ENCRYPTION_VIEW``, ``FULL``
9191
column_families (Mapping[str, google.cloud.bigtable_admin_v2.types.ColumnFamily]):
92-
(``CreationOnly``) The column families configured for this
93-
table, mapped by column family ID. Views: ``SCHEMA_VIEW``,
94-
``FULL``
92+
The column families configured for this table, mapped by
93+
column family ID. Views: ``SCHEMA_VIEW``, ``FULL``
9594
granularity (google.cloud.bigtable_admin_v2.types.Table.TimestampGranularity):
96-
(``CreationOnly``) The granularity (i.e. ``MILLIS``) at
97-
which timestamps are stored in this table. Timestamps not
98-
matching the granularity will be rejected. If unspecified at
99-
creation time, the value will be set to ``MILLIS``. Views:
95+
Immutable. The granularity (i.e. ``MILLIS``) at which
96+
timestamps are stored in this table. Timestamps not matching
97+
the granularity will be rejected. If unspecified at creation
98+
time, the value will be set to ``MILLIS``. Views:
10099
``SCHEMA_VIEW``, ``FULL``.
101100
restore_info (google.cloud.bigtable_admin_v2.types.RestoreInfo):
102101
Output only. If this table was restored from
@@ -427,8 +426,8 @@ class Backup(proto.Message):
427426
428427
Attributes:
429428
name (str):
430-
Output only. A globally unique identifier for the backup
431-
which cannot be changed. Values are of the form
429+
A globally unique identifier for the backup which cannot be
430+
changed. Values are of the form
432431
``projects/{project}/instances/{instance}/clusters/{cluster}/ backups/[_a-zA-Z0-9][-_.a-zA-Z0-9]*``
433432
The final segment of the name must be between 1 and 50
434433
characters in length.

0 commit comments

Comments
 (0)