fix MetadataType in artifacts

Signed-off-by: David Wertenteil <[email protected]>
kubescape · Apr 10, 2024 · 1a921cf · 1a921cf
1 parent d0ee88d
commit 1a921cf
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/pkg/apis/softwarecomposition/syfttypes.go b/pkg/apis/softwarecomposition/syfttypes.go
@@ -323,6 +323,7 @@ func unpackPkgMetadata(p *SyftPackage, unpacker packageMetadataUnpacker) error {
 			ty = "rust-cargo-audit-entry"
 		}
 	}
+	p.MetadataType = ty
 
 	typ := packagemetadata.ReflectTypeFromJSONName(ty)
 	if typ == nil {

diff --git a/pkg/apis/softwarecomposition/syfttypes_test.go b/pkg/apis/softwarecomposition/syfttypes_test.go
@@ -0,0 +1,41 @@
+package softwarecomposition
+
+import (
+	"testing"
+
+	_ "embed"
+
+	"github.com/stretchr/testify/assert"
+)
+
+//go:embed testdata/artifact.json
+var artifact []byte
+
+func TestUpdateSBOMSyft(t *testing.T) {
+	type args struct {
+		id           string
+		metadataType string
+	}
+	tests := []struct {
+		name    string
+		input   []byte
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "TestUpdateSBOMSyft",
+			input:   artifact,
+			args:    args{id: "8a49897e59f569c2", metadataType: "dpkg-db-entry"},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			c := SyftPackage{}
+			err := c.UnmarshalJSON(tt.input)
+			assert.NoError(t, err)
+			assert.Equal(t, c.ID, tt.args.id)
+			assert.Equal(t, c.MetadataType, tt.args.metadataType)
+		})
+	}
+}
diff --git a/pkg/apis/softwarecomposition/v1beta1/syfttypes.go b/pkg/apis/softwarecomposition/v1beta1/syfttypes.go
@@ -323,6 +323,7 @@ func unpackPkgMetadata(p *SyftPackage, unpacker packageMetadataUnpacker) error {
 			ty = "rust-cargo-audit-entry"
 		}
 	}
+	p.MetadataType = ty
 
 	typ := packagemetadata.ReflectTypeFromJSONName(ty)
 	if typ == nil {