Skip to content

Commit d2a2a5d

Browse files
dorian-burihabwa-sonarsourcedorian-burihabwa-sonarsource
committed
Manually pick the folders for EUA scan
1 parent 4b256fd commit d2a2a5d

2 files changed

Lines changed: 21 additions & 109 deletions

File tree

‎setup.txt‎

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

‎ws_scan.sh‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
#! /usr/bin/env bash
22

3+
readonly SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
4+
35
readonly UNIFIED_AGENT_JAR="wss-unified-agent.jar"
4-
readonly UNIFIED_AGENT_JAR_MD5_CHECKSUM="F2EB843816A572904954052756EB66E7"
6+
readonly UNIFIED_AGENT_JAR_MD5_CHECKSUM="F2EB843816A572904954052756EB66E7" # MD5 hash for version 21.6.1
57
readonly UNIFIED_AGENT_JAR_URL="https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar"
68

7-
readonly MODULE_ANALYZER_JAR="xModuleAnalyzer-21.4.1.jar"
8-
readonly MODULE_ANALYZER_JAR_URL="https://unified-agent.s3.amazonaws.com/xModuleAnalyzer/xModuleAnalyzer-21.4.1.jar"
9-
readonly MODULE_ANALYZER_JAR_MD5_CHECKSUM="2944089B0402957132B3BCDB8EF4E5DB"
10-
readonly MODULE_SETUP_FILE="setup.txt"
11-
12-
get_wss_agent() {
9+
get_unified_agent() {
1310
if [[ ! -f "${UNIFIED_AGENT_JAR}" ]]; then
1411
curl \
1512
--location \
@@ -25,7 +22,9 @@ get_wss_agent() {
2522
# Verify JAR checksum
2623
local checksum="$(md5sum ${UNIFIED_AGENT_JAR} | cut --delimiter=" " --fields=1 | awk ' { print toupper($0) }')"
2724
if [[ "${checksum}" != "${UNIFIED_AGENT_JAR_MD5_CHECKSUM}" ]]; then
28-
echo -e "MD5 checksum mismatch.\nexpected: ${UNIFIED_AGENT_JAR_MD5_CHECKSUM}\ncomputed: ${checksum}" >&2
25+
echo "MD5 checksum mismatch." >&2
26+
echo "expected: ${UNIFIED_AGENT_JAR_MD5_CHECKSUM}" >&2
27+
echo "computed: ${checksum}" >&2
2928
exit 2
3029
fi
3130

@@ -36,33 +35,6 @@ get_wss_agent() {
3635
fi
3736
}
3837

39-
get_multi_module_agent() {
40-
if [[ ! -f "${MODULE_ANALYZER_JAR}" ]]; then
41-
curl \
42-
--location \
43-
--remote-name \
44-
--remote-header-name \
45-
"${MODULE_ANALYZER_JAR_URL}"
46-
fi
47-
if [[ ! -f "${MODULE_ANALYZER_JAR}" ]]; then
48-
echo "Could not find downloaded Unified Agent" >&2
49-
exit 1
50-
fi
51-
52-
# Verify JAR checksum
53-
local checksum="$(md5sum ${MODULE_ANALYZER_JAR} | cut --delimiter=" " --fields=1 | awk ' { print toupper($0) }')"
54-
if [[ "${checksum}" != "${MODULE_ANALYZER_JAR_MD5_CHECKSUM}" ]]; then
55-
echo -e "MD5 checksum mismatch.\nexpected: ${MODULE_ANALYZER_JAR_MD5_CHECKSUM}\ncomputed: ${checksum}" >&2
56-
exit 2
57-
fi
58-
59-
# Verify JAR signature
60-
if ! jarsigner -verify "${MODULE_ANALYZER_JAR}"; then
61-
echo "Could not verify jar signature" >&2
62-
exit 3
63-
fi
64-
}
65-
6638
local_maven_expression() {
6739
mvn -q -Dexec.executable="echo" -Dexec.args="\${${1}}" --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec
6840
}
@@ -92,13 +64,20 @@ scan() {
9264
fi
9365
export WS_PROJECTNAME="${WS_PRODUCTNAME} ${PROJECT_VERSION%.*}"
9466
echo "${WS_PRODUCTNAME} - ${WS_PROJECTNAME}"
95-
if [[ ! -f "${MODULE_SETUP_FILE}" ]]; then
96-
java -jar "${UNIFIED_AGENT_JAR}" -c whitesource.properties -d . -analyzeMultiModule "${MODULE_SETUP_FILE}"
97-
fi
98-
java -jar "${MODULE_ANALYZER_JAR}" -xModulePath "${MODULE_SETUP_FILE}" -fsaJarPath "${UNIFIED_AGENT_JAR}" -c whitesource.properties -statusDisplay dynamic
99-
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "sonar-java-plugin/target/sonar-java-plugin-${PROJECT_VERSION}.jar" -d sonar-java-plugin
67+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/docs/java-custom-rules-example/target/java-custom-rules-example-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/docs/java-custom-rules-example"
68+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/external-reports/target/external-reports-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/external-reports"
69+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/its/plugin/tests/target/it-java-plugin-tests-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/its/plugin/tests"
70+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/its/plugin/plugins/java-extension-plugin/target/java-extension-plugin-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/its/plugin/plugins/java-extension-plugin"
71+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/its/ruling/target/it-java-ruling-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/its/ruling"
72+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-checks/target/java-checks-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-checks"
73+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-checks-testkit/target/java-checks-testkit-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-checks-testkit"
74+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-frontend/target/java-frontend-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-frontend"
75+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-jsp/target/java-jsp-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-jsp"
76+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-surefire/target/java-surefire-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-surefire"
77+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/java-symbolic-execution/target/java-symbolic-execution-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/java-symbolic-execution"
78+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/jdt/target/jdt-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/jdt"
79+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "${SCRIPT_DIRECTORY}/sonar-java-plugin/target/sonar-java-plugin-${PROJECT_VERSION}.jar" -d "${SCRIPT_DIRECTORY}/sonar-java-plugin"
10080
}
10181

102-
get_wss_agent
103-
get_multi_module_agent
82+
get_unified_agent
10483
scan

0 commit comments

Comments
 (0)