Harden Docker scripts

Signed-off-by: dhoard <doug.hoard@gmail.com>

Author: dhoard

integration_test_suite/pull-java-docker-images.sh

@@ -1,8 +1,24 @@
 #!/bin/bash
 
+#
+# Copyright (C) The Prometheus jmx_exporter Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 PWD="$PWD"
 function exit_trap() {
-  cd "${PWD}"
+  cd "${PWD}" || exit
   echo $?
 }
 trap exit_trap EXIT
@@ -13,12 +29,12 @@ function check_exit_code() {
   if [ "$?" != "0" ];
   then
     echo "Failed to pull Docker image ${1}";
-    exit $?
+    exit 1
   fi
 }
 
-grep -v '^#' integration_tests/src/test/resources/java-docker-images.txt | while read -r LINE;
+while read -r LINE;
 do
   docker pull "${LINE}"
   check_exit_code "${LINE}"
-done
+done < <(grep -v '^#' integration_tests/src/test/resources/java-docker-images.txt)

integration_test_suite/pull-prometheus-docker-images.sh

@@ -1,24 +1,40 @@
 #!/bin/bash
 
+#
+# Copyright (C) The Prometheus jmx_exporter Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 PWD="$PWD"
 function exit_trap() {
-  cd "${PWD}"
+  cd "${PWD}" || exit
   echo $?
 }
 trap exit_trap EXIT
 SCRIPT_DIRECTORY=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
-cd "${SCRIPT_DIRECTORY}"
+cd "${SCRIPT_DIRECTORY}" || exit
 
 function check_exit_code() {
   if [ "$?" != "0" ];
   then
     echo "Failed to pull Docker image ${1}";
-    exit $?
+    exit 1
   fi
 }
 
-grep -v '^#' integration_tests/src/test/resources/prometheus-docker-images.txt | while read -r LINE;
+while read -r LINE;
 do
   docker pull "${LINE}"
   check_exit_code "${LINE}"
-done
+done < <(grep -v '^#' integration_tests/src/test/resources/prometheus-docker-images.txt)

integration_test_suite/pull-smoke-test-docker-images.sh

@@ -1,21 +1,40 @@
 #!/bin/bash
 
+#
+# Copyright (C) The Prometheus jmx_exporter Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 PWD="$PWD"
 function exit_trap() {
-  cd "${PWD}"
+  cd "${PWD}" || exit
   echo $?
 }
 trap exit_trap EXIT
 SCRIPT_DIRECTORY=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
-cd "${SCRIPT_DIRECTORY}"
+cd "${SCRIPT_DIRECTORY}" || exit
 
 function check_exit_code() {
   if [ "$?" != "0" ];
   then
-    echo "Failed to pull Docker image ${1}";
-    exit $?
+    echo "Failed to execute ${1}";
+    exit 1
   fi
 }
 
 ./pull-smoke-test-java-docker-images.sh
-./pull-smoke-test-prometheus-docker-images.sh
+check_exit_code "./pull-smoke-test-java-docker-images.sh"
+
+./pull-smoke-test-prometheus-docker-images.sh
+check_exit_code "./pull-smoke-test-prometheus-docker-images.sh"

integration_test_suite/pull-smoke-test-java-docker-images.sh

@@ -1,24 +1,40 @@
 #!/bin/bash
 
+#
+# Copyright (C) The Prometheus jmx_exporter Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 PWD="$PWD"
 function exit_trap() {
-  cd "${PWD}"
+  cd "${PWD}" || exit
   echo $?
 }
 trap exit_trap EXIT
 SCRIPT_DIRECTORY=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
-cd "${SCRIPT_DIRECTORY}"
+cd "${SCRIPT_DIRECTORY}" || exit
 
 function check_exit_code() {
   if [ "$?" != "0" ];
   then
     echo "Failed to pull Docker image ${1}";
-    exit $?
+    exit 1
   fi
 }
 
-grep -v '^#' integration_tests/src/test/resources/smoke-test-java-docker-images.txt | while read -r LINE;
+while read -r LINE;
 do
   docker pull "${LINE}"
   check_exit_code "${LINE}"
-done
+done < <(grep -v '^#' integration_tests/src/test/resources/smoke-test-java-docker-images.txt)

integration_test_suite/pull-smoke-test-prometheus-docker-images.sh

@@ -1,19 +1,35 @@
 #!/bin/bash
 
+#
+# Copyright (C) The Prometheus jmx_exporter Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 PWD="$PWD"
 function exit_trap() {
-  cd "${PWD}"
+  cd "${PWD}" || exit
   echo $?
 }
 trap exit_trap EXIT
 SCRIPT_DIRECTORY=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
-cd "${SCRIPT_DIRECTORY}"
+cd "${SCRIPT_DIRECTORY}" || exit
 
 function check_exit_code() {
   if [ "$?" != "0" ];
   then
     echo "Failed to pull Docker image ${1}";
-    exit $?
+    exit 1
   fi
 }
 

run-quick-test.sh

@@ -20,6 +20,9 @@
 # Bash script to build, package, and run a quick test
 #
 
+set -e
+set -o pipefail
+
 (
   export JAVA_DOCKER_IMAGES="amazoncorretto:25"
   export PROMETHEUS_DOCKER_IMAGES="prom/prometheus:v3.9.1"

run-regression-test.sh

@@ -20,6 +20,9 @@
 # Bash script to build, package, and run the regression tests (all Docker containers)
 #
 
+set -e
+set -o pipefail
+
 (
   export JAVA_DOCKER_IMAGES=all
   export PROMETHEUS_DOCKER_IMAGES=all

run-smoke-test.sh

@@ -20,6 +20,9 @@
 # Bash script to build, package, and run the smoke tests (smoke test Docker containers)
 #
 
+set -e
+set -o pipefail
+
 (
   unset JAVA_DOCKER_IMAGES
   unset PROMETHEUS_DOCKER_IMAGES

run-stress-test.sh

@@ -21,21 +21,23 @@
 # test suite continuously until there is a failure
 #
 
+set -o pipefail
+
 (
+  export JAVA_DOCKER_IMAGES=all
+  export PROMETHEUS_DOCKER_IMAGES=all
+
   while true;
   do
     DATE=$(date)
     echo "STRESS-TEST-START    ${DATE}"
 
-    export JAVA_DOCKER_IMAGES=all
-    export PROMETHEUS_DOCKER_IMAGES=all
-
     ./mvnw clean verify
     if [[ "$?" -ne 0 ]];
     then
       DATE=$(date)
       echo "STRESS-TEST-FAILED   ${DATE}"
-      break
+      exit 1
     fi
 
     DATE=$(date)

run-targeted-test.sh

@@ -25,6 +25,9 @@ if [[ "$#" -ne 2 ]]; then
     exit 1
 fi
 
+set -e
+set -o pipefail
+
 (
   export JAVA_DOCKER_IMAGES="$1"
   export PROMETHEUS_DOCKER_IMAGES="$2"