Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trim license patch from version tag, bump list to v3.24.0 #462

Merged
merged 3 commits into from
Jul 27, 2024
Merged

Trim license patch from version tag, bump list to v3.24.0 #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b696406
go.mod: Pull github.com/blang/semver/v4
puerco Jul 27, 2024
5fb56cb
Trim license list patch version from SPDX document
puerco Jul 27, 2024
100e4ab
Bump SPDX license list to 3.24.0
puerco Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module sigs.k8s.io/bom
go 1.22

require (
github.com/blang/semver/v4 v4.0.0
github.com/glebarez/go-sqlite v1.22.0
github.com/go-git/go-git/v5 v5.12.0
github.com/google/go-containerregistry v0.19.1
Expand All @@ -27,7 +28,6 @@ require (
github.com/MakeNowJust/heredoc/v2 v2.0.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/license/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type CatalogOptions struct {
//
// DO NOT RENAME OR MOVE THIS OPTION WITHOUT MODIFYING THE MAGEFILE
var DefaultCatalogOpts = CatalogOptions{
Version: "v3.23",
Version: "v3.24.0",
}

// NewCatalogWithOptions returns a SPDX object with the specified options
Expand Down
Binary file removed pkg/license/data/license-list-v3.23.zip
View file
Open in desktop
Binary file not shown.
Binary file added pkg/license/data/license-list-v3.24.0.zip
View file
Open in desktop
Binary file not shown.
14 changes: 12 additions & 2 deletions pkg/spdx/builder_implementation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"path/filepath"
"strings"

"github.com/blang/semver/v4"
"github.com/google/uuid"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
Expand Down Expand Up @@ -54,11 +55,20 @@ func (builder *defaultDocBuilderImpl) CreateDocument(genopts *DocGenerateOptions
// Create the new document
doc := NewDocument()
doc.Name = genopts.Name
doc.LicenseListVersion = strings.TrimPrefix(license.DefaultCatalogOpts.Version, "v")
// Use the license list from the embedded catalog
ver := strings.TrimPrefix(license.DefaultCatalogOpts.Version, "v")
// ... unless there was one sepcified in the options
if genopts.LicenseListVersion != "" {
doc.LicenseListVersion = strings.TrimPrefix(genopts.LicenseListVersion, "v")
ver = strings.TrimPrefix(genopts.LicenseListVersion, "v")
}

// Trim the patch part of the license version
v, err := semver.New(ver)
if err != nil {
return nil, fmt.Errorf("parsing license list semver string %q: %w", ver, err)
}
doc.LicenseListVersion = fmt.Sprintf("%d.%d", v.Major, v.Minor)

// If we do not have a namespace, we generate one under the public SPDX
// URL as defined in the spec.
// (ref https://spdx.github.io/spdx-spec/document-creation-information/#65-spdx-document-namespace-field)
Expand Down
Loading