Skip to content

Commit fd4b098

Browse files
feat: [tpu] make reservation_name parameter generally visible in QueuedResource message (#9353)
* feat: make reservation_name parameter generally visible in QueuedResource message --- feat: add DeleteQueuedResource experiment --- docs(v2alpha1): minor formatting to the description for `queued_resource_id` PiperOrigin-RevId: 524336094 Source-Link: googleapis/googleapis@cad90d2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/848f9c294076db6d1d1a78013040251b1c0ad7a9 Copy-Tag: eyJwIjoiamF2YS10cHUvLk93bEJvdC55YW1sIiwiaCI6Ijg0OGY5YzI5NDA3NmRiNmQxZDFhNzgwMTMwNDAyNTFiMWMwYWQ3YTkifQ== * 🦉 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 f3c56a9 commit fd4b098

File tree

23 files changed

+2036
-283
lines changed

23 files changed

+2036
-283
lines changed

java-tpu/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.11.0</version>
23+
<version>26.13.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
195195
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
196196
[stability-image]: https://img.shields.io/badge/stability-stable-green
197197
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-tpu.svg
198-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-tpu/2.15.0
198+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-tpu/2.16.0
199199
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
200200
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
201201
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-tpu/google-cloud-tpu/src/main/java/com/google/cloud/tpu/v2alpha1/TpuClient.java

Lines changed: 150 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ public final UnaryCallable<GetQueuedResourceRequest, QueuedResource> getQueuedRe
13361336
*
13371337
* @param parent Required. The parent resource name.
13381338
* @param queuedResource Required. The queued resource.
1339-
* @param queuedResourceId The unqualified resource name. Should follow the ^[A-Za-z0-9_.~+%-]+$
1339+
* @param queuedResourceId The unqualified resource name. Should follow the `^[A-Za-z0-9_.~+%-]+$`
13401340
* regex format.
13411341
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
13421342
*/
@@ -1374,7 +1374,7 @@ public final OperationFuture<QueuedResource, OperationMetadata> createQueuedReso
13741374
*
13751375
* @param parent Required. The parent resource name.
13761376
* @param queuedResource Required. The queued resource.
1377-
* @param queuedResourceId The unqualified resource name. Should follow the ^[A-Za-z0-9_.~+%-]+$
1377+
* @param queuedResourceId The unqualified resource name. Should follow the `^[A-Za-z0-9_.~+%-]+$`
13781378
* regex format.
13791379
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
13801380
*/
@@ -1636,6 +1636,154 @@ public final OperationFuture<QueuedResource, OperationMetadata> deleteQueuedReso
16361636
return stub.deleteQueuedResourceCallable();
16371637
}
16381638

