Skip to content

Commit bf0cfdd

Browse files
committed
more preconditions checks
1 parent f4fb19a commit bf0cfdd

File tree

7 files changed

+29
-10
lines changed

7 files changed

+29
-10
lines changed

scripts/SonarQubeCredentials.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
# shellcheck disable=SC2034
4+
sonar_host=""
5+
sonar_project=""
6+
sonar_token=""

scripts/requireCommand.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
requireCommand() {
4+
if ! command -v "$1" &> /dev/null
5+
then
6+
echo "$1 is required. Please install it and then try again."
7+
exit 1
8+
fi
9+
}

scripts/requireDocker.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

scripts/runHorusec.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Check for install/updates at https://github.com/ZupIT/horusec
44

5-
source scripts/requireDocker.sh
5+
source scripts/requireCommand.sh
6+
7+
requireCommand docker
68

79
benchmark_version=$(scripts/getBenchmarkVersion.sh)
810
horusec_version=$(docker run horuszup/horusec-cli horusec version 2>&1 | grep version | awk '{print $NF}')

scripts/runInsider.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ if ! command -v insider &> /dev/null; then
77
exit 1
88
fi
99

10+
source scripts/requireCommand.sh
11+
12+
requireCommand curl
13+
requireCommand jq
14+
1015
benchmark_version=$(scripts/getBenchmarkVersion.sh)
1116
insider_version=$(insider -version | grep Version | cut -d' ' -f2)
1217
result_file="results/Benchmark_$benchmark_version-insider-v$insider_version.json"

scripts/runSemgrep.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Check for install/updates at https://github.com/returntocorp/semgrep
44

5-
source scripts/requireDocker.sh
5+
source scripts/requireCommand.sh
6+
7+
requireCommand docker
68

79
benchmark_version=$(scripts/getBenchmarkVersion.sh)
810
semgrep_version=$(docker run --rm returntocorp/semgrep --version)

scripts/runShiftLeftScan.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Check for install/updates at https://github.com/ShiftLeftSecurity/sast-scan
44

5-
source scripts/requireDocker.sh
5+
source scripts/requireCommand.sh
6+
7+
requireCommand docker
68

79
benchmark_version=$(scripts/getBenchmarkVersion.sh)
810
shiflteft_version="2.0.3" # it's not (yet) possible to get the release version so we just assume it

0 commit comments

Comments
 (0)