feat: use getTaskTrackingInfo instead of searchTasks in validation

PiperOrigin-RevId: 629460013
googlemaps · Apr 30, 2024 · 9e096dc · 9e096dc
1 parent a054455
commit 9e096dc
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 22 deletions.
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -36,14 +36,22 @@ run {
     standardInput = System.in
 }
 
+sourceSets.all {
+  configurations.getByName(runtimeClasspathConfigurationName) {
+    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+  }
+  configurations.getByName(compileClasspathConfigurationName) {
+    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+  }
+}
 dependencies {
     annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
 
     implementation 'com.google.api:gax:1.65.1'
     implementation 'com.google.api:gax-grpc:1.65.1'
 
-    implementation 'com.google.maps:gapic-google-maps-fleetengine-v1-java:0.0.348'
-    implementation 'com.google.maps:gapic-google-maps-fleetengine-delivery-v1-java:0.0.348'
+    implementation 'com.google.maps:gapic-google-maps-fleetengine-v1-java:0.0.3231'
+    implementation 'com.google.maps:gapic-google-maps-fleetengine-delivery-v1-java:0.0.3231'
     implementation project(':fleetengine-auth')
 
     testImplementation 'junit:junit:4.13.1'

diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java b/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java
@@ -7,8 +7,9 @@
 import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
 import google.maps.fleetengine.delivery.v1.GetTaskRequest;
-import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
+import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
 import google.maps.fleetengine.delivery.v1.Task;
+import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
 import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
 
 public class DeliveryServiceStubClient implements DeliveryServiceStub {
@@ -31,8 +32,9 @@ public Task getTask(GetTaskRequest getTaskRequest) {
   }
 
   @Override
-  public void searchTasks(SearchTasksRequest searchTripRequest) {
-    client.searchTasks(searchTripRequest);
+  public TaskTrackingInfo getTaskTrackingInfo(
+      GetTaskTrackingInfoRequest getTaskTrackingInfoRequest) {
+    return client.getTaskTrackingInfo(getTaskTrackingInfoRequest);
   }
 
   @Override

diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/ValidateLmfsRoles.java b/sample/src/main/java/com/google/fleetengine/auth/sample/ValidateLmfsRoles.java
@@ -85,7 +85,7 @@ public static void run() throws Throwable {
     if (configuration.getMinter().deliveryFleetReaderSigner() != null) {
       CommandLineRuntime.printRunScriptMessage(DELIVERY_FLEET_READER);
       new DeliveryFleetReaderTokenValidationScript(runtime, configuration, clientFactory)
-          .run(ids.getDeliveryVehicleId());
+          .run(ids.getTrackingId());
     } else {
       CommandLineRuntime.printSkipScriptMessage(DELIVERY_FLEET_READER);
     }

diff --git a/.../fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java b/.../fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java
@@ -30,6 +30,9 @@ public void run(String trackingId) throws Throwable {
             () -> configuration.getMinter().getFleetReaderToken());
 
     runtime.runCommand(
-        "Search tasks with fleet reader token", () -> commands.searchTasks(trackingId));
+        "Get task tracking info with fleet reader token",
+        () -> {
+          var unused = commands.getTaskTrackingInfo(trackingId);
+        });
   }
 }
diff --git a/.../com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java b/.../com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java
@@ -29,8 +29,10 @@ public void run(String trackingId) throws Throwable {
                     .getDeliveryConsumerToken(TrackingClaims.create(trackingId)));
 
     runtime.runCommand(
-        "Search tasks with delivery consumer token",
-        () -> taskCommandsWithTrackingId.searchTasks(trackingId));
+        "Get task tracking info with delivery consumer token",
+        () -> {
+          var unused = taskCommandsWithTrackingId.getTaskTrackingInfo(trackingId);
+        });
 
     DeliveryServiceCommands taskCommandsWithIncorrectTrackingId =
         commandsFactory.createDeliveryServiceCommands(
@@ -43,7 +45,10 @@ public void run(String trackingId) throws Throwable {
                         TrackingClaims.create(ScriptUtils.generateRandomTrackingId())));
 
     runtime.expectPermissionDenied(
-        "Search task fails when tracking id of task different than delivery " + "consumer token",
-        () -> taskCommandsWithIncorrectTrackingId.searchTasks(trackingId));
+        "Get task tracking info fails when tracking id of task different than delivery "
+            + "consumer token",
+        () -> {
+          var unused = taskCommandsWithIncorrectTrackingId.getTaskTrackingInfo(trackingId);
+        });
   }
 }
