Merge pull request #273 from candrews/serialNumber

Set serialNumber when merging
CycloneDX · Oct 12, 2022 · 6ecb85e · 6ecb85e
2 parents eabd721 + 3ce25d2
commit 6ecb85e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/cyclonedx/Commands/MergeCommand.cs b/src/cyclonedx/Commands/MergeCommand.cs
@@ -102,6 +102,7 @@ public static async Task<int> Merge(MergeCommandOptions options)
             }
 
             outputBom.Version = 1;
+            outputBom.SerialNumber = "urn:uuid:" + System.Guid.NewGuid().ToString();
 
             if (!outputToConsole)
             {

diff --git a/tests/cyclonedx.tests/MergeTests.cs b/tests/cyclonedx.tests/MergeTests.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Xunit;
 using Snapshooter;
@@ -70,6 +71,8 @@ public async Task Merge(
 
                 Assert.Equal(0, exitCode);
                 var bom = File.ReadAllText(fullOutputPath);
+                bom = Regex.Replace(bom, @"\s*""serialNumber"": "".*?"",\r?\n", ""); // json
+                bom = Regex.Replace(bom, @"\s+serialNumber="".*?""", ""); // xml
                 Snapshot.Match(bom, SnapshotNameExtension.Create(hierarchical ? "Hierarchical" : "Flat", snapshotInputFilenames, inputFormat, outputFilename, outputFormat));
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 outputBom.Version = 1;
+                outputBom.SerialNumber = "urn:uuid:" + System.Guid.NewGuid().ToString();
                 if (!outputToConsole)
                 {
@@ Expand Down @@