Skip to content

Commit acaa3ff

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add fields and the BackupType proto for Hot Backups (#2300)
* chore: add grpc-java dependencies to WORKSPACE and update gapic-generator-java to 2.43.0 PiperOrigin-RevId: 656487430 Source-Link: googleapis/googleapis@cf16946 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4b4c8ab484b34251b142ad17d14e25a33f32c1b0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGI0YzhhYjQ4NGIzNDI1MWIxNDJhZDE3ZDE0ZTI1YTMzZjMyYzFiMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add fields and the BackupType proto for Hot Backups docs: clarify comments and fix typos PiperOrigin-RevId: 658791576 Source-Link: googleapis/googleapis@c93b54f Source-Link: https://github.com/googleapis/googleapis-gen/commit/e52ba38a95a82f7588d0dd3a2284c98850dab9e1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTUyYmEzOGE5NWE4MmY3NTg4ZDBkZDNhMjI4NGM5ODg1MGRhYjllMSJ9 * 🦉 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 715b7d0 commit acaa3ff

File tree

16 files changed

+1011
-145
lines changed

16 files changed

+1011
-145
lines changed

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4068,7 +4068,7 @@ public final UnaryCallable<ListBackupsRequest, ListBackupsResponse> listBackupsC
40684068
* Create a new table by restoring from a completed backup. The returned table [long-running
40694069
* operation][google.longrunning.Operation] can be used to track the progress of the operation,
40704070
* and to cancel it. The [metadata][google.longrunning.Operation.metadata] field type is
4071-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
4071+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
40724072
* [response][google.longrunning.Operation.response] type is
40734073
* [Table][google.bigtable.admin.v2.Table], if successful.
40744074
*
@@ -4104,7 +4104,7 @@ public final OperationFuture<Table, RestoreTableMetadata> restoreTableAsync(
41044104
* Create a new table by restoring from a completed backup. The returned table [long-running
41054105
* operation][google.longrunning.Operation] can be used to track the progress of the operation,
41064106
* and to cancel it. The [metadata][google.longrunning.Operation.metadata] field type is
4107-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
4107+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
41084108
* [response][google.longrunning.Operation.response] type is
41094109
* [Table][google.bigtable.admin.v2.Table], if successful.
41104110
*
@@ -4140,7 +4140,7 @@ public final OperationFuture<Table, RestoreTableMetadata> restoreTableAsync(
41404140
* Create a new table by restoring from a completed backup. The returned table [long-running
41414141
* operation][google.longrunning.Operation] can be used to track the progress of the operation,
41424142
* and to cancel it. The [metadata][google.longrunning.Operation.metadata] field type is
4143-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
4143+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
41444144
* [response][google.longrunning.Operation.response] type is
41454145
* [Table][google.bigtable.admin.v2.Table], if successful.
41464146
*
@@ -4197,7 +4197,7 @@ public final UnaryCallable<RestoreTableRequest, Operation> restoreTableCallable(
41974197
* }</pre>
41984198
*
41994199
* @param parent Required. The name of the destination cluster that will contain the backup copy.
4200-
* The cluster must already exists. Values are of the form:
4200+
* The cluster must already exist. Values are of the form:
42014201
* `projects/{project}/instances/{instance}/clusters/{cluster}`.
42024202
* @param backupId Required. The id of the new backup. The `backup_id` along with `parent` are
42034203
* combined as {parent}/backups/{backup_id} to create the full backup name, of the form:
@@ -4255,7 +4255,7 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
42554255
* }</pre>
42564256
*
42574257
* @param parent Required. The name of the destination cluster that will contain the backup copy.
4258-
* The cluster must already exists. Values are of the form:
4258+
* The cluster must already exist. Values are of the form:
42594259
* `projects/{project}/instances/{instance}/clusters/{cluster}`.
42604260
* @param backupId Required. The id of the new backup. The `backup_id` along with `parent` are
42614261
* combined as {parent}/backups/{backup_id} to create the full backup name, of the form:
@@ -4312,7 +4312,7 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
43124312
* }</pre>
43134313
*
43144314
* @param parent Required. The name of the destination cluster that will contain the backup copy.
4315-
* The cluster must already exists. Values are of the form:
4315+
* The cluster must already exist. Values are of the form:
43164316
* `projects/{project}/instances/{instance}/clusters/{cluster}`.
43174317
* @param backupId Required. The id of the new backup. The `backup_id` along with `parent` are
43184318
* combined as {parent}/backups/{backup_id} to create the full backup name, of the form:
@@ -4370,7 +4370,7 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
43704370
* }</pre>
43714371
*
43724372
* @param parent Required. The name of the destination cluster that will contain the backup copy.
4373-
* The cluster must already exists. Values are of the form:
4373+
* The cluster must already exist. Values are of the form:
43744374
* `projects/{project}/instances/{instance}/clusters/{cluster}`.
43754375
* @param backupId Required. The id of the new backup. The `backup_id` along with `parent` are
43764376
* combined as {parent}/backups/{backup_id} to create the full backup name, of the form:

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.google.api.core.ApiFunction;
2323
import com.google.api.core.ApiFuture;
24+
import com.google.api.core.ObsoleteApi;
2425
import com.google.api.gax.core.GaxProperties;
2526
import com.google.api.gax.core.GoogleCredentialsProvider;
2627
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -467,6 +468,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
467468
}
468469

