Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [file] Added REGIONAL tier support in the v1beta1 API #10058

Merged
merged 4 commits into from Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-filestore/README.md
Expand Up @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.23.0</version>
<version>26.27.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-filestore.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-filestore/1.25.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-filestore/1.31.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down
Expand Up @@ -955,6 +955,98 @@ public final UnaryCallable<RestoreInstanceRequest, Operation> restoreInstanceCal
return stub.restoreInstanceCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Revert an existing instance's file system to a specified snapshot.
*
* <p>Sample code:
*
* <pre>{@code
* // This snippet has been automatically generated and should be regarded as a code template only.
* // It will require modifications to work:
* // - It may require correct/in-range values for request initialization.
* // - It may require specifying regional endpoints when creating the service client as shown in
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
* try (CloudFilestoreManagerClient cloudFilestoreManagerClient =
* CloudFilestoreManagerClient.create()) {
* RevertInstanceRequest request =
* RevertInstanceRequest.newBuilder()
* .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
* .setTargetSnapshotId("targetSnapshotId-2099459472")
* .build();
* Instance response = cloudFilestoreManagerClient.revertInstanceAsync(request).get();
* }
* }</pre>
*
* @param request The request object containing all of the parameters for the API call.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final OperationFuture<Instance, OperationMetadata> revertInstanceAsync(
RevertInstanceRequest request) {
return revertInstanceOperationCallable().futureCall(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Revert an existing instance's file system to a specified snapshot.
*
* <p>Sample code:
*
* <pre>{@code
* // This snippet has been automatically generated and should be regarded as a code template only.
* // It will require modifications to work:
* // - It may require correct/in-range values for request initialization.
* // - It may require specifying regional endpoints when creating the service client as shown in
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
* try (CloudFilestoreManagerClient cloudFilestoreManagerClient =
* CloudFilestoreManagerClient.create()) {
* RevertInstanceRequest request =
* RevertInstanceRequest.newBuilder()
* .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
* .setTargetSnapshotId("targetSnapshotId-2099459472")
* .build();
* OperationFuture<Instance, OperationMetadata> future =
* cloudFilestoreManagerClient.revertInstanceOperationCallable().futureCall(request);
* // Do something.
* Instance response = future.get();
* }
* }</pre>
*/
public final OperationCallable<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationCallable() {
return stub.revertInstanceOperationCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Revert an existing instance's file system to a specified snapshot.
*
* <p>Sample code:
*
* <pre>{@code
* // This snippet has been automatically generated and should be regarded as a code template only.
* // It will require modifications to work:
* // - It may require correct/in-range values for request initialization.
* // - It may require specifying regional endpoints when creating the service client as shown in
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
* try (CloudFilestoreManagerClient cloudFilestoreManagerClient =
* CloudFilestoreManagerClient.create()) {
* RevertInstanceRequest request =
* RevertInstanceRequest.newBuilder()
* .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
* .setTargetSnapshotId("targetSnapshotId-2099459472")
* .build();
* ApiFuture<Operation> future =
* cloudFilestoreManagerClient.revertInstanceCallable().futureCall(request);
* // Do something.
* Operation response = future.get();
* }
* }</pre>
*/
public final UnaryCallable<RevertInstanceRequest, Operation> revertInstanceCallable() {
return stub.revertInstanceCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Deletes an instance.
Expand Down
Expand Up @@ -129,6 +129,18 @@ public UnaryCallSettings<RestoreInstanceRequest, Operation> restoreInstanceSetti
.restoreInstanceOperationSettings();
}

/** Returns the object with the settings used for calls to revertInstance. */
public UnaryCallSettings<RevertInstanceRequest, Operation> revertInstanceSettings() {
return ((CloudFilestoreManagerStubSettings) getStubSettings()).revertInstanceSettings();
}

/** Returns the object with the settings used for calls to revertInstance. */
public OperationCallSettings<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings() {
return ((CloudFilestoreManagerStubSettings) getStubSettings())
.revertInstanceOperationSettings();
}

/** Returns the object with the settings used for calls to deleteInstance. */
public UnaryCallSettings<DeleteInstanceRequest, Operation> deleteInstanceSettings() {
return ((CloudFilestoreManagerStubSettings) getStubSettings()).deleteInstanceSettings();
Expand Down Expand Up @@ -393,6 +405,17 @@ public UnaryCallSettings.Builder<RestoreInstanceRequest, Operation> restoreInsta
return getStubSettingsBuilder().restoreInstanceOperationSettings();
}

/** Returns the builder for the settings used for calls to revertInstance. */
public UnaryCallSettings.Builder<RevertInstanceRequest, Operation> revertInstanceSettings() {
return getStubSettingsBuilder().revertInstanceSettings();
}

/** Returns the builder for the settings used for calls to revertInstance. */
public OperationCallSettings.Builder<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings() {
return getStubSettingsBuilder().revertInstanceOperationSettings();
}

/** Returns the builder for the settings used for calls to deleteInstance. */
public UnaryCallSettings.Builder<DeleteInstanceRequest, Operation> deleteInstanceSettings() {
return getStubSettingsBuilder().deleteInstanceSettings();
Expand Down
Expand Up @@ -49,6 +49,9 @@
"RestoreInstance": {
"methods": ["restoreInstanceAsync", "restoreInstanceOperationCallable", "restoreInstanceCallable"]
},
"RevertInstance": {
"methods": ["revertInstanceAsync", "revertInstanceOperationCallable", "revertInstanceCallable"]
},
"UpdateBackup": {
"methods": ["updateBackupAsync", "updateBackupAsync", "updateBackupOperationCallable", "updateBackupCallable"]
},
Expand Down
Expand Up @@ -42,6 +42,7 @@
import com.google.cloud.filestore.v1.ListSnapshotsRequest;
import com.google.cloud.filestore.v1.ListSnapshotsResponse;
import com.google.cloud.filestore.v1.RestoreInstanceRequest;
import com.google.cloud.filestore.v1.RevertInstanceRequest;
import com.google.cloud.filestore.v1.Snapshot;
import com.google.cloud.filestore.v1.UpdateBackupRequest;
import com.google.cloud.filestore.v1.UpdateInstanceRequest;
Expand Down Expand Up @@ -108,6 +109,15 @@ public UnaryCallable<RestoreInstanceRequest, Operation> restoreInstanceCallable(
throw new UnsupportedOperationException("Not implemented: restoreInstanceCallable()");
}

public OperationCallable<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationCallable() {
throw new UnsupportedOperationException("Not implemented: revertInstanceOperationCallable()");
}

public UnaryCallable<RevertInstanceRequest, Operation> revertInstanceCallable() {
throw new UnsupportedOperationException("Not implemented: revertInstanceCallable()");
}

public OperationCallable<DeleteInstanceRequest, Empty, OperationMetadata>
deleteInstanceOperationCallable() {
throw new UnsupportedOperationException("Not implemented: deleteInstanceOperationCallable()");
Expand Down
Expand Up @@ -68,6 +68,7 @@
import com.google.cloud.filestore.v1.ListSnapshotsRequest;
import com.google.cloud.filestore.v1.ListSnapshotsResponse;
import com.google.cloud.filestore.v1.RestoreInstanceRequest;
import com.google.cloud.filestore.v1.RevertInstanceRequest;
import com.google.cloud.filestore.v1.Snapshot;
import com.google.cloud.filestore.v1.UpdateBackupRequest;
import com.google.cloud.filestore.v1.UpdateInstanceRequest;
Expand Down Expand Up @@ -141,6 +142,9 @@ public class CloudFilestoreManagerStubSettings
private final UnaryCallSettings<RestoreInstanceRequest, Operation> restoreInstanceSettings;
private final OperationCallSettings<RestoreInstanceRequest, Instance, OperationMetadata>
restoreInstanceOperationSettings;
private final UnaryCallSettings<RevertInstanceRequest, Operation> revertInstanceSettings;
private final OperationCallSettings<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings;
private final UnaryCallSettings<DeleteInstanceRequest, Operation> deleteInstanceSettings;
private final OperationCallSettings<DeleteInstanceRequest, Empty, OperationMetadata>
deleteInstanceOperationSettings;
Expand Down Expand Up @@ -373,6 +377,17 @@ public UnaryCallSettings<RestoreInstanceRequest, Operation> restoreInstanceSetti
return restoreInstanceOperationSettings;
}

/** Returns the object with the settings used for calls to revertInstance. */
public UnaryCallSettings<RevertInstanceRequest, Operation> revertInstanceSettings() {
return revertInstanceSettings;
}

/** Returns the object with the settings used for calls to revertInstance. */
public OperationCallSettings<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings() {
return revertInstanceOperationSettings;
}

/** Returns the object with the settings used for calls to deleteInstance. */
public UnaryCallSettings<DeleteInstanceRequest, Operation> deleteInstanceSettings() {
return deleteInstanceSettings;
Expand Down Expand Up @@ -586,6 +601,8 @@ protected CloudFilestoreManagerStubSettings(Builder settingsBuilder) throws IOEx
updateInstanceOperationSettings = settingsBuilder.updateInstanceOperationSettings().build();
restoreInstanceSettings = settingsBuilder.restoreInstanceSettings().build();
restoreInstanceOperationSettings = settingsBuilder.restoreInstanceOperationSettings().build();
revertInstanceSettings = settingsBuilder.revertInstanceSettings().build();
revertInstanceOperationSettings = settingsBuilder.revertInstanceOperationSettings().build();
deleteInstanceSettings = settingsBuilder.deleteInstanceSettings().build();
deleteInstanceOperationSettings = settingsBuilder.deleteInstanceOperationSettings().build();
listSnapshotsSettings = settingsBuilder.listSnapshotsSettings().build();
Expand Down Expand Up @@ -626,6 +643,10 @@ public static class Builder
restoreInstanceSettings;
private final OperationCallSettings.Builder<RestoreInstanceRequest, Instance, OperationMetadata>
restoreInstanceOperationSettings;
private final UnaryCallSettings.Builder<RevertInstanceRequest, Operation>
revertInstanceSettings;
private final OperationCallSettings.Builder<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings;
private final UnaryCallSettings.Builder<DeleteInstanceRequest, Operation>
deleteInstanceSettings;
private final OperationCallSettings.Builder<DeleteInstanceRequest, Empty, OperationMetadata>
Expand Down Expand Up @@ -672,9 +693,9 @@ public static class Builder
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
definitions.put(
"no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
definitions.put(
"no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down Expand Up @@ -710,6 +731,8 @@ public static class Builder
.setTotalTimeout(Duration.ofMillis(14400000L))
.build();
definitions.put("no_retry_2_params", settings);
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
definitions.put("no_retry_params", settings);
settings =
RetrySettings.newBuilder()
.setInitialRpcTimeout(Duration.ofMillis(600000L))
Expand All @@ -718,8 +741,6 @@ public static class Builder
.setTotalTimeout(Duration.ofMillis(600000L))
.build();
definitions.put("no_retry_3_params", settings);
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
definitions.put("no_retry_params", settings);
RETRY_PARAM_DEFINITIONS = definitions.build();
}

Expand All @@ -738,6 +759,8 @@ protected Builder(ClientContext clientContext) {
updateInstanceOperationSettings = OperationCallSettings.newBuilder();
restoreInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
restoreInstanceOperationSettings = OperationCallSettings.newBuilder();
revertInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
revertInstanceOperationSettings = OperationCallSettings.newBuilder();
deleteInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
deleteInstanceOperationSettings = OperationCallSettings.newBuilder();
listSnapshotsSettings = PagedCallSettings.newBuilder(LIST_SNAPSHOTS_PAGE_STR_FACT);
Expand All @@ -764,6 +787,7 @@ protected Builder(ClientContext clientContext) {
createInstanceSettings,
updateInstanceSettings,
restoreInstanceSettings,
revertInstanceSettings,
deleteInstanceSettings,
listSnapshotsSettings,
getSnapshotSettings,
Expand All @@ -789,6 +813,8 @@ protected Builder(CloudFilestoreManagerStubSettings settings) {
updateInstanceOperationSettings = settings.updateInstanceOperationSettings.toBuilder();
restoreInstanceSettings = settings.restoreInstanceSettings.toBuilder();
restoreInstanceOperationSettings = settings.restoreInstanceOperationSettings.toBuilder();
revertInstanceSettings = settings.revertInstanceSettings.toBuilder();
revertInstanceOperationSettings = settings.revertInstanceOperationSettings.toBuilder();
deleteInstanceSettings = settings.deleteInstanceSettings.toBuilder();
deleteInstanceOperationSettings = settings.deleteInstanceOperationSettings.toBuilder();
listSnapshotsSettings = settings.listSnapshotsSettings.toBuilder();
Expand All @@ -815,6 +841,7 @@ protected Builder(CloudFilestoreManagerStubSettings settings) {
createInstanceSettings,
updateInstanceSettings,
restoreInstanceSettings,
revertInstanceSettings,
deleteInstanceSettings,
listSnapshotsSettings,
getSnapshotSettings,
Expand Down Expand Up @@ -880,6 +907,11 @@ private static Builder initDefaults(Builder builder) {
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));

builder
.revertInstanceSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));

builder
.deleteInstanceSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
Expand Down Expand Up @@ -1007,6 +1039,30 @@ private static Builder initDefaults(Builder builder) {
.setTotalTimeout(Duration.ofMillis(300000L))
.build()));

builder
.revertInstanceOperationSettings()
.setInitialCallSettings(
UnaryCallSettings
.<RevertInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"))
.build())
.setResponseTransformer(
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
.setMetadataTransformer(
ProtoOperationTransformers.MetadataTransformer.create(OperationMetadata.class))
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
.setInitialRetryDelay(Duration.ofMillis(5000L))
.setRetryDelayMultiplier(1.5)
.setMaxRetryDelay(Duration.ofMillis(45000L))
.setInitialRpcTimeout(Duration.ZERO)
.setRpcTimeoutMultiplier(1.0)
.setMaxRpcTimeout(Duration.ZERO)
.setTotalTimeout(Duration.ofMillis(300000L))
.build()));

builder
.deleteInstanceOperationSettings()
.setInitialCallSettings(
Expand Down Expand Up @@ -1244,6 +1300,19 @@ public UnaryCallSettings.Builder<RestoreInstanceRequest, Operation> restoreInsta
return restoreInstanceOperationSettings;
}

/** Returns the builder for the settings used for calls to revertInstance. */
public UnaryCallSettings.Builder<RevertInstanceRequest, Operation> revertInstanceSettings() {
return revertInstanceSettings;
}

/** Returns the builder for the settings used for calls to revertInstance. */
@BetaApi(
"The surface for use by generated code is not stable yet and may change in the future.")
public OperationCallSettings.Builder<RevertInstanceRequest, Instance, OperationMetadata>
revertInstanceOperationSettings() {
return revertInstanceOperationSettings;
}

/** Returns the builder for the settings used for calls to deleteInstance. */
public UnaryCallSettings.Builder<DeleteInstanceRequest, Operation> deleteInstanceSettings() {
return deleteInstanceSettings;
Expand Down