1639+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
1640+
/**
1641+
* Resets a QueuedResource TPU instance
1642+
*
1643+
* <p>Sample code:
1644+
*
1645+
* <pre>{@code
1646+
* // This snippet has been automatically generated and should be regarded as a code template only.
1647+
* // It will require modifications to work:
1648+
* // - It may require correct/in-range values for request initialization.
1649+
* // - It may require specifying regional endpoints when creating the service client as shown in
1650+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
1651+
* try (TpuClient tpuClient = TpuClient.create()) {
1652+
* QueuedResourceName name =
1653+
* QueuedResourceName.of("[PROJECT]", "[LOCATION]", "[QUEUED_RESOURCE]");
1654+
* QueuedResource response = tpuClient.resetQueuedResourceAsync(name).get();
1655+
* }
1656+
* }</pre>
1657+
*
1658+
* @param name Required. The name of the queued resource.
1659+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
1660+
*/
1661+
public final OperationFuture<QueuedResource, OperationMetadata> resetQueuedResourceAsync(
1662+
QueuedResourceName name) {
1663+
ResetQueuedResourceRequest request =
1664+
ResetQueuedResourceRequest.newBuilder()
1665+
.setName(name == null ? null : name.toString())
1666+
.build();
1667+
return resetQueuedResourceAsync(request);
1668+
}
1669+
1670+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
1671+
/**
1672+
* Resets a QueuedResource TPU instance
1673+
*
1674+
* <p>Sample code:
1675+
*
1676+
* <pre>{@code
1677+
* // This snippet has been automatically generated and should be regarded as a code template only.
1678+
* // It will require modifications to work:
1679+
* // - It may require correct/in-range values for request initialization.
1680+
* // - It may require specifying regional endpoints when creating the service client as shown in
1681+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
1682+
* try (TpuClient tpuClient = TpuClient.create()) {
1683+
* String name =
1684+
* QueuedResourceName.of("[PROJECT]", "[LOCATION]", "[QUEUED_RESOURCE]").toString();
1685+
* QueuedResource response = tpuClient.resetQueuedResourceAsync(name).get();
1686+
* }
1687+
* }</pre>
1688+
*
1689+
* @param name Required. The name of the queued resource.
1690+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
1691+
*/
1692+
public final OperationFuture<QueuedResource, OperationMetadata> resetQueuedResourceAsync(
1693+
String name) {
1694+
ResetQueuedResourceRequest request =
1695+
ResetQueuedResourceRequest.newBuilder().setName(name).build();
1696+
return resetQueuedResourceAsync(request);
1697+
}
1698+
1699+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
1700+
/**
1701+
* Resets a QueuedResource TPU instance
1702+
*
1703+
* <p>Sample code:
1704+
*
1705+
* <pre>{@code
1706+
* // This snippet has been automatically generated and should be regarded as a code template only.
1707+
* // It will require modifications to work:
1708+
* // - It may require correct/in-range values for request initialization.
1709+
* // - It may require specifying regional endpoints when creating the service client as shown in
1710+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
1711+
* try (TpuClient tpuClient = TpuClient.create()) {
1712+
* ResetQueuedResourceRequest request =
1713+
* ResetQueuedResourceRequest.newBuilder()
1714+
* .setName(
1715+
* QueuedResourceName.of("[PROJECT]", "[LOCATION]", "[QUEUED_RESOURCE]").toString())
1716+
* .build();
1717+
* QueuedResource response = tpuClient.resetQueuedResourceAsync(request).get();
1718+
* }
1719+
* }</pre>
1720+
*
1721+
* @param request The request object containing all of the parameters for the API call.
1722+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
1723+
*/
1724+
public final OperationFuture<QueuedResource, OperationMetadata> resetQueuedResourceAsync(
1725+
ResetQueuedResourceRequest request) {
1726+
return resetQueuedResourceOperationCallable().futureCall(request);
1727+
}
1728+
1729+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
1730+
/**
1731+
* Resets a QueuedResource TPU instance
1732+
*
1733+
* <p>Sample code:
1734+
*
1735+
* <pre>{@code
1736+
* // This snippet has been automatically generated and should be regarded as a code template only.
1737+
* // It will require modifications to work:
1738+
* // - It may require correct/in-range values for request initialization.
1739+
* // - It may require specifying regional endpoints when creating the service client as shown in
1740+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
1741+
* try (TpuClient tpuClient = TpuClient.create()) {
1742+
* ResetQueuedResourceRequest request =
1743+
* ResetQueuedResourceRequest.newBuilder()
1744+
* .setName(
1745+
* QueuedResourceName.of("[PROJECT]", "[LOCATION]", "[QUEUED_RESOURCE]").toString())
1746+
* .build();
1747+
* OperationFuture<QueuedResource, OperationMetadata> future =
1748+
* tpuClient.resetQueuedResourceOperationCallable().futureCall(request);
1749+
* // Do something.
1750+
* QueuedResource response = future.get();
1751+
* }
1752+
* }</pre>
1753+
*/
1754+
public final OperationCallable<ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
1755+
resetQueuedResourceOperationCallable() {
1756+
return stub.resetQueuedResourceOperationCallable();
1757+
}
1758+
1759+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
1760+
/**
1761+
* Resets a QueuedResource TPU instance
1762+
*
1763+
* <p>Sample code:
1764+
*
1765+
* <pre>{@code
1766+
* // This snippet has been automatically generated and should be regarded as a code template only.
1767+
* // It will require modifications to work:
1768+
* // - It may require correct/in-range values for request initialization.
1769+
* // - It may require specifying regional endpoints when creating the service client as shown in
1770+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
1771+
* try (TpuClient tpuClient = TpuClient.create()) {
1772+
* ResetQueuedResourceRequest request =
1773+
* ResetQueuedResourceRequest.newBuilder()
1774+
* .setName(
1775+
* QueuedResourceName.of("[PROJECT]", "[LOCATION]", "[QUEUED_RESOURCE]").toString())
1776+
* .build();
1777+
* ApiFuture<Operation> future = tpuClient.resetQueuedResourceCallable().futureCall(request);
1778+
* // Do something.
1779+
* Operation response = future.get();
1780+
* }
1781+
* }</pre>
1782+
*/
1783+
public final UnaryCallable<ResetQueuedResourceRequest, Operation> resetQueuedResourceCallable() {
1784+
return stub.resetQueuedResourceCallable();
1785+
}
1786+
16391787
// AUTO-GENERATED DOCUMENTATION AND METHOD.
16401788
/**
16411789
* Generates the Cloud TPU service identity for the project.

java-tpu/google-cloud-tpu/src/main/java/com/google/cloud/tpu/v2alpha1/TpuSettings.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,17 @@ public UnaryCallSettings<DeleteQueuedResourceRequest, Operation> deleteQueuedRes
185185
return ((TpuStubSettings) getStubSettings()).deleteQueuedResourceOperationSettings();
186186
}
187187

188+
/** Returns the object with the settings used for calls to resetQueuedResource. */
189+
public UnaryCallSettings<ResetQueuedResourceRequest, Operation> resetQueuedResourceSettings() {
190+
return ((TpuStubSettings) getStubSettings()).resetQueuedResourceSettings();
191+
}
192+
193+
/** Returns the object with the settings used for calls to resetQueuedResource. */
194+
public OperationCallSettings<ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
195+
resetQueuedResourceOperationSettings() {
196+
return ((TpuStubSettings) getStubSettings()).resetQueuedResourceOperationSettings();
197+
}
198+
188199
/** Returns the object with the settings used for calls to generateServiceIdentity. */
189200
public UnaryCallSettings<GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
190201
generateServiceIdentitySettings() {
@@ -450,6 +461,19 @@ public UnaryCallSettings.Builder<UpdateNodeRequest, Operation> updateNodeSetting
450461
return getStubSettingsBuilder().deleteQueuedResourceOperationSettings();
451462
}
452463

