Skip to content

Commit 6d64104

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Cross Region backup proto changes (#1754)
* chore: remove unused imports from google/spanner/* PiperOrigin-RevId: 435163448 Source-Link: googleapis/googleapis@db9d2a3 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ba34d4280bafc24a5ee801db4d107aeda1f94851 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYmEzNGQ0MjgwYmFmYzI0YTVlZTgwMWRiNGQxMDdhZWRhMWY5NDg1MSJ9 * 🦉 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: 436114471 Source-Link: googleapis/googleapis@6379d5f Source-Link: https://github.com/googleapis/googleapis-gen/commit/a59984b4cb711eeb186bca4f5b35adbfe60825df Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTU5OTg0YjRjYjcxMWVlYjE4NmJjYTRmNWIzNWFkYmZlNjA4MjVkZiJ9 * 🦉 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 2d213f0 commit 6d64104

File tree

43 files changed

+7844
-689
lines changed

Some content is hidden

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

43 files changed

+7844
-689
lines changed

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

Lines changed: 324 additions & 0 deletions
Large diffs are not rendered by default.

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
import com.google.longrunning.Operation;
4343
import com.google.protobuf.Empty;
4444
import com.google.spanner.admin.database.v1.Backup;
45+
import com.google.spanner.admin.database.v1.CopyBackupMetadata;
46+
import com.google.spanner.admin.database.v1.CopyBackupRequest;
4547
import com.google.spanner.admin.database.v1.CreateBackupMetadata;
4648
import com.google.spanner.admin.database.v1.CreateBackupRequest;
4749
import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
@@ -174,6 +176,17 @@ public UnaryCallSettings<CreateBackupRequest, Operation> createBackupSettings()
174176
return ((DatabaseAdminStubSettings) getStubSettings()).createBackupOperationSettings();
175177
}
176178

179+
/** Returns the object with the settings used for calls to copyBackup. */
180+
public UnaryCallSettings<CopyBackupRequest, Operation> copyBackupSettings() {
181+
return ((DatabaseAdminStubSettings) getStubSettings()).copyBackupSettings();
182+
}
183+
184+
/** Returns the object with the settings used for calls to copyBackup. */
185+
public OperationCallSettings<CopyBackupRequest, Backup, CopyBackupMetadata>
186+
copyBackupOperationSettings() {
187+
return ((DatabaseAdminStubSettings) getStubSettings()).copyBackupOperationSettings();
188+
}
189+
177190
/** Returns the object with the settings used for calls to getBackup. */
178191
public UnaryCallSettings<GetBackupRequest, Backup> getBackupSettings() {
179192
return ((DatabaseAdminStubSettings) getStubSettings()).getBackupSettings();
@@ -394,6 +407,17 @@ public UnaryCallSettings.Builder<CreateBackupRequest, Operation> createBackupSet
394407
return getStubSettingsBuilder().createBackupOperationSettings();
395408
}
396409

410+
/** Returns the builder for the settings used for calls to copyBackup. */
411+
public UnaryCallSettings.Builder<CopyBackupRequest, Operation> copyBackupSettings() {
412+
return getStubSettingsBuilder().copyBackupSettings();
413+
}
414+
415+
/** Returns the builder for the settings used for calls to copyBackup. */
416+
public OperationCallSettings.Builder<CopyBackupRequest, Backup, CopyBackupMetadata>
417+
copyBackupOperationSettings() {
418+
return getStubSettingsBuilder().copyBackupOperationSettings();
419+
}
420+
397421
/** Returns the builder for the settings used for calls to getBackup. */
398422
public UnaryCallSettings.Builder<GetBackupRequest, Backup> getBackupSettings() {
399423
return getStubSettingsBuilder().getBackupSettings();

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/gapic_metadata.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"grpc": {
1111
"libraryClient": "DatabaseAdminClient",
1212
"rpcs": {
13+
"CopyBackup": {
14+
"methods": ["copyBackupAsync", "copyBackupAsync", "copyBackupAsync", "copyBackupAsync", "copyBackupAsync", "copyBackupOperationCallable", "copyBackupCallable"]
15+
},
1316
"CreateBackup": {
1417
"methods": ["createBackupAsync", "createBackupAsync", "createBackupAsync", "createBackupOperationCallable", "createBackupCallable"]
1518
},

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import com.google.longrunning.stub.OperationsStub;
3434
import com.google.protobuf.Empty;
3535
import com.google.spanner.admin.database.v1.Backup;
36+
import com.google.spanner.admin.database.v1.CopyBackupMetadata;
37+
import com.google.spanner.admin.database.v1.CopyBackupRequest;
3638
import com.google.spanner.admin.database.v1.CreateBackupMetadata;
3739
import com.google.spanner.admin.database.v1.CreateBackupRequest;
3840
import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
@@ -134,6 +136,15 @@ public UnaryCallable<CreateBackupRequest, Operation> createBackupCallable() {
134136
throw new UnsupportedOperationException("Not implemented: createBackupCallable()");
135137
}
136138

139+
public OperationCallable<CopyBackupRequest, Backup, CopyBackupMetadata>
140+
copyBackupOperationCallable() {
141+
throw new UnsupportedOperationException("Not implemented: copyBackupOperationCallable()");
142+
}
143+
144+
public UnaryCallable<CopyBackupRequest, Operation> copyBackupCallable() {
145+
throw new UnsupportedOperationException("Not implemented: copyBackupCallable()");
146+
}
147+
137148
public UnaryCallable<GetBackupRequest, Backup> getBackupCallable() {
138149
throw new UnsupportedOperationException("Not implemented: getBackupCallable()");
139150
}

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
import com.google.longrunning.Operation;
6060
import com.google.protobuf.Empty;
6161
import com.google.spanner.admin.database.v1.Backup;
62+
import com.google.spanner.admin.database.v1.CopyBackupMetadata;
63+
import com.google.spanner.admin.database.v1.CopyBackupRequest;
6264
import com.google.spanner.admin.database.v1.CreateBackupMetadata;
6365
import com.google.spanner.admin.database.v1.CreateBackupRequest;
6466
import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
@@ -149,6 +151,9 @@ public class DatabaseAdminStubSettings extends StubSettings<DatabaseAdminStubSet
149151
private final UnaryCallSettings<CreateBackupRequest, Operation> createBackupSettings;
150152
private final OperationCallSettings<CreateBackupRequest, Backup, CreateBackupMetadata>
151153
createBackupOperationSettings;
154+
private final UnaryCallSettings<CopyBackupRequest, Operation> copyBackupSettings;
155+
private final OperationCallSettings<CopyBackupRequest, Backup, CopyBackupMetadata>
156+
copyBackupOperationSettings;
152157
private final UnaryCallSettings<GetBackupRequest, Backup> getBackupSettings;
153158
private final UnaryCallSettings<UpdateBackupRequest, Backup> updateBackupSettings;
154159
private final UnaryCallSettings<DeleteBackupRequest, Empty> deleteBackupSettings;
@@ -473,6 +478,17 @@ public UnaryCallSettings<CreateBackupRequest, Operation> createBackupSettings()
473478
return createBackupOperationSettings;
474479
}
475480

481+
/** Returns the object with the settings used for calls to copyBackup. */
482+
public UnaryCallSettings<CopyBackupRequest, Operation> copyBackupSettings() {
483+
return copyBackupSettings;
484+
}
485+
486+
/** Returns the object with the settings used for calls to copyBackup. */
487+
public OperationCallSettings<CopyBackupRequest, Backup, CopyBackupMetadata>
488+
copyBackupOperationSettings() {
489+
return copyBackupOperationSettings;
490+
}
491+
476492
/** Returns the object with the settings used for calls to getBackup. */
477493
public UnaryCallSettings<GetBackupRequest, Backup> getBackupSettings() {
478494
return getBackupSettings;
@@ -613,6 +629,8 @@ protected DatabaseAdminStubSettings(Builder settingsBuilder) throws IOException
613629
testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
614630
createBackupSettings = settingsBuilder.createBackupSettings().build();
615631
createBackupOperationSettings = settingsBuilder.createBackupOperationSettings().build();
632+
copyBackupSettings = settingsBuilder.copyBackupSettings().build();
633+
copyBackupOperationSettings = settingsBuilder.copyBackupOperationSettings().build();
616634
getBackupSettings = settingsBuilder.getBackupSettings().build();
617635
updateBackupSettings = settingsBuilder.updateBackupSettings().build();
618636
deleteBackupSettings = settingsBuilder.deleteBackupSettings().build();
@@ -650,6 +668,9 @@ public static class Builder extends StubSettings.Builder<DatabaseAdminStubSettin
650668
private final UnaryCallSettings.Builder<CreateBackupRequest, Operation> createBackupSettings;
651669
private final OperationCallSettings.Builder<CreateBackupRequest, Backup, CreateBackupMetadata>
652670
createBackupOperationSettings;
671+
private final UnaryCallSettings.Builder<CopyBackupRequest, Operation> copyBackupSettings;
672+
private final OperationCallSettings.Builder<CopyBackupRequest, Backup, CopyBackupMetadata>
673+
copyBackupOperationSettings;
653674
private final UnaryCallSettings.Builder<GetBackupRequest, Backup> getBackupSettings;
654675
private final UnaryCallSettings.Builder<UpdateBackupRequest, Backup> updateBackupSettings;
655676
private final UnaryCallSettings.Builder<DeleteBackupRequest, Empty> deleteBackupSettings;
@@ -760,6 +781,8 @@ protected Builder(ClientContext clientContext) {
760781
testIamPermissionsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
761782
createBackupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
762783
createBackupOperationSettings = OperationCallSettings.newBuilder();
784+
copyBackupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
785+
copyBackupOperationSettings = OperationCallSettings.newBuilder();
763786
getBackupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
764787
updateBackupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
765788
deleteBackupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -783,6 +806,7 @@ protected Builder(ClientContext clientContext) {
783806
getIamPolicySettings,
784807
testIamPermissionsSettings,
785808
createBackupSettings,
809+
copyBackupSettings,
786810
getBackupSettings,
787811
updateBackupSettings,
788812
deleteBackupSettings,
@@ -809,6 +833,8 @@ protected Builder(DatabaseAdminStubSettings settings) {
809833
testIamPermissionsSettings = settings.testIamPermissionsSettings.toBuilder();
810834
createBackupSettings = settings.createBackupSettings.toBuilder();
811835
createBackupOperationSettings = settings.createBackupOperationSettings.toBuilder();
836+
copyBackupSettings = settings.copyBackupSettings.toBuilder();
837+
copyBackupOperationSettings = settings.copyBackupOperationSettings.toBuilder();
812838
getBackupSettings = settings.getBackupSettings.toBuilder();
813839
updateBackupSettings = settings.updateBackupSettings.toBuilder();
814840
deleteBackupSettings = settings.deleteBackupSettings.toBuilder();
@@ -830,6 +856,7 @@ protected Builder(DatabaseAdminStubSettings settings) {
830856
getIamPolicySettings,
831857
testIamPermissionsSettings,
832858
createBackupSettings,
859+
copyBackupSettings,
833860
getBackupSettings,
834861
updateBackupSettings,
835862
deleteBackupSettings,
@@ -903,6 +930,11 @@ private static Builder initDefaults(Builder builder) {
903930
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
904931
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
905932

933+
builder
934+
.copyBackupSettings()
935+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
936+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
937+
906938
builder
907939
.getBackupSettings()
908940
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
@@ -1011,6 +1043,29 @@ private static Builder initDefaults(Builder builder) {
10111043
.setTotalTimeout(Duration.ofMillis(172800000L))
10121044
.build()));
10131045

1046+
builder
1047+
.copyBackupOperationSettings()
1048+
.setInitialCallSettings(
1049+
UnaryCallSettings.<CopyBackupRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
1050+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
1051+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"))
1052+
.build())
1053+
.setResponseTransformer(
1054+
ProtoOperationTransformers.ResponseTransformer.create(Backup.class))
1055+
.setMetadataTransformer(
1056+
ProtoOperationTransformers.MetadataTransformer.create(CopyBackupMetadata.class))
1057+
.setPollingAlgorithm(
1058+
OperationTimedPollAlgorithm.create(
1059+
RetrySettings.newBuilder()
1060+
.setInitialRetryDelay(Duration.ofMillis(5000L))
1061+
.setRetryDelayMultiplier(1.5)
1062+
.setMaxRetryDelay(Duration.ofMillis(45000L))
1063+
.setInitialRpcTimeout(Duration.ZERO)
1064+
.setRpcTimeoutMultiplier(1.0)
1065+
.setMaxRpcTimeout(Duration.ZERO)
1066+
.setTotalTimeout(Duration.ofMillis(300000L))
1067+
.build()));
1068+
10141069
builder
10151070
.restoreDatabaseOperationSettings()
10161071
.setInitialCallSettings(
@@ -1132,6 +1187,19 @@ public UnaryCallSettings.Builder<CreateBackupRequest, Operation> createBackupSet
11321187
return createBackupOperationSettings;
11331188
}
11341189

1190+
/** Returns the builder for the settings used for calls to copyBackup. */
1191+
public UnaryCallSettings.Builder<CopyBackupRequest, Operation> copyBackupSettings() {
1192+
return copyBackupSettings;
1193+
}
1194+
1195+
/** Returns the builder for the settings used for calls to copyBackup. */
1196+
@BetaApi(
1197+
"The surface for use by generated code is not stable yet and may change in the future.")
1198+
public OperationCallSettings.Builder<CopyBackupRequest, Backup, CopyBackupMetadata>
1199+
copyBackupOperationSettings() {
1200+
return copyBackupOperationSettings;
1201+
}
1202+
11351203
/** Returns the builder for the settings used for calls to getBackup. */
11361204
public UnaryCallSettings.Builder<GetBackupRequest, Backup> getBackupSettings() {
11371205
return getBackupSettings;

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import com.google.longrunning.stub.GrpcOperationsStub;
3939
import com.google.protobuf.Empty;
4040
import com.google.spanner.admin.database.v1.Backup;
41+
import com.google.spanner.admin.database.v1.CopyBackupMetadata;
42+
import com.google.spanner.admin.database.v1.CopyBackupRequest;
4143
import com.google.spanner.admin.database.v1.CreateBackupMetadata;
4244
import com.google.spanner.admin.database.v1.CreateBackupRequest;
4345
import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
@@ -171,6 +173,14 @@ public class GrpcDatabaseAdminStub extends DatabaseAdminStub {
171173
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
172174
.build();
173175

176+
private static final MethodDescriptor<CopyBackupRequest, Operation> copyBackupMethodDescriptor =
177+
MethodDescriptor.<CopyBackupRequest, Operation>newBuilder()
178+
.setType(MethodDescriptor.MethodType.UNARY)
179+
.setFullMethodName("google.spanner.admin.database.v1.DatabaseAdmin/CopyBackup")
180+
.setRequestMarshaller(ProtoUtils.marshaller(CopyBackupRequest.getDefaultInstance()))
181+
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
182+
.build();
183+
174184
private static final MethodDescriptor<GetBackupRequest, Backup> getBackupMethodDescriptor =
175185
MethodDescriptor.<GetBackupRequest, Backup>newBuilder()
176186
.setType(MethodDescriptor.MethodType.UNARY)
@@ -260,6 +270,9 @@ public class GrpcDatabaseAdminStub extends DatabaseAdminStub {
260270
private final UnaryCallable<CreateBackupRequest, Operation> createBackupCallable;
261271
private final OperationCallable<CreateBackupRequest, Backup, CreateBackupMetadata>
262272
createBackupOperationCallable;
273+
private final UnaryCallable<CopyBackupRequest, Operation> copyBackupCallable;
274+
private final OperationCallable<CopyBackupRequest, Backup, CopyBackupMetadata>
275+
copyBackupOperationCallable;
263276
private final UnaryCallable<GetBackupRequest, Backup> getBackupCallable;
264277
private final UnaryCallable<UpdateBackupRequest, Backup> updateBackupCallable;
265278
private final UnaryCallable<DeleteBackupRequest, Empty> deleteBackupCallable;
@@ -422,6 +435,16 @@ protected GrpcDatabaseAdminStub(
422435
return params.build();
423436
})
424437
.build();
438+
GrpcCallSettings<CopyBackupRequest, Operation> copyBackupTransportSettings =
439+
GrpcCallSettings.<CopyBackupRequest, Operation>newBuilder()
440+
.setMethodDescriptor(copyBackupMethodDescriptor)
441+
.setParamsExtractor(
442+
request -> {
443+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
444+
params.put("parent", String.valueOf(request.getParent()));
445+
return params.build();
446+
})
447+
.build();
425448
GrpcCallSettings<GetBackupRequest, Backup> getBackupTransportSettings =
426449
GrpcCallSettings.<GetBackupRequest, Backup>newBuilder()
427450
.setMethodDescriptor(getBackupMethodDescriptor)
@@ -551,6 +574,15 @@ protected GrpcDatabaseAdminStub(
551574
settings.createBackupOperationSettings(),
552575
clientContext,
553576
operationsStub);
577+
this.copyBackupCallable =
578+
callableFactory.createUnaryCallable(
579+
copyBackupTransportSettings, settings.copyBackupSettings(), clientContext);
580+
this.copyBackupOperationCallable =
581+
callableFactory.createOperationCallable(
582+
copyBackupTransportSettings,
583+
settings.copyBackupOperationSettings(),
584+
clientContext,
585+
operationsStub);
554586
this.getBackupCallable =
555587
callableFactory.createUnaryCallable(
556588
getBackupTransportSettings, settings.getBackupSettings(), clientContext);
@@ -679,6 +711,17 @@ public UnaryCallable<CreateBackupRequest, Operation> createBackupCallable() {
679711
return createBackupOperationCallable;
680712
}
681713

714+
@Override
715+
public UnaryCallable<CopyBackupRequest, Operation> copyBackupCallable() {
716+
return copyBackupCallable;
717+
}
718+
719+
@Override
720+
public OperationCallable<CopyBackupRequest, Backup, CopyBackupMetadata>
721+
copyBackupOperationCallable() {
722+
return copyBackupOperationCallable;
723+
}
724+
682725
@Override
683726
public UnaryCallable<GetBackupRequest, Backup> getBackupCallable() {
684727
return getBackupCallable;

0 commit comments

Comments
 (0)