chore: add version update during conversion

Signed-off-by: Keith Zantow <kzantow@gmail.com>
spdx · Jan 17, 2023 · eb63bc4 · eb63bc4
1 parent 11b0757
commit eb63bc4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/convert/spdx_document_conversion_test.go b/convert/spdx_document_conversion_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	converter "github.com/anchore/go-struct-converter"
+	"github.com/anchore/go-struct-converter"
 	"github.com/stretchr/testify/require"
 
 	"github.com/spdx/tools-golang/spdx"
@@ -25,6 +25,7 @@ func Test_ConvertSPDXDocuments(t *testing.T) {
 		{
 			name: "basic v2_2 to v2_3",
 			source: v2_2.Document{
+				SPDXVersion: v2_2.Version,
 				Packages: []*v2_2.Package{
 					{
 						PackageName: "Pkg 1",
@@ -47,6 +48,7 @@ func Test_ConvertSPDXDocuments(t *testing.T) {
 				},
 			},
 			expected: spdx.Document{
+				SPDXVersion: spdx.Version,
 				Packages: []*spdx.Package{
 					{
 						PackageName: "Pkg 1",
@@ -575,7 +577,7 @@ func Test_ConvertSPDXDocuments(t *testing.T) {
 				},
 			},
 			expected: spdx.Document{
-				SPDXVersion:       "SPDX-2.2", // TODO implement ConvertFrom to update this value
+				SPDXVersion:       "SPDX-2.3", // ConvertFrom updates this value
 				DataLicense:       "data license",
 				SPDXIdentifier:    "spdx id",
 				DocumentName:      "doc name",
@@ -1594,7 +1596,7 @@ func Test_ConvertSPDXDocuments(t *testing.T) {
 				},
 			},
 			expected: spdx.Document{
-				SPDXVersion:       "SPDX-2.2", // TODO implement ConvertFrom to update this value
+				SPDXVersion:       "SPDX-2.3", // ConvertFrom updates this value
 				DataLicense:       "data license",
 				SPDXIdentifier:    "spdx id",
 				DocumentName:      "doc name",

diff --git a/spdx/v2/v2_1/document.go b/spdx/v2/v2_1/document.go
@@ -4,6 +4,8 @@
 package v2_1
 
 import (
+	"github.com/anchore/go-struct-converter"
+
 	"github.com/spdx/tools-golang/spdx/v2/common"
 )
 
@@ -68,3 +70,10 @@ type Document struct {
 	// DEPRECATED in version 2.0 of spec
 	Reviews []*Review `json:"-"`
 }
+
+func (d *Document) ConvertFrom(_ interface{}) error {
+	d.SPDXVersion = Version
+	return nil
+}
+
+var _ converter.ConvertFrom = (*Document)(nil)
diff --git a/spdx/v2/v2_2/document.go b/spdx/v2/v2_2/document.go
@@ -4,6 +4,8 @@
 package v2_2
 
 import (
+	"github.com/anchore/go-struct-converter"
+
 	"github.com/spdx/tools-golang/spdx/v2/common"
 )
 
@@ -68,3 +70,10 @@ type Document struct {
 	// DEPRECATED in version 2.0 of spec
 	Reviews []*Review `json:"-"`
 }
+
+func (d *Document) ConvertFrom(_ interface{}) error {
+	d.SPDXVersion = Version
+	return nil
+}
+
+var _ converter.ConvertFrom = (*Document)(nil)
diff --git a/spdx/v2/v2_3/document.go b/spdx/v2/v2_3/document.go
@@ -4,6 +4,8 @@
 package v2_3
 
 import (
+	"github.com/anchore/go-struct-converter"
+
 	"github.com/spdx/tools-golang/spdx/v2/common"
 )
 
@@ -67,3 +69,10 @@ type Document struct {
 	// DEPRECATED in version 2.0 of spec
 	Reviews []*Review `json:"-" yaml:"-"`
 }
+
+func (d *Document) ConvertFrom(_ interface{}) error {
+	d.SPDXVersion = Version
+	return nil
+}
+
+var _ converter.ConvertFrom = (*Document)(nil)