Skip to content

Commit c632d4d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
committed
feat: Add support for multi region encryption config
docs: fix linting for several doc comments PiperOrigin-RevId: 630422337 Source-Link: googleapis/googleapis@65db386 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b798ca9f56e2ad3e0d14982b68b6724d1c3d62b5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjc5OGNhOWY1NmUyYWQzZTBkMTQ5ODJiNjhiNjcyNGQxYzNkNjJiNSJ9
1 parent 8dddf21 commit c632d4d

File tree

68 files changed

+5027
-1760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5027
-1760
lines changed

‎owl-bot-staging/v1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
* Service Description: Cloud Spanner Database Admin API
8787
*
8888
* <p>The Cloud Spanner Database Admin API can be used to: &#42; create, drop, and list databases
89-
* &#42; update the schema of pre-existing databases &#42; create, delete and list backups for a
90-
* database &#42; restore a database from an existing backup
89+
* &#42; update the schema of pre-existing databases &#42; create, delete, copy and list backups for
90+
* a database &#42; restore a database from an existing backup
9191
*
9292
* <p>This class provides the ability to make remote calls to the backing service through method
9393
* calls that map to API methods. Sample code to get started:
@@ -199,7 +199,7 @@
199199
* </tr>
200200
* <tr>
201201
* <td><p> UpdateDatabaseDdl</td>
202-
* <td><p> Updates the schema of a Cloud Spanner database by creating/altering/dropping tables, columns, indexes, etc. The returned [long-running operation][google.longrunning.Operation] will have a name of the format `&lt;database_name&gt;/operations/&lt;operation_id&gt;` and can be used to track execution of the schema change(s). The [metadata][google.longrunning.Operation.metadata] field type is [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata]. The operation has no response.</td>
202+
* <td><p> Updates the schema of a Cloud Spanner database by creating/altering/dropping tables, columns, indexes, etc. The returned [long-running operation][google.longrunning.Operation] will have a name of the format `&lt;database_name&gt;/operations/&lt;operation_id&gt;` and can be used to track execution of the schema change(s). The [metadata][google.longrunning.Operation.metadata] field type is [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata]. The operation has no response.</td>
203203
* <td>
204204
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
205205
* <ul>
@@ -337,7 +337,7 @@
337337
* </tr>
338338
* <tr>
339339
* <td><p> CopyBackup</td>
340-
* <td><p> Starts copying a Cloud Spanner Backup. The returned backup [long-running operation][google.longrunning.Operation] will have a name of the format `projects/&lt;project&gt;/instances/&lt;instance&gt;/backups/&lt;backup&gt;/operations/&lt;operation_id&gt;` and can be used to track copying of the backup. The operation is associated with the destination backup. The [metadata][google.longrunning.Operation.metadata] field type is [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The [response][google.longrunning.Operation.response] field type is [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run on the same source backup.</td>
340+
* <td><p> Starts copying a Cloud Spanner Backup. The returned backup [long-running operation][google.longrunning.Operation] will have a name of the format `projects/&lt;project&gt;/instances/&lt;instance&gt;/backups/&lt;backup&gt;/operations/&lt;operation_id&gt;` and can be used to track copying of the backup. The operation is associated with the destination backup. The [metadata][google.longrunning.Operation.metadata] field type is [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The [response][google.longrunning.Operation.response] field type is [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned operation will stop the copying and delete the destination backup. Concurrent CopyBackup requests can run on the same source backup.</td>
341341
* <td>
342342
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
343343
* <ul>
@@ -2459,8 +2459,8 @@ public final UnaryCallable<CreateBackupRequest, Operation> createBackupCallable(
24592459
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
24602460
* [response][google.longrunning.Operation.response] field type is
24612461
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2462-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2463-
* on the same source backup.
2462+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2463+
* requests can run on the same source backup.
24642464
*
24652465
* <p>Sample code:
24662466
*
@@ -2517,8 +2517,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
25172517
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
25182518
* [response][google.longrunning.Operation.response] field type is
25192519
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2520-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2521-
* on the same source backup.
2520+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2521+
* requests can run on the same source backup.
25222522
*
25232523
* <p>Sample code:
25242524
*
@@ -2575,8 +2575,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
25752575
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
25762576
* [response][google.longrunning.Operation.response] field type is
25772577
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2578-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2579-
* on the same source backup.
2578+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2579+
* requests can run on the same source backup.
25802580
*
25812581
* <p>Sample code:
25822582
*
@@ -2633,8 +2633,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
26332633
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
26342634
* [response][google.longrunning.Operation.response] field type is
26352635
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2636-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2637-
* on the same source backup.
2636+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2637+
* requests can run on the same source backup.
26382638
*
26392639
* <p>Sample code:
26402640
*
@@ -2691,8 +2691,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
26912691
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
26922692
* [response][google.longrunning.Operation.response] field type is
26932693
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2694-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2695-
* on the same source backup.
2694+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2695+
* requests can run on the same source backup.
26962696
*
26972697
* <p>Sample code:
26982698
*
@@ -2733,8 +2733,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
27332733
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
27342734
* [response][google.longrunning.Operation.response] field type is
27352735
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2736-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2737-
* on the same source backup.
2736+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2737+
* requests can run on the same source backup.
27382738
*
27392739
* <p>Sample code:
27402740
*
@@ -2775,8 +2775,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
27752775
* [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
27762776
* [response][google.longrunning.Operation.response] field type is
27772777
* [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
2778-
* operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
2779-
* on the same source backup.
2778+
* operation will stop the copying and delete the destination backup. Concurrent CopyBackup
2779+
* requests can run on the same source backup.
27802780
*
27812781
* <p>Sample code:
27822782
*
@@ -4069,7 +4069,7 @@ public final ListBackupOperationsPagedResponse listBackupOperations(
40694069
* }</pre>
40704070
*
40714071
* @param parent Required. The database whose roles should be listed. Values are of the form
4072-
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;/databaseRoles`.
4072+
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
40734073
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
40744074
*/
40754075
public final ListDatabaseRolesPagedResponse listDatabaseRoles(DatabaseName parent) {
@@ -4101,7 +4101,7 @@ public final ListDatabaseRolesPagedResponse listDatabaseRoles(DatabaseName paren
41014101
* }</pre>
41024102
*
41034103
* @param parent Required. The database whose roles should be listed. Values are of the form
4104-
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;/databaseRoles`.
4104+
* `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
41054105
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
41064106
*/
41074107
public final ListDatabaseRolesPagedResponse listDatabaseRoles(String parent) {

‎owl-bot-staging/v1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
* <p>Service Description: Cloud Spanner Database Admin API
2525
*
2626
* <p>The Cloud Spanner Database Admin API can be used to: &#42; create, drop, and list databases
27-
* &#42; update the schema of pre-existing databases &#42; create, delete and list backups for a
28-
* database &#42; restore a database from an existing backup
27+
* &#42; update the schema of pre-existing databases &#42; create, delete, copy and list backups for
28+
* a database &#42; restore a database from an existing backup
2929
*
3030
* <p>Sample for DatabaseAdminClient:
3131
*

‎owl-bot-staging/v1/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,7 @@ public void createBackupTest() throws Exception {
10811081
.setSizeBytes(-1796325715)
10821082
.addAllReferencingDatabases(new ArrayList<String>())
10831083
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1084+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
10841085
.setDatabaseDialect(DatabaseDialect.forNumber(0))
10851086
.addAllReferencingBackups(new ArrayList<String>())
10861087
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1144,6 +1145,7 @@ public void createBackupTest2() throws Exception {
11441145
.setSizeBytes(-1796325715)
11451146
.addAllReferencingDatabases(new ArrayList<String>())
11461147
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1148+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
11471149
.setDatabaseDialect(DatabaseDialect.forNumber(0))
11481150
.addAllReferencingBackups(new ArrayList<String>())
11491151
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1207,6 +1209,7 @@ public void copyBackupTest() throws Exception {
12071209
.setSizeBytes(-1796325715)
12081210
.addAllReferencingDatabases(new ArrayList<String>())
12091211
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1212+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
12101213
.setDatabaseDialect(DatabaseDialect.forNumber(0))
12111214
.addAllReferencingBackups(new ArrayList<String>())
12121215
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1273,6 +1276,7 @@ public void copyBackupTest2() throws Exception {
12731276
.setSizeBytes(-1796325715)
12741277
.addAllReferencingDatabases(new ArrayList<String>())
12751278
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1279+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
12761280
.setDatabaseDialect(DatabaseDialect.forNumber(0))
12771281
.addAllReferencingBackups(new ArrayList<String>())
12781282
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1339,6 +1343,7 @@ public void copyBackupTest3() throws Exception {
13391343
.setSizeBytes(-1796325715)
13401344
.addAllReferencingDatabases(new ArrayList<String>())
13411345
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1346+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
13421347
.setDatabaseDialect(DatabaseDialect.forNumber(0))
13431348
.addAllReferencingBackups(new ArrayList<String>())
13441349
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1405,6 +1410,7 @@ public void copyBackupTest4() throws Exception {
14051410
.setSizeBytes(-1796325715)
14061411
.addAllReferencingDatabases(new ArrayList<String>())
14071412
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1413+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
14081414
.setDatabaseDialect(DatabaseDialect.forNumber(0))
14091415
.addAllReferencingBackups(new ArrayList<String>())
14101416
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1471,6 +1477,7 @@ public void getBackupTest() throws Exception {
14711477
.setSizeBytes(-1796325715)
14721478
.addAllReferencingDatabases(new ArrayList<String>())
14731479
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1480+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
14741481
.setDatabaseDialect(DatabaseDialect.forNumber(0))
14751482
.addAllReferencingBackups(new ArrayList<String>())
14761483
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1525,6 +1532,7 @@ public void getBackupTest2() throws Exception {
15251532
.setSizeBytes(-1796325715)
15261533
.addAllReferencingDatabases(new ArrayList<String>())
15271534
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1535+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
15281536
.setDatabaseDialect(DatabaseDialect.forNumber(0))
15291537
.addAllReferencingBackups(new ArrayList<String>())
15301538
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1579,6 +1587,7 @@ public void updateBackupTest() throws Exception {
15791587
.setSizeBytes(-1796325715)
15801588
.addAllReferencingDatabases(new ArrayList<String>())
15811589
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1590+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
15821591
.setDatabaseDialect(DatabaseDialect.forNumber(0))
15831592
.addAllReferencingBackups(new ArrayList<String>())
15841593
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1595,6 +1604,7 @@ public void updateBackupTest() throws Exception {
15951604
.setSizeBytes(-1796325715)
15961605
.addAllReferencingDatabases(new ArrayList<String>())
15971606
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1607+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
15981608
.setDatabaseDialect(DatabaseDialect.forNumber(0))
15991609
.addAllReferencingBackups(new ArrayList<String>())
16001610
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1637,6 +1647,7 @@ public void updateBackupExceptionTest() throws Exception {
16371647
.setSizeBytes(-1796325715)
16381648
.addAllReferencingDatabases(new ArrayList<String>())
16391649
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1650+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
16401651
.setDatabaseDialect(DatabaseDialect.forNumber(0))
16411652
.addAllReferencingBackups(new ArrayList<String>())
16421653
.setMaxExpireTime(Timestamp.newBuilder().build())

‎owl-bot-staging/v1/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@ public void createBackupTest() throws Exception {
989989
.setSizeBytes(-1796325715)
990990
.addAllReferencingDatabases(new ArrayList<String>())
991991
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
992+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
992993
.setDatabaseDialect(DatabaseDialect.forNumber(0))
993994
.addAllReferencingBackups(new ArrayList<String>())
994995
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1051,6 +1052,7 @@ public void createBackupTest2() throws Exception {
10511052
.setSizeBytes(-1796325715)
10521053
.addAllReferencingDatabases(new ArrayList<String>())
10531054
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1055+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
10541056
.setDatabaseDialect(DatabaseDialect.forNumber(0))
10551057
.addAllReferencingBackups(new ArrayList<String>())
10561058
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1113,6 +1115,7 @@ public void copyBackupTest() throws Exception {
11131115
.setSizeBytes(-1796325715)
11141116
.addAllReferencingDatabases(new ArrayList<String>())
11151117
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1118+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
11161119
.setDatabaseDialect(DatabaseDialect.forNumber(0))
11171120
.addAllReferencingBackups(new ArrayList<String>())
11181121
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1179,6 +1182,7 @@ public void copyBackupTest2() throws Exception {
11791182
.setSizeBytes(-1796325715)
11801183
.addAllReferencingDatabases(new ArrayList<String>())
11811184
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1185+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
11821186
.setDatabaseDialect(DatabaseDialect.forNumber(0))
11831187
.addAllReferencingBackups(new ArrayList<String>())
11841188
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1245,6 +1249,7 @@ public void copyBackupTest3() throws Exception {
12451249
.setSizeBytes(-1796325715)
12461250
.addAllReferencingDatabases(new ArrayList<String>())
12471251
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1252+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
12481253
.setDatabaseDialect(DatabaseDialect.forNumber(0))
12491254
.addAllReferencingBackups(new ArrayList<String>())
12501255
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1311,6 +1316,7 @@ public void copyBackupTest4() throws Exception {
13111316
.setSizeBytes(-1796325715)
13121317
.addAllReferencingDatabases(new ArrayList<String>())
13131318
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1319+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
13141320
.setDatabaseDialect(DatabaseDialect.forNumber(0))
13151321
.addAllReferencingBackups(new ArrayList<String>())
13161322
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1377,6 +1383,7 @@ public void getBackupTest() throws Exception {
13771383
.setSizeBytes(-1796325715)
13781384
.addAllReferencingDatabases(new ArrayList<String>())
13791385
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1386+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
13801387
.setDatabaseDialect(DatabaseDialect.forNumber(0))
13811388
.addAllReferencingBackups(new ArrayList<String>())
13821389
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1425,6 +1432,7 @@ public void getBackupTest2() throws Exception {
14251432
.setSizeBytes(-1796325715)
14261433
.addAllReferencingDatabases(new ArrayList<String>())
14271434
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1435+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
14281436
.setDatabaseDialect(DatabaseDialect.forNumber(0))
14291437
.addAllReferencingBackups(new ArrayList<String>())
14301438
.setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1473,6 +1481,7 @@ public void updateBackupTest() throws Exception {
14731481
.setSizeBytes(-1796325715)
14741482
.addAllReferencingDatabases(new ArrayList<String>())
14751483
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
1484+
.addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
14761485
.setDatabaseDialect(DatabaseDialect.forNumber(0))
14771486
.addAllReferencingBackups(new ArrayList<String>())
14781487
.setMaxExpireTime(Timestamp.newBuilder().build())

0 commit comments

Comments
 (0)