Used set to make shell scripts more strict (opensearch-project#3278)

* Use set to make shell scripts more strict Signed-off-by: Owais Kazi <[email protected]> * Change -o pipefail to -e Signed-off-by: Owais Kazi <[email protected]> * Set scripts to standard rule Signed-off-by: Owais Kazi <[email protected]>
ticheng-aws · May 16, 2022 · e73a410 · e73a410
1 parent 4886f8e
commit e73a410
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 8 deletions.
diff --git a/client/sniffer/src/test/resources/create_test_nodes_info.bash b/client/sniffer/src/test/resources/create_test_nodes_info.bash
@@ -14,7 +14,7 @@
 # when we do rebuild the files they don't jump around too much. That
 # way the diffs are smaller.
 
-set -e
+set -e -o pipefail
 
 script_path="$( cd "$(dirname "$0")" ; pwd -P )"
 work=$(mktemp -d)

diff --git a/dev-tools/atomic_push.sh b/dev-tools/atomic_push.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 if [ "$#" -eq 0 ]; then
     printf 'Usage: %s <origin> <branch> <branch> ...\n' "$(basename "$0")"

diff --git a/dev-tools/signoff-check.sh b/dev-tools/signoff-check.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+set -e -o pipefail
 
 ### Script to check for signoff presents on commits
 

diff --git a/distribution/docker/docker-test-entrypoint.sh b/distribution/docker/docker-test-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e -o pipefail
+
 cd /usr/share/opensearch/bin/
 
 /usr/local/bin/docker-entrypoint.sh | tee > /usr/share/opensearch/logs/console.log
diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 # Files created by Elasticsearch should always be group writable too
 umask 0002

diff --git a/distribution/packages/src/common/scripts/preinst b/distribution/packages/src/common/scripts/preinst
@@ -10,6 +10,8 @@
 #       $1=1       : indicates an new install
 #       $1=2       : indicates an upgrade
 
+set -e -o pipefail
+
 err_exit() {
     echo "$@" >&2
     exit 1

diff --git a/distribution/packages/src/common/systemd/systemd-entrypoint b/distribution/packages/src/common/systemd/systemd-entrypoint
@@ -3,6 +3,8 @@
 # This wrapper script allows SystemD to feed a file containing a passphrase into
 # the main OpenSearch startup script
 
+set -e -o pipefail
+
 if [ -n "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE" ] ; then
   exec /usr/share/opensearch/bin/opensearch "$@" < "$OPENSEARCH_KEYSTORE_PASSPHRASE_FILE"
 else

diff --git a/distribution/packages/src/deb/init.d/opensearch b/distribution/packages/src/deb/init.d/opensearch
@@ -12,6 +12,8 @@
 # Description:       Starts opensearch using start-stop-daemon
 ### END INIT INFO
 
+set -e -o pipefail
+
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=opensearch
 DESC="OpenSearch Server"

diff --git a/distribution/packages/src/rpm/init.d/opensearch b/distribution/packages/src/rpm/init.d/opensearch
@@ -16,6 +16,8 @@
 # Description: OpenSearch is a very scalable, schema-free and high-performance search solution supporting multi-tenancy and near realtime search.
 ### END INIT INFO
 
+set -e -o pipefail
+
 #
 # init.d / servicectl compatibility (openSUSE)
 #

diff --git a/distribution/src/bin/opensearch b/distribution/src/bin/opensearch
@@ -13,6 +13,8 @@
 #
 #   OPENSEARCH_JAVA_OPTS="-Xms8g -Xmx8g" ./bin/opensearch
 
+set -e -o pipefail
+
 source "`dirname "$0"`"/opensearch-env
 
 CHECK_KEYSTORE=true

diff --git a/distribution/src/bin/opensearch-keystore b/distribution/src/bin/opensearch-keystore
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e -o pipefail
+
 OPENSEARCH_MAIN_CLASS=org.opensearch.common.settings.KeyStoreCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/keystore-cli \
   "`dirname "$0"`"/opensearch-cli \

diff --git a/distribution/src/bin/opensearch-node b/distribution/src/bin/opensearch-node
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e -o pipefail
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.cluster.coordination.NodeToolCli \
   "`dirname "$0"`"/opensearch-cli \

diff --git a/distribution/src/bin/opensearch-plugin b/distribution/src/bin/opensearch-plugin
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e -o pipefail
+
 OPENSEARCH_MAIN_CLASS=org.opensearch.plugins.PluginCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli \
   "`dirname "$0"`"/opensearch-cli \

diff --git a/distribution/src/bin/opensearch-shard b/distribution/src/bin/opensearch-shard
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e -o pipefail
+
 OPENSEARCH_MAIN_CLASS=org.opensearch.index.shard.ShardToolCli \
   "`dirname "$0"`"/opensearch-cli \
   "$@"
diff --git a/distribution/src/bin/opensearch-upgrade b/distribution/src/bin/opensearch-upgrade
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e -o pipefail
 
 OPENSEARCH_MAIN_CLASS=org.opensearch.upgrade.UpgradeCli \
   OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/upgrade-cli \

diff --git a/qa/remote-clusters/docker-test-entrypoint.sh b/qa/remote-clusters/docker-test-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e -o pipefail 
+
 cd /usr/share/opensearch/bin/
 ./opensearch-users useradd rest_user -p test-password -r superuser || true
 echo "testnode" > /tmp/password

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/addprinc.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/addprinc.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -e -o pipefail
 
 krb5kdc
 kadmind

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh
@@ -10,7 +10,7 @@
 # GitHub history for details.
 #
 
-set -e
+set -e -o pipefail
 
 addprinc.sh "opensearch"
 #TODO(OpenSearch): fix username

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh
@@ -29,7 +29,7 @@
 # GitHub history for details.
 #
 
-set -e
+set -e -o pipefail
 
 # KDC installation steps and considerations based on https://web.mit.edu/kerberos/krb5-latest/doc/admin/install_kdc.html
 # and helpful input from https://help.ubuntu.com/community/Kerberos

diff --git a/test/fixtures/krb5kdc-fixture/src/main/resources/provision/peppa.sh b/test/fixtures/krb5kdc-fixture/src/main/resources/provision/peppa.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -e -o pipefail
 
 addprinc.sh opensearch
 addprinc.sh HTTP/localhost
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     # specific language governing permissions and limitations
     # under the License.
-    set -e
+    set -e -o pipefail
     krb5kdc
     kadmind
@@ Expand Down @@