From edb2c955aac71ad6de87e70383806b76b80c3b66 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 5 Dec 2022 09:27:57 +0000 Subject: Fix configuration to use configured properties The configuration of the control loop microservices in Istanbul always uses the default configuration files even if they are overridden. The CSITs are failing becasue the microservices continue to look for keystore and truststore files even though the tests are configured to use HTTP. Issue-ID: POLICY-4471 Change-Id: I9c7aa72b9b8bd4e3e28b97cf4a9ac00dfa16b1cc Signed-off-by: liamfallon --- .../policy-clamp-docker/src/main/docker/controlloop-runtime.sh | 10 ++-------- .../policy-clamp-docker/src/main/docker/http-participant.sh | 9 ++------- .../src/main/docker/kubernetes-participant.sh | 9 ++------- .../policy-clamp-docker/src/main/docker/policy-participant.sh | 10 ++-------- 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh index 551167bd7..f5c533fc9 100644 --- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh +++ b/packages/policy-clamp-docker/src/main/docker/controlloop-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/ClRuntimeParameters.yaml" fi -echo "Policy clamp config file: $CONFIG_FILE" +echo "Policy clamp Control Loop Runtime config file: $CONFIG_FILE" if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then echo "overriding policy-truststore" @@ -52,10 +50,6 @@ 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/ClRuntimeParameters.yaml - $JAVA_HOME/bin/java \ -Dserver.ssl.keyStore="${KEYSTORE}" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ @@ -68,4 +62,4 @@ $JAVA_HOME/bin/java \ -Dcom.sun.management.jmxremote.authenticate=false \ -Dcom.sun.management.jmxremote.local.only=false \ -jar /app/app.jar \ - --spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.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 a7eeb8f8a..fa3899db4 100644 --- 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.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 0499a90d5..fefcc9e26 100644 --- 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.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 d698060dd..dd10b8c98 100644 --- 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.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}" -- cgit 1.2.3-korg