Add more repos to offline whitesource scan #1438
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Zelin Hao <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #1438 +/- ##
=========================================
Coverage 94.45% 94.45%
Complexity 11 11
=========================================
Files 140 140
Lines 3085 3085
Branches 10 10
=========================================
Hits 2914 2914
Misses 164 164
Partials 7 7 Continue to review full report at Codecov.
|
dblock
approved these changes
Jan 10, 2022
tools/vulnerability-scan/wss-scan.sh
Outdated
| @@ -23,7 +23,12 @@ set -e | |||
|
|
|||
| # Generate temporary `settings.gradle` file based on the name in `build.gradle` | |||
| function generate_settings_gradle() { | |||
| settings_gradle_content=`cat build.gradle | grep name | grep -i $repo | head -n 1 | sed 's/name/rootProject.name =/g' | awk '{$1=$1};1'` | |||
| repo_name=$1 | |||
| settings_gradle_content=`cat build.gradle | grep name | head -n 1 | grep -i ${repo_name:0:3} | sed 's/name/rootProject.name =/g' | awk '{$1=$1};1'` | |||
There was a problem hiding this comment.
After talking to @zelinh this grep grep -i ${repo_name:0:3} is purely to catch the name var in perftop repo.
Since perftop repo is using the name perf-top instead of perftop repo name in build.gradle.
The better way to solve this is to add settings.gradle to repositories that lack this file, so whitesource script does not need to put in temp fixes to run the scan.
Signed-off-by: Zelin Hao <[email protected]>
peternied
approved these changes
Jan 12, 2022
peterzhuamazon
pushed a commit
to peterzhuamazon/opensearch-build
that referenced
this pull request
Feb 16, 2022
* Add more repos to offline scan Signed-off-by: Zelin Hao <[email protected]> * Simply the way we generate temp settings gradle Signed-off-by: Zelin Hao <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Zelin Hao [email protected]
Description
Add
performance-analyzer-rcaandopensearch-buildrepos to the offline whitesource scan on Jenkins.Fix some issues for temporarily creating
settings.gradlewhich is needed for WhiteSource to run CVEs scan on repos that have that file missing.Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.