Fix docker image generation and tagging

Issue-ID: AAI-2579
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I749e22447b48c92cf4f2ee0f991ff39146f7b45d

3 files changed, 132 insertions, 119 deletions

diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..e3a83ed
--- /dev/null
+++ b/src/main/assembly/descriptor.xml
@@ -0,0 +1,36 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>build</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/bundleconfig-local</directory>
+      <outputDirectory>/bundleconfig</outputDirectory>
+      <includes>
+	<include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <includes>
+	<include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+	<include>*.jar</include>
+      </includes>
+      <excludes>
+	<exclude>Dockerfile</exclude>
+	<exclude>*.sh</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index b164907..3823a6c 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,51 +1,26 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/crud-api
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG USERS_HOME=/opt/aaihome
 
-RUN apt-get update
-
-# Install and setup java8
-RUN apt-get update && apt-get install -y software-properties-common
-## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-RUN export JAVA_HOME
-
-# Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME
-RUN mkdir -p $MICRO_HOME/bundleconfig/etc
-COPY gizmo.jar $MICRO_HOME/
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-COPY bundleconfig-local $MICRO_HOME/bundleconfig
-COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc
-RUN chmod 755 $BIN_HOME/*
-
-# Changes related to:AAI-2177
-# Change aai gizmo container processes to run as non-root on the host
+# AAI-2177: Change aai gizmo container processes to run as non-root on the host
 
 #Note:The group id and user id used below (492382 & 341790 respectively) are chosen arbitarily based on assumption that
 # these are not used elsewhere. Please see  https://jira.onap.org/browse/AAI-2172 for more background on this.
 
-RUN mkdir /opt/aaihome && \
-     groupadd -g 492382 aaiadmin && \
-     useradd -r -u 341790  -g 492382 -ms /bin/sh -d /opt/aaihome/aaiadmin aaiadmin && \
-     
-      ##The following 2 lines are added to add the user to the sudoers group
-      ##The script src\main\bin\start.sh could then optionally run the process as sudo user if an environment variable is set
-      ## By default the sudo mode is disabled.
-      usermod -aG sudo aaiadmin  &&\
-      echo  'aaiadmin  ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \      
-     chown -R aaiadmin:aaiadmin $MICRO_HOME &&\
-     mkdir /logs && \
-     chown -R aaiadmin:aaiadmin  /logs
+RUN mkdir -p $MICRO_HOME $USERS_HOME /logs \
+    && groupadd -g 492382 aaiadmin \
+    && useradd -r -u 341790  -g 492382 -ms /bin/sh -d $USERS_HOME/aaiadmin aaiadmin
+WORKDIR $MICRO_HOME
+COPY /maven/gizmo/ .
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs \
+    && chown -R aaiadmin:aaiadmin $MICRO_HOME /logs
 
 USER aaiadmin
 
-RUN ln -s /logs $MICRO_HOME/logs
-
 EXPOSE 9520 9520
 
 CMD ["/opt/app/crud-api/bin/start.sh"]
+
diff --git a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
index 5f9194f..6fc390e 100644
--- a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
+++ b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
@@ -19,11 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 package org.onap.crud.event.response;
-import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.crud.OXMModelLoaderSetup;
 import org.onap.crud.event.GraphEvent;
 import org.onap.crud.event.GraphEvent.GraphEventOperation;
 import org.onap.crud.event.envelope.GraphEventEnvelope;
@@ -31,82 +36,79 @@ import org.onap.crud.exception.CrudException;
 import org.onap.crud.util.TestUtil;
 import org.onap.schema.EdgeRulesLoader;
 import org.onap.schema.OxmModelLoader;
-import com.google.gson.Gson;
-import com.google.gson.JsonParser;
 
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.crud.OXMModelLoaderSetup;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup {
     private static boolean setUpIsNotDone = true;
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
+        @Before
+        public void setUpOnce() throws CrudException {
+            if (setUpIsNotDone) {
+                System.setProperty("CONFIG_HOME", "src/test/resources");
+                System.setProperty("AJSC_HOME", ".");
+                System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
 
-    @Before
-    public void setUpOnce() throws Exception {
-        if (setUpIsNotDone) { 
-            System.setProperty("CONFIG_HOME", "src/test/resources");
-            System.setProperty("AJSC_HOME", ".");
-            System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+                OxmModelLoader.loadModels();
+                EdgeRulesLoader.loadModels();
 
-            OxmModelLoader.loadModels();
-            EdgeRulesLoader.loadModels();
-            setUpIsNotDone = false;
+                setUpIsNotDone = false;
+            }
         }
-    }
 
-    @Test
-    public void testPolicyViolationsNotDetected() throws Exception {
-        String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel-no-violations.json");
-        Gson gson = new Gson();
-        GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class);
+        @Rule
+        public ExpectedException expectedException = ExpectedException.none();
 
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isFalse();
-    }
+        @Test
+        public void testPolicyViolationsNotDetected() throws Exception {
+            String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel-no-violations.json");
+            Gson gson = new Gson();
+            GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class);
 
-    @Test
-    public void testPolicyViolationsDetected() throws Exception {
-        String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel.json");
-        Gson gson = new Gson();
-        GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class);
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isFalse();
+        }
 
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isTrue();
-    }
+        @Test
+        public void testPolicyViolationsDetected() throws Exception {
+            String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel.json");
+            Gson gson = new Gson();
+            GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class);
 
-    @Test
-    public void testHandleVertexResponse() throws Exception {
-        String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json");
-        String champResult = TestUtil.getFileAsString("event/champ-vertex-event.json");
-        Gson gson = new Gson();
-        GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
-        GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isTrue();
+        }
 
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        String response = graphEventResponseHandler.handleVertexResponse("v13", event, result);
+        @Test
+        public void testHandleVertexResponse() throws Exception {
+            String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json");
+            String champResult = TestUtil.getFileAsString("event/champ-vertex-event.json");
+            Gson gson = new Gson();
+            GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
+            GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
 
-        assertThat(new JsonParser().parse(response).getAsJsonObject().get("url").getAsString())
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            String response = graphEventResponseHandler.handleVertexResponse("v13", event, result);
+
+            assertThat(new JsonParser().parse(response).getAsJsonObject().get("url").getAsString())
                 .isEqualTo("services/inventory/v13/pserver/890c8b3f-892f-48e3-85cd-748ebf0426a5");
-    }
+        }
 
-    @Test
-    public void testHandleVertexResponseWithError() throws Exception {
-        expectedException.expect(CrudException.class);
-        expectedException.expectMessage("test error");
+        @Test
+        public void testHandleVertexResponseWithError() throws Exception {
+            expectedException.expect(CrudException.class);
+            expectedException.expectMessage("test error");
 
-        String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json");
-        String champResult = TestUtil.getFileAsString("event/champ-vertex-event-error.json");
-        Gson gson = new Gson();
-        GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
-        GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
+            String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json");
+            String champResult = TestUtil.getFileAsString("event/champ-vertex-event-error.json");
+            Gson gson = new Gson();
+            GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
+            GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
 
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        graphEventResponseHandler.handleVertexResponse("v13", event, result);
-    }
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            graphEventResponseHandler.handleVertexResponse("v13", event, result);
+        }
 
     @Test(expected = CrudException.class)
     public void testHandleVertexResponseWithViolations() throws Exception {
@@ -121,33 +123,33 @@ public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup {
         graphEventResponseHandler.handleVertexResponse("v13", event, result);
     }
 
-    @Test
-    public void testHandleEdgeResponse() throws Exception {
-        String graphEvent = TestUtil.getFileAsString("event/graph-edge-event.json");
-        String champResult = TestUtil.getFileAsString("event/champ-edge-event.json");
-        Gson gson = new Gson();
-        GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
-        GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
+        @Test
+        public void testHandleEdgeResponse() throws Exception {
+            String graphEvent = TestUtil.getFileAsString("event/graph-edge-event.json");
+            String champResult = TestUtil.getFileAsString("event/champ-edge-event.json");
+            Gson gson = new Gson();
+            GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class);
+            GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class);
 
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        String response = graphEventResponseHandler.handleEdgeResponse("v10", event, result);
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            String response = graphEventResponseHandler.handleEdgeResponse("v10", event, result);
 
-        String id = new JsonParser().parse(response).getAsJsonObject().get("id").getAsString();
-        assertThat(id).isEqualTo("test-key");
-    }
+            String id = new JsonParser().parse(response).getAsJsonObject().get("id").getAsString();
+            assertThat(id).isEqualTo("test-key");
+        }
 
-    @Test
-    public void testHandleDeletionResponse() throws Exception {
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        GraphEvent event = GraphEvent.builder(GraphEventOperation.DELETE).build();
-        String response = graphEventResponseHandler.handleDeletionResponse(event, new GraphEventEnvelope(event));
-        assertThat(response).isEqualTo("");
-    }
+        @Test
+        public void testHandleDeletionResponse() throws Exception {
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            GraphEvent event = GraphEvent.builder(GraphEventOperation.DELETE).build();
+            String response = graphEventResponseHandler.handleDeletionResponse(event, new GraphEventEnvelope(event));
+            assertThat(response).isEqualTo("");
+        }
 
-    @Test
-    public void testHandleBulkEventResponse() throws Exception {
-        GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
-        GraphEvent event = GraphEvent.builder(GraphEventOperation.CREATE).build();
-        graphEventResponseHandler.handleBulkEventResponse(event, new GraphEventEnvelope(event));
-    }
+        @Test
+        public void testHandleBulkEventResponse() throws Exception {
+            GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler();
+            GraphEvent event = GraphEvent.builder(GraphEventOperation.CREATE).build();
+            graphEventResponseHandler.handleBulkEventResponse(event, new GraphEventEnvelope(event));
+        }
 }