464+
/** Returns the builder for the settings used for calls to resetQueuedResource. */
465+
public UnaryCallSettings.Builder<ResetQueuedResourceRequest, Operation>
466+
resetQueuedResourceSettings() {
467+
return getStubSettingsBuilder().resetQueuedResourceSettings();
468+
}
469+
470+
/** Returns the builder for the settings used for calls to resetQueuedResource. */
471+
public OperationCallSettings.Builder<
472+
ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
473+
resetQueuedResourceOperationSettings() {
474+
return getStubSettingsBuilder().resetQueuedResourceOperationSettings();
475+
}
476+
453477
/** Returns the builder for the settings used for calls to generateServiceIdentity. */
454478
public UnaryCallSettings.Builder<
455479
GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>

java-tpu/google-cloud-tpu/src/main/java/com/google/cloud/tpu/v2alpha1/gapic_metadata.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
"ListRuntimeVersions": {
5959
"methods": ["listRuntimeVersions", "listRuntimeVersions", "listRuntimeVersions", "listRuntimeVersionsPagedCallable", "listRuntimeVersionsCallable"]
6060
},
61+
"ResetQueuedResource": {
62+
"methods": ["resetQueuedResourceAsync", "resetQueuedResourceAsync", "resetQueuedResourceAsync", "resetQueuedResourceOperationCallable", "resetQueuedResourceCallable"]
63+
},
6164
"SimulateMaintenanceEvent": {
6265
"methods": ["simulateMaintenanceEventAsync", "simulateMaintenanceEventOperationCallable", "simulateMaintenanceEventCallable"]
6366
},

