Merge branch 'develop' into jrf-in-op-from-develop

Author: xiancao

docs-source/content/developerguide/branching.md

@@ -11,7 +11,7 @@ The `develop` branch is protected and contains source for the latest completed f
 
 Because we want to balance separating destabilizing work into feature branches against the possibility of later difficult merges, we encourage developers working on features to pull out any necessary refactoring or improvements that are general purpose into their own shorter-lived branches and create pull requests to `develop` when these smaller work items are completed.
 
-All commits to `develop` must pass the [integration test suite]({{< relref "/developerguide/integration-tests.md" >}}).  Please run these tests locally before submitting a pull request.  Additionally, each push to a branch in our GitHub repository triggers a run of a subset of the integration tests with the results visible [here](https://app.wercker.com/Oracle/weblogic-kubernetes-operator/runs).
+All commits to `develop` must pass the [integration test suite]({{< relref "/developerguide/integration-tests.md" >}}).  Please run these tests locally before submitting a pull request.  Additionally, each push to a branch in our GitHub repository triggers a run of a subset of the integration tests with the results visible [here](http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/).
 
 Please submit pull requests to the `develop` branch unless you are collaborating on a feature and have another target branch.  Please see details on the Oracle Contributor Agreement (OCA) and guidelines for pull requests on the [README]({{< relref "/_index.md#contributing-to-the-oracle-weblogic-server-kubernetes-operator-repository" >}}).
 

docs-source/themes/hugo-theme-learn/README.md

@@ -4,7 +4,8 @@ This repository contains a theme for [Hugo](https://gohugo.io/), based on great
 
 Visit the [theme documentation](https://learn.netlify.com/en/) to see what is going on. It is actually built with this theme.
 
-[![wercker status](https://app.wercker.com/status/233466a2be73fcea400e7dc02ef6adf9/s/master "wercker status")](https://app.wercker.com/project/byKey/233466a2be73fcea400e7dc02ef6adf9)
+
+[![Build Status](http://build.weblogick8s.org:8080/buildStatus/icon?job=weblogic-kubernetes-operator-quicktest)](http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmatcornic%2Fhugo-theme-learn.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fmatcornic%2Fhugo-theme-learn?ref=badge_shield)
 
 ## Main features

integration-tests/README.md

@@ -4,13 +4,13 @@ This documentation describes the functional use cases that are covered in integr
 
 # Environments
 
-The tests currently run in three modes: "Wercker", "Jenkins", and "standalone" Oracle Linux, where the mode is controlled by the `WERCKER` and `JENKINS` environment variables described below. The default is "standalone".
+The tests currently run in three modes: "shared cluster", "Jenkins", and "standalone" Oracle Linux, where the mode is controlled by the `SHARED_CLUSTER` and `JENKINS` environment variables described below. The default is "standalone".
 
 * "Standalone" Oracle Linux, i.e, run the tests manually with the `mvn` command.
-* Wercker - https://app.wercker.com/Oracle/weblogic-kubernetes-operator/runs - `integration-test-java` is the pipeline name.
+* Shared cluster - http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/
 * Jenkins - http://wls-jenkins.us.oracle.com/view/weblogic-operator/job/weblogic-kubernetes-operator-javatest/ - Jenkins Run is restricted to Oracle Internal development process.
 
-Wercker runs only Quick test use cases, Jenkins runs both Quick and Full test use cases.
+Shared cluster runs only Quick test use cases, Jenkins runs both Quick and Full test use cases.
 
 # Use Cases
 
@@ -41,7 +41,7 @@ Defaults for `RESULT_ROOT` & `PV_ROOT`:
 | --- | --- | --- | --- |
 | stand-alone	| /scratch/$USER/wl_k8s_test_results |	/scratch/$USER/wl_k8s_test_results	| test defaults |
 | Jenkins	| /scratch/k8s_dir |	/scratch/k8s_dir	 | jenkins configuration |
-| Wercker	| /pipeline/output/k8s_dir	| /scratch	| wercker.yml |
+| Shared cluster	| /pipeline/output/k8s_dir	| /scratch	|  |
 
 
 'Physical' subdirectories created by test:
@@ -158,7 +158,7 @@ When the integration test class ITOperator is executed, staticPrepare() method i
 
 staticPrepare() - initializes the application properties from OperatorIT.properties and creates resultRoot, pvRoot, userprojectsDir directories by calling initialize() method from the base class BaseTest.
 
-staticUnPrepare() - releases the cluster lease on wercker env.
+staticUnPrepare() - releases the cluster lease.
 
 test methods -  testDomainOnPVUsingWLST, testDomainOnPVUsingWDT, testTwoDomainsManagedByTwoOperators, testCreateDomainWithStartPolicyAdminOnly, testCreateDomainPVReclaimPolicyRecycle, testCreateDomainWithDefaultValuesInSampleInputs, testAutoAndCustomSitConfigOverrides, testOperatorRESTIdentityBackwardCompatibility, testOperatorRESTUsingCertificateChain
 
@@ -211,14 +211,14 @@ The tests accepts optional env var overrides:
 | QUICKTEST  | When set to "true", limits testing to a subset of the tests. |
 | LB_TYPE    | The default value is "TRAEFIK". Set to "VOYAGER" if you want to use it as LB. |
 | INGRESSPERDOMAIN  | The defult value is true. If you want to test creating TRAEFIK LB by kubectl yaml for multiple domains, set it to false. |
-| WERCKER    | Set to true if invoking from Wercker, set to false or "" if running stand-alone or from Jenkins. Default is "". |
-| JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or from Wercker. Default is "". |
+| SHARED_CLUSTER    | Set to true if invoking on shared cluster, set to false or "" if running stand-alone or from Jenkins. Default is "". |
+| JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or on shared cluster. Default is "". |
 | K8S_NODEPORT_HOST | DNS name of a Kubernetes worker node. Default is the local host's hostname. |
 | BRANCH_NAME  | Git branch name.   Default is determined by calling 'git branch'. |
 | LEASE_ID   |   Set to a unique value to (A) periodically renew a lease on the k8s cluster that indicates that no other test run should attempt to use the cluster, and (B) delete this lease when the test completes. |
 
 The following additional overrides are currently only used when
-WERCKER=true:
+SHARED_CLUSTER=true:
 
 | Variable | Description |
 | --- | --- |
@@ -305,8 +305,6 @@ $RESULT_ROOT/acceptance_test_tmp is archived under $RESULT_ROOT/acceptance_test_
 
 $PV_ROOT/acceptance_test_pv is archived under $PV_ROOT/acceptance_test_pv_archive
 
-On Wercker, these logs can be downloaded by clicking "Download artifact" on cleanup and store step.
-
 # How to add a new test
 
 Add a new JUnit test under integration-tests/src/test/java/oracle/kubernetes/operator.

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -127,7 +127,7 @@ public static void initialize(String appPropsFile) throws Exception {
     }
 
     // for manual/local run, do cleanup
-    if (System.getenv("WERCKER") == null && System.getenv("JENKINS") == null) {
+    if (System.getenv("SHARED_CLUSTER") == null && System.getenv("JENKINS") == null) {
 
       // delete k8s artifacts created if any, delete PV directories
       ExecResult clnResult = cleanup();
@@ -176,7 +176,7 @@ public static void initialize(String appPropsFile) throws Exception {
     logger.info("Adding file handler, logging to file at " + resultDir + "/java_test_suite.out");
 
     // for manual/local run, create file handler, create PVROOT
-    if (System.getenv("WERCKER") == null && System.getenv("JENKINS") == null) {
+    if (System.getenv("SHARED_CLUSTER") == null && System.getenv("JENKINS") == null) {
       logger.info("Creating PVROOT " + pvRoot);
       Files.createDirectories(Paths.get(pvRoot));
       ExecResult result = ExecCommand.exec("chmod 777 " + pvRoot);
@@ -518,7 +518,7 @@ public static ExecResult cleanup() throws Exception {
   protected void logTestBegin(String testName) throws Exception {
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN " + testName);
-    // renew lease at the beginning for every test method, leaseId is set only for Wercker
+    // renew lease at the beginning for every test method, leaseId is set only for shared cluster
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
   }
 
@@ -636,7 +636,7 @@ private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exce
    *
    * @param iTClassName - IT class name to be used in the archive file name
    * @throws Exception when errors while running statedump.sh or cleanup.sh scripts or while
-   *     renewing the lease for wercker run
+   *     renewing the lease for shared cluster run
    */
   public static void tearDown(String iTClassName) throws Exception {
     logger.log(

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java

@@ -482,7 +482,7 @@ private void initialize(
     }
 
     // customize the inputs yaml file to use our pre-built docker image
-    // IMAGE_NAME_OPERATOR & IMAGE_TAG_OPERATOR variables are used for wercker
+    // IMAGE_NAME_OPERATOR & IMAGE_TAG_OPERATOR variables are used for shared cluster
     if (System.getenv("IMAGE_NAME_OPERATOR") != null
         && System.getenv("IMAGE_TAG_OPERATOR") != null) {
       operatorMap.put(

integration-tests/src/test/resources/setupenv.sh

@@ -37,8 +37,8 @@ function setup_jenkins {
   echo "Helm is configured."
 }
 
-function setup_wercker {
-  echo "Perform setup for running in wercker"
+function setup_shared_cluster {
+  echo "Perform setup for running on shared cluster"
   echo "Install tiller"
   kubectl create serviceaccount --namespace kube-system tiller
   kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
@@ -57,7 +57,7 @@ function setup_wercker {
   echo "After helm delete, list of installed helm charts is: "
   helm ls
 
-  echo "Completed setup_wercker"
+  echo "Completed setup_shared_cluster"
 }
 
 function pull_tag_images {
@@ -153,6 +153,7 @@ export PROJECT_ROOT="$SCRIPTPATH/../../../.."
 export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
 export PV_ROOT=${PV_ROOT:-$RESULT_ROOT}
 echo "RESULT_ROOT$RESULT_ROOT PV_ROOT$PV_ROOT"
+
 export BRANCH_NAME="${BRANCH_NAME:-$WERCKER_GIT_BRANCH}"
 
 if [ "$JRF_ENABLED" = true ] ; then
@@ -184,9 +185,9 @@ export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "
 
 echo IMAGE_NAME_OPERATOR $IMAGE_NAME_OPERATOR IMAGE_TAG_OPERATOR $IMAGE_TAG_OPERATOR JAR_VERSION $JAR_VERSION
 
-if [ "$WERCKER" = "true" ]; then 
+if [ "$SHARED_CLUSTER" = "true" ]; then
 
-  echo "Test Suite is running locally on Wercker and k8s is running on remote nodes."
+  echo "Test Suite is running locally on a shared cluster and k8s is running on remote nodes."
 
   export IMAGE_PULL_SECRET_OPERATOR=$IMAGE_PULL_SECRET_OPERATOR
   export IMAGE_PULL_SECRET_WEBLOGIC=$IMAGE_PULL_SECRET_WEBLOGIC
@@ -236,9 +237,9 @@ if [ "$WERCKER" = "true" ]; then
       exit 1
     fi
   fi
+  
+  setup_shared_cluster
 
-  setup_wercker
-    
 elif [ "$JENKINS" = "true" ]; then
 
   echo "Test Suite is running on Jenkins and k8s is running locally on the same node."

integration-tests/src/test/resources/statedump.sh

@@ -95,7 +95,7 @@ function state_dump {
   echo "Archiving pv directory using a kubernetes job.  Look for it on k8s cluster in $PV_ROOT/acceptance_test_pv_archive"
   local outfile=${DUMP_DIR}/archive_pv_job.out
 
-  if [ "$WERCKER" = "true" ]; then
+  if [ "$SHARED_CLUSTER" = "true" ]; then
 	$SCRIPTPATH/job.sh "/scripts/archive.sh /scratch/acceptance_test_pv /scratch/acceptance_test_pv_archive" 2>&1 | tee ${outfile}
 	if [ "$?" = "0" ]; then
      	echo Job complete.

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;
   }