Skip to content

Fix shell check linter for deploy/common/deploy.sh #3547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gavin-stackrox merged 7 commits into from
Oct 29, 2022
Merged

Fix shell check linter for deploy/common/deploy.sh #3547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fbb4092
Fix shell check linter for deploy/common/deploy.sh
Oct 25, 2022
de4399b
Fix shell check linter for deploy/common/deploy.sh
Oct 25, 2022
b76afef
Fix shell check linter for deploy/common/deploy.sh - address review c…
Oct 25, 2022
cd1a117
Fix shell check linter for deploy/common/deploy.sh - address review c…
Oct 25, 2022
1fcee86
Fix shell check linter for deploy/common/deploy.sh - address review c…
Oct 26, 2022
cf5afb1
Fix shell check linter for deploy/common/deploy.sh - address review c…
Oct 27, 2022
ecee59d
Fix shell check linter for deploy/common/deploy.sh - address review c…
Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions deploy/common/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ if [[ -z "${SCANNER_IMAGE}" ]]; then
fi
export SCANNER_DB_IMAGE="${SCANNER_DB_IMAGE:-}"
if [[ -z "${SCANNER_DB_IMAGE}" ]]; then
export SCANNER_DB_IMAGE="$DEFAULT_IMAGE_REGISTRY/scanner-db:$(cat "$(git rev-parse --show-toplevel)/SCANNER_VERSION")"
SCANNER_DB_IMAGE="$DEFAULT_IMAGE_REGISTRY/scanner-db:$(cat "$(git rev-parse --show-toplevel)/SCANNER_VERSION")"
export SCANNER_DB_IMAGE
fi
echo "StackRox scanner image set to $SCANNER_IMAGE"

Expand Down Expand Up @@ -85,12 +86,13 @@ function wait_for_central {

echo -n "Waiting for Central to respond."
set +e
local start_time="$(date '+%s')"
local start_time
start_time="$(date '+%s')"
local deadline=$((start_time + 10*60)) # 10 minutes
until $(curl_central --output /dev/null --silent --fail "https://$LOCAL_API_ENDPOINT/v1/ping"); do
until curl_central --output /dev/null --silent --fail "https://$LOCAL_API_ENDPOINT/v1/ping"; do
if [[ "$(date '+%s')" > "$deadline" ]]; then
echo >&2 "Exceeded deadline waiting for Central."
central_pod="$("${ORCH_CMD}" -n stackrox get pods -l app=central -ojsonpath={.items[0].metadata.name})"
central_pod="$("${ORCH_CMD}" -n stackrox get pods -l app=central -ojsonpath='{.items[0].metadata.name}')"
if [[ -n "$central_pod" ]]; then
"${ORCH_CMD}" -n stackrox exec "${central_pod}" -c central -- kill -ABRT 1
fi
Expand Down Expand Up @@ -150,7 +152,7 @@ function get_cluster_zip {
exit 1
fi

ID="$(cat "${TMP}" | jq -r .cluster.id)"
ID="$(jq -r .cluster.id "${TMP}")"

echo "Getting zip file for cluster ${ID}"
STATUS=$(curl_central -X POST \
Expand Down Expand Up @@ -185,8 +187,8 @@ function get_identity {
"https://$LOCAL_API_ENDPOINT/v1/serviceIdentities")
echo "Status: $STATUS"
echo "Response: $(cat "${TMP}")"
cat "$TMP" | jq -r .certificate > "$OUTPUT_DIR/sensor-cert.pem"
cat "$TMP" | jq -r .privateKey > "$OUTPUT_DIR/sensor-key.pem"
jq -r .certificate "$TMP" > "$OUTPUT_DIR/sensor-cert.pem"
jq -r .privateKey "$TMP" > "$OUTPUT_DIR/sensor-key.pem"
rm "$TMP"
echo
}
Expand All @@ -208,7 +210,7 @@ function get_authority {
"https://$LOCAL_API_ENDPOINT/v1/authorities")
echo "Status: $STATUS"
echo "Response: $(cat "${TMP}")"
cat "$TMP" | jq -r .authorities[0].certificate > "$OUTPUT_DIR/ca.pem"
jq -r .authorities[0].certificate "$TMP" > "$OUTPUT_DIR/ca.pem"
rm "$TMP"
echo
}
Expand Down Expand Up @@ -243,8 +245,8 @@ function setup_license() {
echo "Injecting license ..."
[[ -f "$license_file" ]] || { echo "License file $license_file not found!" ; return 1 ; }

local tmp="$(mktemp)"

local tmp
tmp="$(mktemp)"
status=$(curl_central \
-s \
-o "$tmp" \
Expand Down
1 change: 0 additions & 1 deletion scripts/style/shellcheck_skip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.github/workflows/scripts/patch-changelog.sh
deploy/common/deploy.sh
deploy/common/docker-auth.sh
deploy/common/k8sbased.sh
deploy/k8s/central.sh
Expand Down