469470
/** Returns the default service endpoint. */
471+
@ObsoleteApi("Use getEndpoint() instead")
470472
public static String getDefaultEndpoint() {
471473
return "bigtableadmin.googleapis.com:443";
472474
}

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import com.google.api.core.ApiFunction;
2525
import com.google.api.core.ApiFuture;
26+
import com.google.api.core.ObsoleteApi;
2627
import com.google.api.gax.core.GaxProperties;
2728
import com.google.api.gax.core.GoogleCredentialsProvider;
2829
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -683,6 +684,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
683684
}
684685

685686
/** Returns the default service endpoint. */
687+
@ObsoleteApi("Use getEndpoint() instead")
686688
public static String getDefaultEndpoint() {
687689
return "bigtableadmin.googleapis.com:443";
688690
}

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.api.core.ApiFunction;
2020
import com.google.api.core.InternalApi;
21+
import com.google.api.core.ObsoleteApi;
2122
import com.google.api.gax.core.GaxProperties;
2223
import com.google.api.gax.core.GoogleCredentialsProvider;
2324
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -180,6 +181,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
180181
}
181182

182183
/** Returns the default service endpoint. */
184+
@ObsoleteApi("Use getEndpoint() instead")
183185
public static String getDefaultEndpoint() {
184186
return "bigtable.googleapis.com:443";
185187
}

