Skip to content

Commit cfb8d7a

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

2 files changed

Lines changed: 18 additions & 108 deletions

File tree

‎setup.txt‎

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

‎ws_scan.sh‎

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

33
readonly UNIFIED_AGENT_JAR="wss-unified-agent.jar"
4-
readonly UNIFIED_AGENT_JAR_MD5_CHECKSUM="F2EB843816A572904954052756EB66E7"
4+
readonly UNIFIED_AGENT_JAR_MD5_CHECKSUM="F2EB843816A572904954052756EB66E7" # MD5 hash for version 21.6.1
55
readonly UNIFIED_AGENT_JAR_URL="https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar"
66

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() {
7+
get_unified_agent() {
138
if [[ ! -f "${UNIFIED_AGENT_JAR}" ]]; then
149
curl \
1510
--location \
@@ -25,7 +20,9 @@ get_wss_agent() {
2520
# Verify JAR checksum
2621
local checksum="$(md5sum ${UNIFIED_AGENT_JAR} | cut --delimiter=" " --fields=1 | awk ' { print toupper($0) }')"
2722
if [[ "${checksum}" != "${UNIFIED_AGENT_JAR_MD5_CHECKSUM}" ]]; then
28-
echo -e "MD5 checksum mismatch.\nexpected: ${UNIFIED_AGENT_JAR_MD5_CHECKSUM}\ncomputed: ${checksum}" >&2
23+
echo "MD5 checksum mismatch." >&2
24+
echo "expected: ${UNIFIED_AGENT_JAR_MD5_CHECKSUM}" >&2
25+
echo "computed: ${checksum}" >&2
2926
exit 2
3027
fi
3128

@@ -36,33 +33,6 @@ get_wss_agent() {
3633
fi
3734
}
3835

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-
6636
local_maven_expression() {
6737
mvn -q -Dexec.executable="echo" -Dexec.args="\${${1}}" --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec
6838
}
@@ -92,13 +62,20 @@ scan() {
9262
fi
9363
export WS_PROJECTNAME="${WS_PRODUCTNAME} ${PROJECT_VERSION%.*}"
9464
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
65+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "docs/java-custom-rules-example/target/java-custom-rules-example-${PROJECT_VERSION}.jar" -d docs/java-custom-rules-example
66+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "external-reports/target/external-reports-${PROJECT_VERSION}.jar" -d external-reports
67+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "its/plugin/tests/target/it-java-plugin-tests-${PROJECT_VERSION}.jar" -d its/plugin/tests
68+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "its/plugin/plugins/java-extension-plugin/target/java-extension-plugin-${PROJECT_VERSION}.jar" -d its/plugin/plugins/java-extension-plugin
69+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "its/ruling/target/it-java-ruling-${PROJECT_VERSION}.jar" -d its/ruling
70+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-checks/target/java-checks-${PROJECT_VERSION}.jar" -d java-checks
71+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-checks-testkit/target/java-checks-testkit-${PROJECT_VERSION}.jar" -d java-checks-testkit
72+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-frontend/target/java-frontend-${PROJECT_VERSION}.jar" -d java-frontend
73+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-jsp/target/java-jsp-${PROJECT_VERSION}.jar" -d java-jsp
74+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-surefire/target/java-surefire-${PROJECT_VERSION}.jar" -d java-surefire
75+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "java-symbolic-execution/target/java-symbolic-execution-${PROJECT_VERSION}.jar" -d java-symbolic-execution
76+
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "jdt/target/jdt-${PROJECT_VERSION}.jar" -d jdt
9977
java -jar wss-unified-agent.jar -c whitesource.properties -appPath "sonar-java-plugin/target/sonar-java-plugin-${PROJECT_VERSION}.jar" -d sonar-java-plugin
10078
}
10179

102-
get_wss_agent
103-
get_multi_module_agent
80+
get_unified_agent
10481
scan

0 commit comments

Comments
 (0)