Merge branch 'main' into update-material-ui

projectnessie · Oct 5, 2022 · 8cace92 · 8cace92
2 parents 29d8d99 + 1fa4654
commit 8cace92
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/clients/client/src/test/java/org/projectnessie/client/util/HttpTestServer.java b/clients/client/src/test/java/org/projectnessie/client/util/HttpTestServer.java
@@ -21,8 +21,10 @@
 import java.util.function.Consumer;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.CustomRequestLog;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.Slf4jRequestLogWriter;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 
@@ -68,9 +70,13 @@ public void handle(
 
     GzipHandler gzip = new GzipHandler();
     gzip.setInflateBufferSize(8192);
-    gzip.addIncludedMethods("PUT");
+    gzip.addIncludedMethods("PUT", "POST", "DELETE");
     server.setHandler(requestHandler);
     server.insertHandler(gzip);
+    server.setRequestLog(
+        new CustomRequestLog(
+            new Slf4jRequestLogWriter(),
+            "%{local}a:%{local}p - %{remote}a:%{remote}p \"%r\" status.%s in:%I out:%O"));
 
     if (init != null) {
       init.accept(server);

diff --git a/clients/client/src/test/resources/logback-test.xml b/clients/client/src/test/resources/logback-test.xml
@@ -24,7 +24,7 @@
     </encoder>
   </appender>
   <root>
-    <level value="warn"/>
+    <level value="info"/>
     <appender-ref ref="console"/>
   </root>
 </configuration>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agrone = "1.17.1"
 antlr4 = "4.11.1"
-awssdk = "2.17.286"
+awssdk = "2.17.287"
 bouncycastle = "1.70"
 checkstyle = "10.3.4"
 errorprone = "2.15.0"
@@ -28,7 +28,7 @@ parquet = "1.12.3"
 picocli = "4.6.3"
 postgresContainerTag = "14"
 protobuf = "3.21.6"
-quarkus = "2.13.0.Final"
+quarkus = "2.13.1.Final"
 quarkusAmazon = "2.13.0.Final"
 quarkusLoggingSentry = "1.2.1"
 quarkusUbiNativeImage = "quay.io/quarkus/ubi-quarkus-native-image:22.2-java17"

diff --git a/servers/quarkus-server/src/main/resources/application.properties b/servers/quarkus-server/src/main/resources/application.properties
@@ -188,15 +188,15 @@ mp.openapi.extensions.smallrye.operationIdStrategy=METHOD
 
 # order matters below, since the first matching pattern will be used
 quarkus.micrometer.binder.http-server.match-patterns=\
-  /api/v1/diffs/.*+=/api/v1/diffs/{diff_params},\
-  /api/v1/trees/branch/.*/commit+=/api/v1/trees/branch/{branchName}/commit,\
-  /api/v1/trees/branch/.*/transplant+=/api/v1/trees/branch/{branchName}/transplant, \
-  /api/v1/trees/branch/.*/merge+=/api/v1/trees/branch/{branchName}/merge, \
-  /api/v1/trees/branch/.*+=/api/v1/trees/branch/{ref},\
-  /api/v1/trees/tree/.*/entries+=/api/v1/trees/tree/{ref}/entries,\
-  /api/v1/trees/tree/.*/log+=/api/v1/trees/tree/{ref}/log, \
-  /api/v1/trees/tree/.*+=/api/v1/trees/tree/{ref}, \
-  /api/v1/trees/.*/.*+=/api/v1/trees/{referenceType}/{ref}, \
-  /api/v1/namespaces/namespace/.*/.*+=/api/v1/namespaces/namespace/{ref}/{name}, \
-  /api/v1/namespaces/.*+=/api/v1/namespaces/{ref}, \
-  /contents/.*+=/contents/{key}
+  /api/v1/diffs/.*=/api/v1/diffs/{diff_params},\
+  /api/v1/trees/branch/.*/commit=/api/v1/trees/branch/{branchName}/commit,\
+  /api/v1/trees/branch/.*/transplant=/api/v1/trees/branch/{branchName}/transplant, \
+  /api/v1/trees/branch/.*/merge=/api/v1/trees/branch/{branchName}/merge, \
+  /api/v1/trees/branch/.*=/api/v1/trees/branch/{ref},\
+  /api/v1/trees/tree/.*/entries=/api/v1/trees/tree/{ref}/entries,\
+  /api/v1/trees/tree/.*/log=/api/v1/trees/tree/{ref}/log, \
+  /api/v1/trees/tree/.*=/api/v1/trees/tree/{ref}, \
+  /api/v1/trees/.*/.*=/api/v1/trees/{referenceType}/{ref}, \
+  /api/v1/namespaces/namespace/.*/.*=/api/v1/namespaces/namespace/{ref}/{name}, \
+  /api/v1/namespaces/.*=/api/v1/namespaces/{ref}, \
+  /contents/.*=/contents/{key}