[nifi] branch main updated: NIFI-8943 Corrected Sensitive Props Key handling in Docker

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 1d61be7  NIFI-8943 Corrected Sensitive Props Key handling in Docker
1d61be7 is described below

commit 1d61be776b4ccb4388bc7f8ddd93f0157f8f995e
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Fri Jul 23 08:02:33 2021 -0500

    NIFI-8943 Corrected Sensitive Props Key handling in Docker
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #5245.
---
 nifi-docker/dockerhub/sh/start.sh   | 4 +++-
 nifi-docker/dockermaven/sh/start.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nifi-docker/dockerhub/sh/start.sh 
b/nifi-docker/dockerhub/sh/start.sh
index 9cce534..c67c6f1 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -98,7 +98,9 @@ prop_replace 'nifi.analytics.connection.model.implementation' 
  "${NIFI_ANALYTIC
 prop_replace 'nifi.analytics.connection.model.score.name'       
"${NIFI_ANALYTICS_MODEL_SCORE_NAME:-rSquared}"
 prop_replace 'nifi.analytics.connection.model.score.threshold'  
"${NIFI_ANALYTICS_MODEL_SCORE_THRESHOLD:-.90}"
 
-prop_replace 'nifi.sensitive.props.key'   "${NIFI_SENSITIVE_PROPS_KEY:-}"
+if [ -n "${NIFI_SENSITIVE_PROPS_KEY}" ]; then
+    prop_replace 'nifi.sensitive.props.key' "${NIFI_SENSITIVE_PROPS_KEY}"
+fi
 
 if [ -n "${SINGLE_USER_CREDENTIALS_USERNAME}" ] && [ -n 
"${SINGLE_USER_CREDENTIALS_PASSWORD}" ]; then
     ${NIFI_HOME}/bin/nifi.sh set-single-user-credentials 
"${SINGLE_USER_CREDENTIALS_USERNAME}" "${SINGLE_USER_CREDENTIALS_PASSWORD}"
diff --git a/nifi-docker/dockermaven/sh/start.sh 
b/nifi-docker/dockermaven/sh/start.sh
index ce27142..3b251b5 100755
--- a/nifi-docker/dockermaven/sh/start.sh
+++ b/nifi-docker/dockermaven/sh/start.sh
@@ -98,7 +98,9 @@ prop_replace 'nifi.analytics.connection.model.implementation' 
  "${NIFI_ANALYTIC
 prop_replace 'nifi.analytics.connection.model.score.name'       
"${NIFI_ANALYTICS_MODEL_SCORE_NAME:-rSquared}"
 prop_replace 'nifi.analytics.connection.model.score.threshold'  
"${NIFI_ANALYTICS_MODEL_SCORE_THRESHOLD:-.90}"
 
-prop_replace 'nifi.sensitive.props.key'   "${NIFI_SENSITIVE_PROPS_KEY:-}"
+if [ -n "${NIFI_SENSITIVE_PROPS_KEY}" ]; then
+    prop_replace 'nifi.sensitive.props.key' "${NIFI_SENSITIVE_PROPS_KEY}"
+fi
 
 if [ -n "${SINGLE_USER_CREDENTIALS_USERNAME}" ] && [ -n 
"${SINGLE_USER_CREDENTIALS_PASSWORD}" ]; then
     ${NIFI_HOME}/bin/nifi.sh set-single-user-credentials 
"${SINGLE_USER_CREDENTIALS_USERNAME}" "${SINGLE_USER_CREDENTIALS_PASSWORD}"