[SBOMER-108] - Fix the changed location of the final SBOM generated f…

…or ZIP manifests; fix the generation of multiple deliverable analysis manifests
project-ncl · Jul 29, 2024 · f8983d7 · f8983d7
1 parent 20c9463
commit f8983d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...ain/java/org/jboss/sbomer/cli/feature/sbom/command/CycloneDxGenerateOperationCommand.java b/...ain/java/org/jboss/sbomer/cli/feature/sbom/command/CycloneDxGenerateOperationCommand.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -256,9 +257,15 @@ protected Path doGenerate() {
             parent.addDependency(dependency);
         }
 
-        Path sbomDirPath = Path.of(parent.getWorkdir().toAbsolutePath().toString(), "bom.json");
+        Path sbomDirPath = Path.of(
+                parent.getWorkdir().toAbsolutePath().toString(),
+                String.valueOf(getParent().getIndex()),
+                "bom.json");
 
         try {
+            // Create all non-existent parent directories
+            Files.createDirectories(sbomDirPath.getParent());
+
             ObjectMapperProvider.json()
                     .writerWithDefaultPrettyPrinter()
                     .writeValue(sbomDirPath.toFile(), toJsonNode(bom));

diff --git a/...rc/main/java/org/jboss/sbomer/cli/feature/sbom/command/auto/GenerateOperationCommand.java b/...rc/main/java/org/jboss/sbomer/cli/feature/sbom/command/auto/GenerateOperationCommand.java
@@ -177,7 +177,7 @@ private void generateDeliverableSbom(OperationConfig config, int i) {
         command.add(configPath.toAbsolutePath().toString());
 
         command.add("--index");
-        command.add(String.valueOf(index));
+        command.add(String.valueOf(i));
 
         command.add("--workdir");
         command.add(workdir.toAbsolutePath().toString());

diff --git a/...c/main/java/org/jboss/sbomer/service/feature/sbom/k8s/reconciler/OperationController.java b/...c/main/java/org/jboss/sbomer/service/feature/sbom/k8s/reconciler/OperationController.java
@@ -553,8 +553,8 @@ protected List<Sbom> storeOperationSboms(GenerationRequest generationRequest) {
             Path sbomPath = Path.of(
                     controllerConfig.sbomDir(),
                     generationRequest.getMetadata().getName(),
-                    generationRequest.getMetadata().getName() + "-" + SbomGenerationPhase.OPERATIONGENERATE.ordinal()
-                            + "-" + SbomGenerationPhase.OPERATIONGENERATE.name().toLowerCase() + "-" + i,
+                    SbomGenerationPhase.GENERATE.name().toLowerCase(),
+                    String.valueOf(i),
                     "bom.json");
 
             // Read the generated SBOM JSON file