feat: update tests and spdxjson to omit empty

Signed-off-by: Christopher Phillips <[email protected]>
anchore · Feb 5, 2025 · 64ff665 · 64ff665
1 parent 1b33456
commit 64ff665
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/cmd/syft/internal/commands/attest_test.go b/cmd/syft/internal/commands/attest_test.go
@@ -72,8 +72,7 @@ func Test_writeSBOMToFormattedFile(t *testing.T) {
  "distro": {},
  "descriptor": {
   "name": "syft-test",
-  "version": "non-version",
-  "supplier": ""
+  "version": "non-version"
  },
  "schema": {}
 }`,

diff --git a/syft/format/common/spdxhelpers/to_syft_model.go b/syft/format/common/spdxhelpers/to_syft_model.go
@@ -145,7 +145,7 @@ func containerSource(p *spdx.Package) source.Description {
 
 	supplier := ""
 	if p.PackageSupplier != nil {
-		// we also don't want NOASSERTION transfered to the syft format
+		// we also don't want NOASSERTION transferred to the syft format
 		// NOASSERTION == ""
 		if p.PackageSupplier.Supplier != helpers.NOASSERTION {
 			supplier = p.PackageSupplier.Supplier

diff --git a/syft/format/syftjson/model/document.go b/syft/format/syftjson/model/document.go
@@ -19,7 +19,7 @@ type Document struct {
 type Descriptor struct {
 	Name          string      `json:"name"`
 	Version       string      `json:"version"`
-	Supplier      string      `json:"supplier",omitempty`
+	Supplier      string      `json:"supplier,omitempty"`
 	Configuration interface{} `json:"configuration,omitempty"`
 }
 

diff --git a/syft/format/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden b/syft/format/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden
@@ -99,7 +99,6 @@
  "descriptor": {
   "name": "syft",
   "version": "v0.42.0-bogus",
-  "supplier": "",
   "configuration": {
    "config-key": "config-value"
   }

diff --git a/syft/format/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden b/syft/format/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden
@@ -199,7 +199,6 @@
  "descriptor": {
   "name": "syft",
   "version": "v0.42.0-bogus",
-  "supplier": "",
   "configuration": {
    "config-key": "config-value"
   }

diff --git a/syft/format/syftjson/test-fixtures/snapshot/TestImageEncoder.golden b/syft/format/syftjson/test-fixtures/snapshot/TestImageEncoder.golden
@@ -122,7 +122,6 @@
  "descriptor": {
   "name": "syft",
   "version": "v0.42.0-bogus",
-  "supplier": "",
   "configuration": {
    "config-key": "config-value"
   }