java-tpu/google-cloud-tpu/src/main/java/com/google/cloud/tpu/v2alpha1/stub/GrpcTpuStub.java

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import com.google.cloud.tpu.v2alpha1.Node;
5959
import com.google.cloud.tpu.v2alpha1.OperationMetadata;
6060
import com.google.cloud.tpu.v2alpha1.QueuedResource;
61+
import com.google.cloud.tpu.v2alpha1.ResetQueuedResourceRequest;
6162
import com.google.cloud.tpu.v2alpha1.RuntimeVersion;
6263
import com.google.cloud.tpu.v2alpha1.SimulateMaintenanceEventRequest;
6364
import com.google.cloud.tpu.v2alpha1.StartNodeRequest;
@@ -180,6 +181,16 @@ public class GrpcTpuStub extends TpuStub {
180181
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
181182
.build();
182183

184+
private static final MethodDescriptor<ResetQueuedResourceRequest, Operation>
185+
resetQueuedResourceMethodDescriptor =
186+
MethodDescriptor.<ResetQueuedResourceRequest, Operation>newBuilder()
187+
.setType(MethodDescriptor.MethodType.UNARY)
188+
.setFullMethodName("google.cloud.tpu.v2alpha1.Tpu/ResetQueuedResource")
189+
.setRequestMarshaller(
190+
ProtoUtils.marshaller(ResetQueuedResourceRequest.getDefaultInstance()))
191+
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
192+
.build();
193+
183194
private static final MethodDescriptor<
184195
GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
185196
generateServiceIdentityMethodDescriptor =
@@ -304,6 +315,9 @@ public class GrpcTpuStub extends TpuStub {
304315
private final UnaryCallable<DeleteQueuedResourceRequest, Operation> deleteQueuedResourceCallable;
305316
private final OperationCallable<DeleteQueuedResourceRequest, QueuedResource, OperationMetadata>
306317
deleteQueuedResourceOperationCallable;
318+
private final UnaryCallable<ResetQueuedResourceRequest, Operation> resetQueuedResourceCallable;
319+
private final OperationCallable<ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
320+
resetQueuedResourceOperationCallable;
307321
private final UnaryCallable<GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
308322
generateServiceIdentityCallable;
309323
private final UnaryCallable<ListAcceleratorTypesRequest, ListAcceleratorTypesResponse>
@@ -476,6 +490,16 @@ protected GrpcTpuStub(
476490
return params.build();
477491
})
478492
.build();
493+
GrpcCallSettings<ResetQueuedResourceRequest, Operation> resetQueuedResourceTransportSettings =
494+
GrpcCallSettings.<ResetQueuedResourceRequest, Operation>newBuilder()
495+
.setMethodDescriptor(resetQueuedResourceMethodDescriptor)
496+
.setParamsExtractor(
497+
request -> {
498+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
499+
params.put("name", String.valueOf(request.getName()));
500+
return params.build();
501+
})
502+
.build();
479503
GrpcCallSettings<GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
480504
generateServiceIdentityTransportSettings =
481505
GrpcCallSettings
@@ -665,6 +689,17 @@ protected GrpcTpuStub(
665689
settings.deleteQueuedResourceOperationSettings(),
666690
clientContext,
667691
operationsStub);
692+
this.resetQueuedResourceCallable =
693+
callableFactory.createUnaryCallable(
694+
resetQueuedResourceTransportSettings,
695+
settings.resetQueuedResourceSettings(),
696+
clientContext);
697+
this.resetQueuedResourceOperationCallable =
698+
callableFactory.createOperationCallable(
699+
resetQueuedResourceTransportSettings,
700+
settings.resetQueuedResourceOperationSettings(),
701+
clientContext,
702+
operationsStub);
668703
this.generateServiceIdentityCallable =
669704
callableFactory.createUnaryCallable(
670705
generateServiceIdentityTransportSettings,
@@ -841,6 +876,17 @@ public UnaryCallable<DeleteQueuedResourceRequest, Operation> deleteQueuedResourc
841876
return deleteQueuedResourceOperationCallable;
842877
}
843878

879+
@Override
880+
public UnaryCallable<ResetQueuedResourceRequest, Operation> resetQueuedResourceCallable() {
881+
return resetQueuedResourceCallable;
882+
}
883+
884+
@Override
885+
public OperationCallable<ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
886+
resetQueuedResourceOperationCallable() {
887+
return resetQueuedResourceOperationCallable;
888+
}
889+
844890
@Override
845891
public UnaryCallable<GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
846892
generateServiceIdentityCallable() {

java-tpu/google-cloud-tpu/src/main/java/com/google/cloud/tpu/v2alpha1/stub/TpuStub.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.google.cloud.tpu.v2alpha1.Node;
5555
import com.google.cloud.tpu.v2alpha1.OperationMetadata;
5656
import com.google.cloud.tpu.v2alpha1.QueuedResource;
57+
import com.google.cloud.tpu.v2alpha1.ResetQueuedResourceRequest;
5758
import com.google.cloud.tpu.v2alpha1.RuntimeVersion;
5859
import com.google.cloud.tpu.v2alpha1.SimulateMaintenanceEventRequest;
5960
import com.google.cloud.tpu.v2alpha1.StartNodeRequest;
@@ -167,6 +168,16 @@ public UnaryCallable<DeleteQueuedResourceRequest, Operation> deleteQueuedResourc
167168
throw new UnsupportedOperationException("Not implemented: deleteQueuedResourceCallable()");
168169
}
169170

171+
public OperationCallable<ResetQueuedResourceRequest, QueuedResource, OperationMetadata>
172+
resetQueuedResourceOperationCallable() {
173+
throw new UnsupportedOperationException(
174+
"Not implemented: resetQueuedResourceOperationCallable()");
175+
}
176+
177+
public UnaryCallable<ResetQueuedResourceRequest, Operation> resetQueuedResourceCallable() {
178+
throw new UnsupportedOperationException("Not implemented: resetQueuedResourceCallable()");
179+
}
180+
170181
public UnaryCallable<GenerateServiceIdentityRequest, GenerateServiceIdentityResponse>
171182
generateServiceIdentityCallable() {
172183
throw new UnsupportedOperationException("Not implemented: generateServiceIdentityCallable()");

0 commit comments

Comments
 (0)