Merge pull request #1025 from oracle/fast_rest_test

Rewrite RestTest to use in-memory container

Author: rjeberhard

operator/pom.xml

@@ -347,6 +347,24 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework</groupId>
+            <artifactId>jersey-test-framework-core</artifactId>
+            <version>${jersey-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <version>${jersey-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-inmemory</artifactId>
+            <version>${jersey-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.httpunit</groupId>
             <artifactId>httpunit</artifactId>

operator/src/main/java/oracle/kubernetes/operator/rest/AuthenticationFilter.java

@@ -1,4 +1,4 @@
-// Copyright 2017, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -44,8 +44,7 @@ public class AuthenticationFilter extends BaseDebugLoggingFilter implements Cont
   @Context private Application application; // TBD - does this work?
 
   public static final String REST_BACKEND_PROPERTY = "RestBackend";
-
-  private static final String ACCESS_TOKEN_PREFIX = "Bearer ";
+  public static final String ACCESS_TOKEN_PREFIX = "Bearer ";
 
   private static LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
@@ -63,12 +62,9 @@ public void filter(ContainerRequestContext req) throws IOException {
       String t = getAccessToken(req);
       RestBackend be = r.getBackend(t);
       req.setProperty(REST_BACKEND_PROPERTY, be);
-    } catch (RuntimeException re) {
+    } catch (RuntimeException | Error re) {
       authenticationFailure(re);
       throw re; // stop the filter chain if we can't authenticate
-    } catch (Error er) {
-      authenticationFailure(er);
-      throw er; // stop the filter chain if we can't authenticate
     }
     LOGGER.exiting();
   }

operator/src/main/java/oracle/kubernetes/operator/rest/RestServer.java

@@ -11,14 +11,14 @@
 import java.nio.file.Files;
 import java.security.SecureRandom;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
+import oracle.kubernetes.operator.rest.resource.VersionsResource;
 import oracle.kubernetes.operator.work.Container;
 import oracle.kubernetes.operator.work.ContainerResolver;
 import org.apache.commons.codec.binary.Base64;
@@ -323,8 +323,21 @@ private HttpServer createHttpsServer(Container container, SSLContext ssl, String
 
   private ResourceConfig createResourceConfig() {
     LOGGER.entering();
-    // create a resource config that scans for JAX-RS resources and providers
-    // in oracle.kubernetes.operator.rest package
+
+    ResourceConfig rc = createResourceConfig(config);
+
+    LOGGER.exiting();
+    return rc;
+  }
+
+  /**
+   * Defines a resource configuration that scans for JAX-RS resources and providers in the REST
+   * package.
+   *
+   * @param restConfig the operator REST configuration
+   * @return a resource configuration
+   */
+  static ResourceConfig createResourceConfig(RestConfig restConfig) {
     ResourceConfig rc =
         new ResourceConfig()
             .register(JacksonFeature.class)
@@ -334,15 +347,8 @@ private ResourceConfig createResourceConfig() {
             .register(RequestDebugLoggingFilter.class)
             .register(ResponseDebugLoggingFilter.class)
             .register(ExceptionMapper.class)
-            .packages("oracle.kubernetes.operator.rest.resource");
-    Map<String, Object> extraProps = new HashMap<>();
-
-    // attach the rest backend impl to the resource config
-    // so that the resource impls can find it
-    extraProps.put(RestConfig.REST_CONFIG_PROPERTY, config);
-    rc.addProperties(extraProps);
-
-    LOGGER.exiting();
+            .packages(VersionsResource.class.getPackageName());
+    rc.setProperties(Map.of(RestConfig.REST_CONFIG_PROPERTY, restConfig));
     return rc;
   }
 

operator/src/test/java/oracle/kubernetes/TestUtils.java

@@ -6,6 +6,7 @@
 
 import static com.meterware.simplestub.Stub.createStub;
 
+import ch.qos.logback.classic.LoggerContext;
 import com.meterware.simplestub.Memento;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,6 +19,7 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import oracle.kubernetes.operator.logging.LoggingFactory;
+import org.slf4j.LoggerFactory;
 
 public class TestUtils {
   /**
@@ -199,4 +201,36 @@ public <T> T getOriginalValue() {
       throw new UnsupportedOperationException();
     }
   }
+
+  public static Memento silenceJsonPathLogger() {
+    return new JsonPathLoggerMemento();
+  }
+
+  static class JsonPathLoggerMemento implements Memento {
+
+    private final ch.qos.logback.classic.Logger log;
+    private final ch.qos.logback.classic.Level originalLogLevel;
+
+    static Memento silenceLogger() {
+      return new JsonPathLoggerMemento();
+    }
+
+    private JsonPathLoggerMemento() {
+      LoggerContext logContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+      log = logContext.getLogger("com.jayway.jsonpath.internal.path.CompiledPath");
+      originalLogLevel = log.getLevel();
+      log.setLevel(ch.qos.logback.classic.Level.INFO);
+    }
+
+    @Override
+    public void revert() {
+      log.setLevel(originalLogLevel);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T getOriginalValue() {
+      return (T) originalLogLevel;
+    }
+  }
 }