Skip to content

The Unified and Autonomous Development Platform

feat: OSV Vulnerability Scanner step: option to publish scan report as build artifact (OD-2711)

Robin Shene6b4da061c7b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 4cf46b9afd..46e9d130f0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -2436,6 +2436,42 @@ public class BuildSpec implements Serializable, Validatable {
}
}
});
- }
+ }
+
+ @SuppressWarnings("unused")
+ private void migrate45(VersionedYamlDoc doc, Stack<Integer> versions) {
+ migrateSteps(doc, versions, stepsNode -> {
+ for (Node stepsNodeItem : stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ var tagValue = stepNode.getTag().getValue();
+ if (tagValue.equals("!FSScannerStep") || tagValue.equals("!ImageScannerStep")
+ || tagValue.equals("!RootFSScannerStep")) {
+ stepNode.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "publishJSONReportAsArtifact"),
+ new ScalarNode(Tag.BOOL, "false")));
+ } else if (tagValue.equals("!OsvSourceScannerStep")) {
+ stepNode.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "publishJSONReportAsArtifact"),
+ new ScalarNode(Tag.BOOL, "false")));
+ }
+ }
+ });
+ }
+
+ @SuppressWarnings("unused")
+ private void migrate46(VersionedYamlDoc doc, Stack<Integer> versions) {
+ migrateSteps(doc, versions, stepsNode -> {
+ for (Node stepsNodeItem : stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ var tagValue = stepNode.getTag().getValue();
+ if (tagValue.equals("!FSScannerStep") || tagValue.equals("!ImageScannerStep")
+ || tagValue.equals("!RootFSScannerStep")) {
+ stepNode.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "publishJSONReportAsArtifact"),
+ new ScalarNode(Tag.BOOL, "false")));
+ }
+ }
+ });
+ }
}
diff --git a/server-ee b/server-ee
index b5f0486c3d..58c26a1ad7 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit b5f0486c3d1405a9d0aff7196ccfe086fb26fa27
+Subproject commit 58c26a1ad7d23dd94c8f164e34160d2122e62cf5