AWS spec requires Instant to be serialized as a Unix timestamp

Author: Randgalt

trino-aws-proxy-glue/src/main/java/io/trino/aws/proxy/glue/rest/GlueSerializer.java

@@ -19,6 +19,9 @@
 import software.amazon.awssdk.core.SdkField;
 
 import java.io.IOException;
+import java.time.Instant;
+
+import static software.amazon.awssdk.utils.DateUtils.formatUnixTimestampInstant;
 
 class GlueSerializer<T>
         extends JsonSerializer<T>
@@ -38,8 +41,10 @@ public void serialize(T value, JsonGenerator generator, SerializerProvider seria
 
         for (SdkField<?> sdkField : serializerCommon.sdkFields()) {
             Object fieldValue = sdkField.getValueOrDefault(value);
-            if (fieldValue != null) {
-                generator.writePOJOField(sdkField.memberName(), fieldValue);
+            switch (fieldValue) {
+                case Instant instant -> generator.writePOJOField(sdkField.memberName(), formatUnixTimestampInstant(instant));  // per AWS spec
+                case null -> {} // do nothing
+                default -> generator.writePOJOField(sdkField.memberName(), fieldValue);
             }
         }
 

trino-aws-proxy-glue/src/test/java/io/trino/aws/proxy/glue/TestGlueBase.java

@@ -46,15 +46,18 @@
 import software.amazon.awssdk.services.glue.model.TableInput;
 
 import java.net.URI;
+import java.time.temporal.ChronoUnit;
 import java.util.Map;
 
 import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.DATABASE_1;
 import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.DATABASE_2;
+import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.NOW;
 import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.POLICY_A;
 import static io.trino.aws.proxy.glue.TestingGlueRequestHandler.POLICY_B;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.within;
 
 public abstract class TestGlueBase<T extends TestingGlueContext>
 {
@@ -93,6 +96,8 @@ public void testRequests()
         assertThat(databases.databaseList())
                 .extracting(Database::name)
                 .containsExactlyInAnyOrder(DATABASE_1, DATABASE_2);
+        assertThat(databases.databaseList().getFirst().createTime())
+                .isCloseTo(NOW, within(1, ChronoUnit.SECONDS));
 
         GetResourcePoliciesResponse resourcePolicies = glueClient.getResourcePolicies(GetResourcePoliciesRequest.builder().build());
         assertThat(resourcePolicies.getResourcePoliciesResponseList())

trino-aws-proxy-glue/src/test/java/io/trino/aws/proxy/glue/TestingGlueRequestHandler.java

@@ -32,6 +32,7 @@
 import software.amazon.awssdk.services.glue.model.GluePolicy;
 import software.amazon.awssdk.services.glue.model.GlueResponse;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
 
@@ -76,12 +77,16 @@ public class TestingGlueRequestHandler
     public static final String DATABASE_1 = "db1";
     public static final String DATABASE_2 = "db2";
 
+    public static final Instant NOW = Instant.now();
+
     @Override
     public GlueResponse handleRequest(ParsedGlueRequest request, SigningMetadata signingMetadata, RequestLoggingSession requestLoggingSession)
     {
         return switch (request.glueRequest()) {
             case GetDatabasesRequest _ -> GetDatabasesResponse.builder()
-                    .databaseList(Database.builder().name(DATABASE_1).build(), Database.builder().name(DATABASE_2).build())
+                    .databaseList(
+                            Database.builder().createTime(NOW).name(DATABASE_1).build(),
+                            Database.builder().createTime(NOW).name(DATABASE_2).build())
                     .build();
 
             // TODO: add more cases