diff --git a/...m/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java b/...m/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java
@@ -24,6 +24,9 @@ public void run(String trackingId) throws Throwable {
             () -> configuration.getMinter().getDeliveryFleetReaderToken());
 
     runtime.runCommand(
-        "Search tasks with delivery fleet reader token", () -> commands.searchTasks(trackingId));
+        "Get task tracking info with delivery fleet reader token",
+        () -> {
+          var unused = commands.getTaskTrackingInfo(trackingId);
+        });
   }
 }
diff --git a/.../src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java b/.../src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java
@@ -8,11 +8,12 @@
 import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
 import google.maps.fleetengine.delivery.v1.GetTaskRequest;
+import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
 import google.maps.fleetengine.delivery.v1.LocationInfo;
-import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
 import google.maps.fleetengine.delivery.v1.Task;
 import google.maps.fleetengine.delivery.v1.Task.State;
 import google.maps.fleetengine.delivery.v1.Task.TaskOutcome;
+import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
 import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
 
 public class DeliveryServiceCommands {
@@ -56,13 +57,12 @@ public Task getTask(String taskId) {
   }
 
   /** Search existing tasks by tracking id. */
-  public void searchTasks(String trackingId) {
-    SearchTasksRequest searchTasksRequest =
-        SearchTasksRequest.newBuilder()
-            .setParent(ScriptUtils.getProviderName(providerId))
-            .setTrackingId(trackingId)
+  public TaskTrackingInfo getTaskTrackingInfo(String trackingId) {
+    GetTaskTrackingInfoRequest getTaskTrackingInfoRequest =
+        GetTaskTrackingInfoRequest.newBuilder()
+            .setName(getTaskTrackingInfoName(trackingId))
             .build();
-    stub.searchTasks(searchTasksRequest);
+    return stub.getTaskTrackingInfo(getTaskTrackingInfoRequest);
   }
 
   /** Update task outcome to succeed. */
@@ -84,6 +84,10 @@ private String getTaskName(String taskId) {
     return String.format("providers/%s/tasks/%s", providerId, taskId);
   }
 
+  private String getTaskTrackingInfoName(String trackingId) {
+    return String.format("providers/%s/taskTrackingInfo/%s", providerId, trackingId);
+  }
+
   public DeliveryVehicle createDeliveryVehicle(String deliveryVehicleId) {
     DeliveryVehicle deliveryVehicle =
         DeliveryVehicle.newBuilder().setName(getDeliveryVehicleName(deliveryVehicleId)).build();

diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java
@@ -5,8 +5,9 @@
 import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
 import google.maps.fleetengine.delivery.v1.GetTaskRequest;
-import google.maps.fleetengine.delivery.v1.SearchTasksRequest;
+import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest;
 import google.maps.fleetengine.delivery.v1.Task;
+import google.maps.fleetengine.delivery.v1.TaskTrackingInfo;
 import google.maps.fleetengine.delivery.v1.UpdateTaskRequest;
 
 /** Wraps {@link google.maps.fleetengine.delivery.v1.DeliveryServiceClient} for testing purposes. */
@@ -25,9 +26,9 @@ public interface DeliveryServiceStub {
 
   /**
    * see: {@link
-   * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#searchTasks(SearchTasksRequest)}
+   * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTaskTrackingInfo(GetTaskTrackingInfoRequest)}
    */
-  void searchTasks(SearchTasksRequest searchTripRequest);
+  TaskTrackingInfo getTaskTrackingInfo(GetTaskTrackingInfoRequest getTaskTrackingInfoRequest);
 
   /**
    * see: {@link