Skip to content

Fix/aqua remote type list #1251

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
hrcornejo merged 6 commits into from
Dec 16, 2025
Merged

Fix/aqua remote type list #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e156c42
Manage 'remote' value with extra values
hrcornejo Dec 10, 2025
8447a7a
Updated CHANGELOG.md
hrcornejo Dec 10, 2025
dd58072
Fix Codenarc
hrcornejo Dec 10, 2025
18dbf4d
Fix missing NonCPS
hrcornejo Dec 16, 2025
f679044
Updated CHANGELOG.md
hrcornejo Dec 16, 2025
eb4941c
Merge branch 'master' into fix/aqua-remote-type-list
hrcornejo Dec 16, 2025
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Added

### Changed
* Manage 'remote' value of exploit_type in Aqua in case of several values ([#1247](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1247))
* Manage 'remote' value of exploit_type in Aqua in case of several values ([#1251](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1251))

### Fixed
* Log correct error message for wrong preview-branch value ([#1249](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1249))
Expand Down
2 changes: 2 additions & 0 deletions src/org/ods/component/ScanWithAquaStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.ods.component

import com.cloudbees.groovy.cps.NonCPS
import groovy.transform.TypeChecked
import groovy.transform.TypeCheckingMode
import org.apache.commons.lang3.StringUtils
Expand Down Expand Up @@ -418,6 +419,7 @@ class ScanWithAquaStage extends Stage {
}
}

@NonCPS
private List filterRemoteCriticalWithSolutionVulnerabilities(Map aquaJsonMap, Set whitelistedRECVs) {
List result = []
aquaJsonMap.resources.each { it ->
Expand Down