Skip to content

Commit 368dfe7

Browse files
bart-at-googlecopybara-github
authored andcommitted
feat: use getTaskTrackingInfo instead of searchTasks in validation
PiperOrigin-RevId: 629774501
1 parent 2b30bb1 commit 368dfe7

File tree

7 files changed

+38
-20
lines changed

7 files changed

+38
-20
lines changed

sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
88
import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
99
import google.maps.fleetengine.delivery.v1.GetTaskRequest;
10-
import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
10+
import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
1111
import google.maps.fleetengine.delivery.v1.Task;
12+
import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
1213
import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
1314

1415
public class DeliveryServiceStubClient implements DeliveryServiceStub {
@@ -31,8 +32,9 @@ public Task getTask(GetTaskRequest getTaskRequest) {
3132
}
3233

3334
@Override
34-
public void searchTasks(SearchTasksRequest searchTripRequest) {
35-
client.searchTasks(searchTripRequest);
35+
public TaskTrackingInfo getTaskTrackingInfo(
36+
GetTaskTrackingInfoRequest getTaskTrackingInfoRequest) {
37+
return client.getTaskTrackingInfo(getTaskTrackingInfoRequest);
3638
}
3739

3840
@Override

sample/src/main/java/com/google/fleetengine/auth/sample/ValidateLmfsRoles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static void run() throws Throwable {
8585
if (configuration.getMinter().deliveryFleetReaderSigner() != null) {
8686
CommandLineRuntime.printRunScriptMessage(DELIVERY_FLEET_READER);
8787
new DeliveryFleetReaderTokenValidationScript(runtime, configuration, clientFactory)
88-
.run(ids.getDeliveryVehicleId());
88+
.run(ids.getTrackingId());
8989
} else {
9090
CommandLineRuntime.printSkipScriptMessage(DELIVERY_FLEET_READER);
9191
}

sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public void run(String trackingId) throws Throwable {
3030
() -> configuration.getMinter().getFleetReaderToken());
3131

3232
runtime.runCommand(
33-
"Search tasks with fleet reader token", () -> commands.searchTasks(trackingId));
33+
"Get task tracking info with fleet reader token",
34+
() -> {
35+
var unused = commands.getTaskTrackingInfo(trackingId);
36+
});
3437
}
3538
}

sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ public void run(String trackingId) throws Throwable {
2929
.getDeliveryConsumerToken(TrackingClaims.create(trackingId)));
3030

3131
runtime.runCommand(
32-
"Search tasks with delivery consumer token",
33-
() -> taskCommandsWithTrackingId.searchTasks(trackingId));
32+
"Get task tracking info with delivery consumer token",
33+
() -> {
34+
var unused = taskCommandsWithTrackingId.getTaskTrackingInfo(trackingId);
35+
});
3436

3537
DeliveryServiceCommands taskCommandsWithIncorrectTrackingId =
3638
commandsFactory.createDeliveryServiceCommands(
@@ -43,7 +45,10 @@ public void run(String trackingId) throws Throwable {
4345
TrackingClaims.create(ScriptUtils.generateRandomTrackingId())));
4446

4547
runtime.expectPermissionDenied(
46-
"Search task fails when tracking id of task different than delivery " + "consumer token",
47-
() -> taskCommandsWithIncorrectTrackingId.searchTasks(trackingId));
48+
"Get task tracking info fails when tracking id of task different than delivery "
49+
+ "consumer token",
50+
() -> {
51+
var unused = taskCommandsWithIncorrectTrackingId.getTaskTrackingInfo(trackingId);
52+
});
4853
}
4954
}

sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public void run(String trackingId) throws Throwable {
2424
() -> configuration.getMinter().getDeliveryFleetReaderToken());
2525

2626
runtime.runCommand(
27-
"Search tasks with delivery fleet reader token", () -> commands.searchTasks(trackingId));
27+
"Get task tracking info with delivery fleet reader token",
28+
() -> {
29+
var unused = commands.getTaskTrackingInfo(trackingId);
30+
});
2831
}
2932
}

sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
99
import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
1010
import google.maps.fleetengine.delivery.v1.GetTaskRequest;
11+
import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
1112
import google.maps.fleetengine.delivery.v1.LocationInfo;
12-
import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
1313
import google.maps.fleetengine.delivery.v1.Task;
1414
import google.maps.fleetengine.delivery.v1.Task.State;
1515
import google.maps.fleetengine.delivery.v1.Task.TaskOutcome;
16+
import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
1617
import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
1718

1819
public class DeliveryServiceCommands {
@@ -56,13 +57,12 @@ public Task getTask(String taskId) {
5657
}
5758

5859
/** Search existing tasks by tracking id. */
59-
public void searchTasks(String trackingId) {
60-
SearchTasksRequest searchTasksRequest =
61-
SearchTasksRequest.newBuilder()
62-
.setParent(ScriptUtils.getProviderName(providerId))
63-
.setTrackingId(trackingId)
60+
public TaskTrackingInfo getTaskTrackingInfo(String trackingId) {
61+
GetTaskTrackingInfoRequest getTaskTrackingInfoRequest =
62+
GetTaskTrackingInfoRequest.newBuilder()
63+
.setName(getTaskTrackingInfoName(trackingId))
6464
.build();
65-
stub.searchTasks(searchTasksRequest);
65+
return stub.getTaskTrackingInfo(getTaskTrackingInfoRequest);
6666
}
6767

6868
/** Update task outcome to succeed. */
@@ -84,6 +84,10 @@ private String getTaskName(String taskId) {
8484
return String.format("providers/%s/tasks/%s", providerId, taskId);
8585
}
8686

87+
private String getTaskTrackingInfoName(String trackingId) {
88+
return String.format("providers/%s/taskTrackingInfo/%s", providerId, trackingId);
89+
}
90+
8791
public DeliveryVehicle createDeliveryVehicle(String deliveryVehicleId) {
8892
DeliveryVehicle deliveryVehicle =
8993
DeliveryVehicle.newBuilder().setName(getDeliveryVehicleName(deliveryVehicleId)).build();

sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
66
import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
77
import google.maps.fleetengine.delivery.v1.GetTaskRequest;
8-
import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
8+
import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
99
import google.maps.fleetengine.delivery.v1.Task;
10+
import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
1011
import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
1112

1213
/** Wraps {@link google.maps.fleetengine.delivery.v1.DeliveryServiceClient} for testing purposes. */
@@ -25,9 +26,9 @@ public interface DeliveryServiceStub {
2526

2627
/**
2728
* see: {@link
28-
* google.maps.fleetengine.delivery.v1.DeliveryServiceClient#searchTasks(SearchTasksRequest)}
29+
* google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTaskTrackingInfo(GetTaskTrackingInfoRequest)}
2930
*/
30-
void searchTasks(SearchTasksRequest searchTripRequest);
31+
TaskTrackingInfo getTaskTrackingInfo(GetTaskTrackingInfoRequest getTaskTrackingInfoRequest);
3132

3233
/**
3334
* see: {@link

0 commit comments

Comments
 (0)