‎google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,15 @@
593593
"allDeclaredClasses": true,
594594
"allPublicClasses": true
595595
},
596+
{
597+
"name": "com.google.bigtable.admin.v2.Backup$BackupType",
598+
"queryAllDeclaredConstructors": true,
599+
"queryAllPublicConstructors": true,
600+
"queryAllDeclaredMethods": true,
601+
"allPublicMethods": true,
602+
"allDeclaredClasses": true,
603+
"allPublicClasses": true
604+
},
596605
{
597606
"name": "com.google.bigtable.admin.v2.Backup$Builder",
598607
"queryAllDeclaredConstructors": true,

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,6 +2096,7 @@ public void createBackupTest() throws Exception {
20962096
.setEndTime(Timestamp.newBuilder().build())
20972097
.setSizeBytes(-1796325715)
20982098
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2099+
.setHotToStandardTime(Timestamp.newBuilder().build())
20992100
.build();
21002101
Operation resultOperation =
21012102
Operation.newBuilder()
@@ -2155,6 +2156,7 @@ public void createBackupTest2() throws Exception {
21552156
.setEndTime(Timestamp.newBuilder().build())
21562157
.setSizeBytes(-1796325715)
21572158
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2159+
.setHotToStandardTime(Timestamp.newBuilder().build())
21582160
.build();
21592161
Operation resultOperation =
21602162
Operation.newBuilder()
@@ -2214,6 +2216,7 @@ public void getBackupTest() throws Exception {
22142216
.setEndTime(Timestamp.newBuilder().build())
22152217
.setSizeBytes(-1796325715)
22162218
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2219+
.setHotToStandardTime(Timestamp.newBuilder().build())
22172220
.build();
22182221
mockBigtableTableAdmin.addResponse(expectedResponse);
22192222

@@ -2259,6 +2262,7 @@ public void getBackupTest2() throws Exception {
22592262
.setEndTime(Timestamp.newBuilder().build())
22602263
.setSizeBytes(-1796325715)
22612264
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2265+
.setHotToStandardTime(Timestamp.newBuilder().build())
22622266
.build();
22632267
mockBigtableTableAdmin.addResponse(expectedResponse);
22642268

@@ -2304,6 +2308,7 @@ public void updateBackupTest() throws Exception {
23042308
.setEndTime(Timestamp.newBuilder().build())
23052309
.setSizeBytes(-1796325715)
23062310
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2311+
.setHotToStandardTime(Timestamp.newBuilder().build())
23072312
.build();
23082313
mockBigtableTableAdmin.addResponse(expectedResponse);
23092314

@@ -2569,6 +2574,7 @@ public void copyBackupTest() throws Exception {
25692574
.setEndTime(Timestamp.newBuilder().build())
25702575
.setSizeBytes(-1796325715)
25712576
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2577+
.setHotToStandardTime(Timestamp.newBuilder().build())
25722578
.build();
25732579
Operation resultOperation =
25742580
Operation.newBuilder()
@@ -2632,6 +2638,7 @@ public void copyBackupTest2() throws Exception {
26322638
.setEndTime(Timestamp.newBuilder().build())
26332639
.setSizeBytes(-1796325715)
26342640
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2641+
.setHotToStandardTime(Timestamp.newBuilder().build())
26352642
.build();
26362643
Operation resultOperation =
26372644
Operation.newBuilder()
@@ -2695,6 +2702,7 @@ public void copyBackupTest3() throws Exception {
26952702
.setEndTime(Timestamp.newBuilder().build())
26962703
.setSizeBytes(-1796325715)
26972704
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2705+
.setHotToStandardTime(Timestamp.newBuilder().build())
26982706
.build();
26992707
Operation resultOperation =
27002708
Operation.newBuilder()
@@ -2758,6 +2766,7 @@ public void copyBackupTest4() throws Exception {
27582766
.setEndTime(Timestamp.newBuilder().build())
27592767
.setSizeBytes(-1796325715)
27602768
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
2769+
.setHotToStandardTime(Timestamp.newBuilder().build())
27612770
.build();
27622771
Operation resultOperation =
27632772
Operation.newBuilder()

‎grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ default void listBackups(
18341834
* returned table [long-running operation][google.longrunning.Operation] can
18351835
* be used to track the progress of the operation, and to cancel it. The
18361836
* [metadata][google.longrunning.Operation.metadata] field type is
1837-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
1837+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
18381838
* [response][google.longrunning.Operation.response] type is
18391839
* [Table][google.bigtable.admin.v2.Table], if successful.
18401840
* </pre>
@@ -2402,7 +2402,7 @@ public void listBackups(
24022402
* returned table [long-running operation][google.longrunning.Operation] can
24032403
* be used to track the progress of the operation, and to cancel it. The
24042404
* [metadata][google.longrunning.Operation.metadata] field type is
2405-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
2405+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
24062406
* [response][google.longrunning.Operation.response] type is
24072407
* [Table][google.bigtable.admin.v2.Table], if successful.
24082408
* </pre>
@@ -2887,7 +2887,7 @@ public com.google.bigtable.admin.v2.ListBackupsResponse listBackups(
28872887
* returned table [long-running operation][google.longrunning.Operation] can
28882888
* be used to track the progress of the operation, and to cancel it. The
28892889
* [metadata][google.longrunning.Operation.metadata] field type is
2890-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
2890+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
28912891
* [response][google.longrunning.Operation.response] type is
28922892
* [Table][google.bigtable.admin.v2.Table], if successful.
28932893
* </pre>
@@ -3364,7 +3364,7 @@ protected BigtableTableAdminFutureStub build(
33643364
* returned table [long-running operation][google.longrunning.Operation] can
33653365
* be used to track the progress of the operation, and to cancel it. The
33663366
* [metadata][google.longrunning.Operation.metadata] field type is
3367-
* [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
3367+
* [RestoreTableMetadata][google.bigtable.admin.v2.RestoreTableMetadata]. The
33683368
* [response][google.longrunning.Operation.response] type is
33693369
* [Table][google.bigtable.admin.v2.Table], if successful.
33703370
* </pre>

0 commit comments

Comments
 (0)