ENTESB-10252: removed spaces from noProxy input ENV var

fabric8io-images · Feb 28, 2019 · 1bfb364 · 1bfb364
1 parent e203d9a
commit 1bfb364
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/fish-pepper/run-java-sh/fp-files/run-java.sh b/fish-pepper/run-java-sh/fp-files/run-java.sh
@@ -483,7 +483,7 @@ proxy_options() {
 
   local noProxy="${no_proxy:-${NO_PROXY:-}}"
   if [ -n "$noProxy" ] ; then
-    ret="$ret -Dhttp.nonProxyHosts=$(echo "|$noProxy" | sed -e 's/,[[:space:]]*/|/g' | sed -e 's/|\./|\*\./g' | cut -c 2-)"
+    ret="$ret -Dhttp.nonProxyHosts=$(echo "|$noProxy" | sed -e 's/,[[:space:]]*/|/g' | sed -e 's/[[:space:]]//g' | sed -e 's/|\./|\*\./g' | cut -c 2-)"
   fi
   echo "$ret"
 }

diff --git a/test/t/04_proxy.bats b/test/t/04_proxy.bats
@@ -87,6 +87,17 @@ load test_helper
   assert_status 0
 }
 
+@test "NO_PROXY setting end to end test with space" {
+  d=$(mktmpdir "proxy")
+
+  cp "$TEST_JAR_DIR/TestProxy.class" "$d/TestProxy.class"
+  HTTP_PROXY=http://dummy.com HTTPS_PROXY=http://dummy.com NO_PROXY='.redhat.com| .google.com' no_proxy='.redhat.com| .google.com' JAVA_MAIN_CLASS=TestProxy JAVA_APP_DIR=$d run $TEST_SHELL $RUN_JAVA
+  echo $status
+  echo $output
+
+  assert_status 0
+}
+
 @test "All proxy settings" {
   d=$(mktmpdir "proxy")
   cp "$TEST_JAR_DIR/test.jar" "$d/test.jar"