Skip to content

The Unified and Autonomous Development Platform

feat: Upgrade OSV scanner step to use latest OSV scanner binary (OD-2678)

Robin Shenb8aeee25af12
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 258b962bc4..eede9d2cc4 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
@@ -2394,4 +2394,25 @@ public class BuildSpec implements Serializable, Validatable {
}
}
+ @SuppressWarnings("unused")
+ private void migrate44(VersionedYamlDoc doc, Stack<Integer> versions) {
+ migrateSteps(doc, versions, stepsNode -> {
+ for (var itStepNode = stepsNode.getValue().iterator(); itStepNode.hasNext();) {
+ MappingNode stepNode = (MappingNode) itStepNode.next();
+ for (var stepTuple: stepNode.getValue()) {
+ var keyNode = (ScalarNode) stepTuple.getKeyNode();
+ if (keyNode.getValue().equals("type")) {
+ var valueNode = (ScalarNode) stepTuple.getValueNode();
+ if (valueNode.getValue().equals("OsvVulnerScannerStep")) {
+ valueNode.setValue("OsvSourceScannerStep");
+ } else if (valueNode.getValue().equals("OsvLicenseScannerStep")) {
+ itStepNode.remove();
+ }
+ break;
+ }
+ }
+ }
+ });
+ }
+
}
diff --git a/server-ee b/server-ee
index 234e7ed4e9..a8a1dcddf9 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 234e7ed4e9ba1d17c5ff206d7db8b22ffac84030
+Subproject commit a8a1dcddf98c59fc2a58630538397769e879e23d