Fix HTTP handling in CLAMP ACM

HTTPS is turned on using a Java property in the startup scripts in all
the CLAMP ACM docker images. This means that HTTP cannot be enabled or
HTTPS disabled in configuration. THis commit fixes that bug.

The building of the CLAMP docker images calls each jar app.jar. If all
images are being built locally together, the names collide and the last
image's jar is used for all jars. This commit fixes that bug as well.

Issue-ID: POLICY-4224
Change-Id: If4ba8cdef36f7a8a3665fe60eee31e42159e909b
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index bf5b2e3..ba9a564 100644 (file)
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -115,7 +115,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp:policy-clamp-runtime-acm</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-runtime-acm.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -147,7 +147,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-policy</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-policy.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -179,7 +179,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-kubernetes</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-kubernetes.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -211,7 +211,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-http</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-http.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>

diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
index b5b6de3..b4dad4e 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME
 
 WORKDIR $POLICY_HOME
 COPY acm-runtime.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-runtime-acm.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \

diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
index 4311f6c..970f8aa 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
@@ -41,7 +41,7 @@ RUN tar xvfz /packages/http-participant.tar.gz --directory $POLICY_HOME && \
 
 WORKDIR $POLICY_HOME
 COPY http-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-http.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \

diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
index bed957c..4d3303e 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/kubernetes-participant.tar.gz --directory $POLICY_HOME &&
 
 WORKDIR $POLICY_HOME
 COPY kubernetes-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \

diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
index f70e07e..ceb4776 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/policy-participant.tar.gz --directory $POLICY_HOME && \
 
 WORKDIR $POLICY_HOME
 COPY policy-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \

diff --git a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
index 84550de..8b3fd84 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
@@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/AcRuntimeParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp runtime acm config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,11 +50,7 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-touch /app/app.jar
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/AcRuntimeParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
@@ -68,4 +62,4 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
     -Dcom.sun.management.jmxremote.authenticate=false \
     -Dcom.sun.management.jmxremote.local.only=false \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/AcRuntimeParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"

diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
index 17daa18..27e9095 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
@@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/HttpParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp HTTP participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,13 +50,10 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/HttpParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/HttpParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"

diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
index 3c5fe5c..c9bde11 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
@@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/KubernetesParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp Kubernetes participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,13 +50,10 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/KubernetesParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/KubernetesParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"

diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
index 77cd0c0..5a1aeda 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
@@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp policy participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,14 +50,10 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-touch /app/app.jar
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/PolicyParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/PolicyParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"