diff options
author | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 16:43:48 -0400 |
---|---|---|
committer | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 22:43:24 -0400 |
commit | 9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1 (patch) | |
tree | a43213aadfb9bde3d9ec15634a39305f19ff38b2 /builder/builder2v2/build_file.go | |
parent | 41d2272711255f5a25e16e3507ec3318bc550189 (diff) | |
download | spdx-tools-9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1.tar.gz |
replace all v2_1, v2_2 with new convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Diffstat (limited to 'builder/builder2v2/build_file.go')
-rw-r--r-- | builder/builder2v2/build_file.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go index efdd979..4e69f58 100644 --- a/builder/builder2v2/build_file.go +++ b/builder/builder2v2/build_file.go @@ -6,7 +6,8 @@ import ( "fmt" "path/filepath" - "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/spdx/common" + "github.com/spdx/tools-golang/spdx/v2_2" "github.com/spdx/tools-golang/utils" ) @@ -15,7 +16,7 @@ import ( // - filePath: path to file, relative to prefix // - prefix: relative directory for filePath // - fileNumber: integer index (unique within package) to use in identifier -func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.File2_2, error) { +func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*v2_2.File, error) { // build the full file path p := filepath.Join(prefix, filePath) @@ -29,20 +30,20 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx. i := fmt.Sprintf("File%d", fileNumber) // now build the File section - f := &spdx.File2_2{ + f := &v2_2.File{ FileName: filePath, - FileSPDXIdentifier: spdx.ElementID(i), - Checksums: []spdx.Checksum{ + FileSPDXIdentifier: common.ElementID(i), + Checksums: []common.Checksum{ { - Algorithm: spdx.SHA1, + Algorithm: common.SHA1, Value: ssha1, }, { - Algorithm: spdx.SHA256, + Algorithm: common.SHA256, Value: ssha256, }, { - Algorithm: spdx.MD5, + Algorithm: common.MD5, Value: smd5, }, }, |