From d93210ec85ce056f319086b451ec745bf82b73cd Mon Sep 17 00:00:00 2001 From: rdani Date: Wed, 26 Oct 2022 22:56:29 +0530 Subject: [PATCH 01/17] Fix: Shell scripts to pass shellcheck linter for sensor and central files --- deploy/k8s/central.sh | 8 ++++---- deploy/k8s/sensor.sh | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index a7f187191c092..de736762bfe23 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -4,9 +4,9 @@ set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/env.sh -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$K8S_DIR"/env.sh launch_central "$K8S_DIR" diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 19628f80d0916..e4dde7185462c 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -4,13 +4,13 @@ set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $COMMON_DIR/env.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$COMMON_DIR"/env.sh +source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then - read -p "Enter cluster name to create: " CLUSTER + read -p -r "Enter cluster name to create: " CLUSTER fi echo "CLUSTER set to $CLUSTER" @@ -18,7 +18,8 @@ if [[ -z "${ROX_ADMIN_PASSWORD}" ]]; then export ROX_ADMIN_PASSWORD="${ROX_PASSWORD:-}" fi if [[ -z "$ROX_ADMIN_PASSWORD" && -f "${K8S_DIR}/central-deploy/password" ]]; then - export ROX_ADMIN_PASSWORD="$(cat ${K8S_DIR}/central-deploy/password)" + ROX_ADMIN_PASSWORD="$(cat "${K8S_DIR}"/central-deploy/password)" + export ROX_ADMIN_PASSWORD fi launch_sensor "$K8S_DIR" From 5ac7507a98fcd3887b30a0f10a3d3ffcaf11e8e8 Mon Sep 17 00:00:00 2001 From: rdani Date: Wed, 26 Oct 2022 23:04:06 +0530 Subject: [PATCH 02/17] Remove files from shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index 43c39a6b09dac..e995ccd1cf0d4 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -2,10 +2,8 @@ deploy/common/deploy.sh deploy/common/docker-auth.sh deploy/common/k8sbased.sh -deploy/k8s/central.sh deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh -deploy/k8s/sensor.sh deploy/openshift/central.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh From 939fef1f635014935dc8c4be7e686101fec6f23f Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:34:04 +0530 Subject: [PATCH 03/17] Create central.sh --- deploy/k8s/central.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index de736762bfe23..8c4f57d868ac5 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From 9d8420c4ccfbb109992685d259a9367cfc489107 Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:34:33 +0530 Subject: [PATCH 04/17] Update sensor.sh --- deploy/k8s/sensor.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index e4dde7185462c..b4b0538352bde 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From 0b0f0ab97465fa13a02e6c3f234f030579d7fcd3 Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 19:23:33 +0530 Subject: [PATCH 05/17] Update sensor.sh --- deploy/k8s/sensor.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index b4b0538352bde..6cf5cf22eda59 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # shellcheck disable=SC1091 +# shellcheck disable=SC2086 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From 4c02decb85d377e7f3e53bb6bac3f0c12b490ca0 Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 20:04:02 +0530 Subject: [PATCH 06/17] Update sensor.sh --- deploy/k8s/sensor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 6cf5cf22eda59..8bb6ce048c621 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -20,7 +20,7 @@ if [[ -z "${ROX_ADMIN_PASSWORD}" ]]; then export ROX_ADMIN_PASSWORD="${ROX_PASSWORD:-}" fi if [[ -z "$ROX_ADMIN_PASSWORD" && -f "${K8S_DIR}/central-deploy/password" ]]; then - ROX_ADMIN_PASSWORD="$(cat "${K8S_DIR}"/central-deploy/password)" + ROX_ADMIN_PASSWORD="$(cat ${K8S_DIR}/central-deploy/password)" export ROX_ADMIN_PASSWORD fi From d5db2f462c0eecb41bea8434327d1d1eff64f046 Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 21:51:36 +0530 Subject: [PATCH 07/17] Remove -r flag --- deploy/k8s/sensor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 8bb6ce048c621..f8eaacd4eaec6 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -12,7 +12,7 @@ source "$COMMON_DIR"/env.sh source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then - read -p -r "Enter cluster name to create: " CLUSTER + read -p "Enter cluster name to create: " CLUSTER fi echo "CLUSTER set to $CLUSTER" From 6818e03ad4071b6c13ab160959372c652f0b6da7 Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 22:00:56 +0530 Subject: [PATCH 08/17] Add and move suppress comments --- deploy/k8s/sensor.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index f8eaacd4eaec6..473762f9945d6 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # shellcheck disable=SC1091 -# shellcheck disable=SC2086 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" @@ -12,6 +11,7 @@ source "$COMMON_DIR"/env.sh source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then + # shellcheck disable=SC2162 read -p "Enter cluster name to create: " CLUSTER fi echo "CLUSTER set to $CLUSTER" @@ -20,6 +20,7 @@ if [[ -z "${ROX_ADMIN_PASSWORD}" ]]; then export ROX_ADMIN_PASSWORD="${ROX_PASSWORD:-}" fi if [[ -z "$ROX_ADMIN_PASSWORD" && -f "${K8S_DIR}/central-deploy/password" ]]; then + # shellcheck disable=SC2086 ROX_ADMIN_PASSWORD="$(cat ${K8S_DIR}/central-deploy/password)" export ROX_ADMIN_PASSWORD fi From 4702da84197f03dc4ce7526c72fb650a47ef12b4 Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 22:10:50 +0530 Subject: [PATCH 09/17] Add and move suppress comments --- deploy/k8s/central.sh | 11 ++++++----- deploy/k8s/sensor.sh | 10 +++++----- deploy/openshift/central.sh | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index 8c4f57d868ac5..5a7d1fdddec73 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -# shellcheck disable=SC1091 +# shellcheck disable=SC2086 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source "$COMMON_DIR"/env.sh -source "$COMMON_DIR"/deploy.sh -source "$COMMON_DIR"/k8sbased.sh -source "$K8S_DIR"/env.sh + +source $COMMON_DIR/env.sh +source $COMMON_DIR/deploy.sh +source $COMMON_DIR/k8sbased.sh +source $K8S_DIR/env.sh launch_central "$K8S_DIR" diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 473762f9945d6..7cad16b4dd1e4 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash -# shellcheck disable=SC1091 +# shellcheck disable=SC2086 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source "$COMMON_DIR"/deploy.sh -source "$COMMON_DIR"/k8sbased.sh -source "$COMMON_DIR"/env.sh -source "$K8S_DIR"/env.sh +source $COMMON_DIR/deploy.sh +source $COMMON_DIR/k8sbased.sh +source $COMMON_DIR/env.sh +source $K8S_DIR/env.sh if [[ -z $CLUSTER ]]; then # shellcheck disable=SC2162 diff --git a/deploy/openshift/central.sh b/deploy/openshift/central.sh index a7f187191c092..696ae0a11d2d2 100755 --- a/deploy/openshift/central.sh +++ b/deploy/openshift/central.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC2086 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From 113770c1e2106bd594fcf4c1a420d81f08b3f4c8 Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 22:11:30 +0530 Subject: [PATCH 10/17] Update central.sh --- deploy/k8s/central.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index 5a7d1fdddec73..696ae0a11d2d2 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -5,7 +5,6 @@ set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" - source $COMMON_DIR/env.sh source $COMMON_DIR/deploy.sh source $COMMON_DIR/k8sbased.sh From b14a2607ccc19e9cc0ebec29de0e956a77727968 Mon Sep 17 00:00:00 2001 From: Rachana Dani <36135368+rachana-dani@users.noreply.github.com> Date: Thu, 27 Oct 2022 22:12:21 +0530 Subject: [PATCH 11/17] Update shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index e995ccd1cf0d4..bfe98c540c677 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -4,7 +4,6 @@ deploy/common/docker-auth.sh deploy/common/k8sbased.sh deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh -deploy/openshift/central.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh deploy/openshift/sensor.sh From 956ca8c1fa120ca8e966bf8f877a1d781624d11f Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 22:34:59 +0530 Subject: [PATCH 12/17] Add suppress comments --- deploy/k8s/central.sh | 1 + deploy/k8s/sensor.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index 5a7d1fdddec73..e2c3816018f5e 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # shellcheck disable=SC2086 +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 7cad16b4dd1e4..af09b563da094 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # shellcheck disable=SC2086 +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From d46ee71c1f2027b1d0cf2a75d05d679cc69cd693 Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 22:41:28 +0530 Subject: [PATCH 13/17] Add touched files back --- scripts/style/shellcheck_skip.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index bfe98c540c677..43c39a6b09dac 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -2,8 +2,11 @@ deploy/common/deploy.sh deploy/common/docker-auth.sh deploy/common/k8sbased.sh +deploy/k8s/central.sh deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh +deploy/k8s/sensor.sh +deploy/openshift/central.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh deploy/openshift/sensor.sh From fa61ae610a0719593905430b2ba911e6098664ef Mon Sep 17 00:00:00 2001 From: rdani Date: Thu, 27 Oct 2022 23:11:27 +0530 Subject: [PATCH 14/17] Remove touched files back from shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index 43c39a6b09dac..bfe98c540c677 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -2,11 +2,8 @@ deploy/common/deploy.sh deploy/common/docker-auth.sh deploy/common/k8sbased.sh -deploy/k8s/central.sh deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh -deploy/k8s/sensor.sh -deploy/openshift/central.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh deploy/openshift/sensor.sh From 44c2d4d6fffcc7210f3cc9ea7aee7f3a8131eb06 Mon Sep 17 00:00:00 2001 From: rdani Date: Fri, 28 Oct 2022 09:16:55 +0530 Subject: [PATCH 15/17] Update shellcheck comment, add double quotes --- deploy/k8s/central.sh | 9 ++++----- deploy/k8s/sensor.sh | 9 ++++----- deploy/openshift/central.sh | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index 2a7672a83a07d..8c4f57d868ac5 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -1,14 +1,13 @@ #!/usr/bin/env bash -# shellcheck disable=SC2086 # shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/env.sh -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$K8S_DIR"/env.sh launch_central "$K8S_DIR" diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index af09b563da094..473762f9945d6 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash -# shellcheck disable=SC2086 # shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $COMMON_DIR/env.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$COMMON_DIR"/env.sh +source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then # shellcheck disable=SC2162 diff --git a/deploy/openshift/central.sh b/deploy/openshift/central.sh index 696ae0a11d2d2..8c4f57d868ac5 100755 --- a/deploy/openshift/central.sh +++ b/deploy/openshift/central.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -# shellcheck disable=SC2086 +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/env.sh -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$K8S_DIR"/env.sh launch_central "$K8S_DIR" From 2202929ae571856a398655b8916e96fdec81e567 Mon Sep 17 00:00:00 2001 From: rdani Date: Fri, 28 Oct 2022 15:11:09 +0530 Subject: [PATCH 16/17] Update shellcheck comment, --- deploy/k8s/sensor.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 473762f9945d6..4dabb06a7e237 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -11,8 +11,7 @@ source "$COMMON_DIR"/env.sh source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then - # shellcheck disable=SC2162 - read -p "Enter cluster name to create: " CLUSTER + read -p -r "Enter cluster name to create: " CLUSTER fi echo "CLUSTER set to $CLUSTER" From 477719336fcb5df3f0bb6743a8e7fa3a5ed53e66 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Fri, 28 Oct 2022 15:51:43 +0200 Subject: [PATCH 17/17] Update scripts/style/shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index bfe98c540c677..a6a9a4c2e6ac3 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -6,7 +6,6 @@ deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh -deploy/openshift/sensor.sh dev-tools/add-host-alias.sh dev-tools/enable-hotreload.sh dev-tools/roxctl.sh