Use debug logging level for OAuth2

trinodb · Mar 16, 2022 · 21ffb09 · 21ffb09
1 parent 0777c46
commit 21ffb09
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/...er/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java b/...er/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java
@@ -28,6 +28,7 @@
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES;
+import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
@@ -57,7 +58,10 @@ public void extendEnvironment(Environment.Builder builder)
             dockerContainer
                     .withCopyFileToContainer(
                             forHostPath(configDir.getPath("config.properties")),
-                            CONTAINER_PRESTO_CONFIG_PROPERTIES);
+                            CONTAINER_PRESTO_CONFIG_PROPERTIES)
+                    .withCopyFileToContainer(
+                            forHostPath(configDir.getPath("log.properties")),
+                            CONTAINER_PRESTO_ETC + "/log.properties");
 
             binder.exposePort(dockerContainer, 7778);
         });

diff --git a/...in/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java b/...in/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java
@@ -28,6 +28,7 @@
 
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
 import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES;
+import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
@@ -57,7 +58,10 @@ public void extendEnvironment(Environment.Builder builder)
             dockerContainer
                     .withCopyFileToContainer(
                             forHostPath(configDir.getPath("config.properties")),
-                            CONTAINER_PRESTO_CONFIG_PROPERTIES);
+                            CONTAINER_PRESTO_CONFIG_PROPERTIES)
+                    .withCopyFileToContainer(
+                            forHostPath(configDir.getPath("log.properties")),
+                            CONTAINER_PRESTO_ETC + "/log.properties");
 
             binder.exposePort(dockerContainer, 7778);
         });

diff --git a/...n/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java b/...n/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java
@@ -61,7 +61,10 @@ public void extendEnvironment(Environment.Builder builder)
                             CONTAINER_PRESTO_CONFIG_PROPERTIES)
                     .withCopyFileToContainer(
                             forHostPath(configDir.getPath("cert/truststore.jks")),
-                            CONTAINER_PRESTO_ETC + "/cert/truststore.jks");
+                            CONTAINER_PRESTO_ETC + "/cert/truststore.jks")
+                    .withCopyFileToContainer(
+                            forHostPath(configDir.getPath("log.properties")),
+                            CONTAINER_PRESTO_ETC + "/log.properties");
 
             binder.exposePort(dockerContainer, 7778);
         });
@@ -81,9 +84,9 @@ public void extendEnvironment(Environment.Builder builder)
                 .withCopyFileToContainer(
                         forHostPath(configDir.getPath("httpd.conf")),
                         "/usr/local/apache2/conf/httpd.conf")
-                        .withCopyFileToContainer(
-                                forHostPath(configDir.getPath("cert")),
-                                "/usr/local/apache2/conf/cert");
+                .withCopyFileToContainer(
+                        forHostPath(configDir.getPath("cert")),
+                        "/usr/local/apache2/conf/cert");
         builder.addContainer(proxy);
         builder.containerDependsOn(COORDINATOR, "proxy");
     }

diff --git a/.../docker/presto-product-tests/conf/environment/singlenode-oauth2-http-proxy/log.properties b/.../docker/presto-product-tests/conf/environment/singlenode-oauth2-http-proxy/log.properties
@@ -0,0 +1 @@
+io.trino.server.security.oauth2=DEBUG
diff --git a/...docker/presto-product-tests/conf/environment/singlenode-oauth2-https-proxy/log.properties b/...docker/presto-product-tests/conf/environment/singlenode-oauth2-https-proxy/log.properties
@@ -0,0 +1 @@
+io.trino.server.security.oauth2=DEBUG
diff --git a/...n/resources/docker/presto-product-tests/conf/environment/singlenode-oauth2/log.properties b/...n/resources/docker/presto-product-tests/conf/environment/singlenode-oauth2/log.properties
@@ -0,0 +1 @@
+io.trino.server.security.oauth2=DEBUG
diff --git a/...ain/resources/docker/presto-product-tests/conf/environment/singlenode-oidc/log.properties b/...ain/resources/docker/presto-product-tests/conf/environment/singlenode-oidc/log.properties
@@ -0,0 +1 @@
+io.trino.server.security.oauth2=DEBUG