diff --git a/go.mod b/go.mod index 428a98bb6..cda25bbad 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.0 require ( github.com/spf13/cobra v1.8.0 - go.bytebuilders.dev/license-verifier/kubernetes v0.14.4 + go.bytebuilders.dev/license-verifier/kubernetes v0.14.6 gomodules.xyz/flags v0.1.3 gomodules.xyz/go-sh v0.1.0 gomodules.xyz/logs v0.0.7 @@ -18,12 +18,12 @@ require ( kmodules.xyz/client-go v0.30.44 kmodules.xyz/custom-resources v0.30.0 kmodules.xyz/offshoot-api v0.30.1 - stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04 + stash.appscode.dev/apimachinery v0.39.0 ) require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/Masterminds/semver/v3 v3.3.0 // indirect github.com/PuerkitoBio/purell v1.2.1 // indirect github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -77,8 +77,8 @@ require ( github.com/yudai/gojsondiff v1.0.0 // indirect github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.bytebuilders.dev/license-proxyserver v0.0.19 // indirect - go.bytebuilders.dev/license-verifier v0.14.4 // indirect + go.bytebuilders.dev/license-proxyserver v0.0.20 // indirect + go.bytebuilders.dev/license-verifier v0.14.6 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect diff --git a/go.sum b/go.sum index a19ffe98d..e6e3982cc 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= -github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9N28= github.com/PuerkitoBio/purell v1.2.1/go.mod h1:ZwHcC/82TOaovDi//J/804umJFFmbOHPngi8iYYv/Eo= @@ -314,12 +314,12 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.bytebuilders.dev/license-proxyserver v0.0.19 h1:mY7zPDN0JCw2a1UajOuQUQKQKjjm5KBx2CbkT/+a1N8= -go.bytebuilders.dev/license-proxyserver v0.0.19/go.mod h1:B3Ig2Fo1qUollSV9GgfyFK8tXBI0RmUSpP1KFMZ2N7Q= -go.bytebuilders.dev/license-verifier v0.14.4 h1:JwTGQFew4nudwv8Pk3BdfQRts8KfgUQ5xhu138w1wt4= -go.bytebuilders.dev/license-verifier v0.14.4/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs= -go.bytebuilders.dev/license-verifier/kubernetes v0.14.4 h1:NeHq6SuVhRIVaMW2kSXdr8DcuUOg2jVL9rsODIQp9Fc= -go.bytebuilders.dev/license-verifier/kubernetes v0.14.4/go.mod h1:1C7SaOJShC60mIXP1hXBaDWGpb0hrHQ4p4nUEvI6YQY= +go.bytebuilders.dev/license-proxyserver v0.0.20 h1:gzRSwUmX/LSwPVE6T9oy5RLIutU1EeI7hmS+QGsYBY4= +go.bytebuilders.dev/license-proxyserver v0.0.20/go.mod h1:2PJmjMCXncVyeP3fIVQ+hwZnuhmWSTmbcuEMBrFKIac= +go.bytebuilders.dev/license-verifier v0.14.6 h1:0iHYGURUbx8toiXvFKftn/qMpeHzqHbAgEnEzOCNLvo= +go.bytebuilders.dev/license-verifier v0.14.6/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs= +go.bytebuilders.dev/license-verifier/kubernetes v0.14.6 h1:NxmASX0A3lu+ABd4zuT5Ib+I63y3j5uJxmlUFEGxqWg= +go.bytebuilders.dev/license-verifier/kubernetes v0.14.6/go.mod h1:N5QxsJF4EGLduOsTsW9gGfRuuMvN33T8pg5Y9NfKzuo= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -554,5 +554,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= -stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04 h1:NtQeear5dlS9PM6LoPVlfqRflavGvODoxa65RnI+w5Y= -stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04/go.mod h1:HoMcNxSg7TUHEhbHE+JvdhICrXoEKRvfLuFBKAM40ng= +stash.appscode.dev/apimachinery v0.39.0 h1:jUYOFmpFgKhtsEbtmamlSgQTQ01boUzkv+25iAXzK5I= +stash.appscode.dev/apimachinery v0.39.0/go.mod h1:6z4oQvMMBPyybs8uajBsrgO2ZK98ulB0CKGwfeuav+4= diff --git a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md b/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md index f12626423..f95a504fe 100644 --- a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md +++ b/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## 3.3.0 (2024-08-27) + +### Added + +- #238: Add LessThanEqual and GreaterThanEqual functions (thanks @grosser) +- #213: nil version equality checking (thanks @KnutZuidema) + +### Changed + +- #241: Simplify StrictNewVersion parsing (thanks @grosser) +- Testing support up through Go 1.23 +- Minimum version set to 1.21 as this is what's tested now +- Fuzz testing now supports caching + +## 3.2.1 (2023-04-10) + +### Changed + +- #198: Improved testing around pre-release names +- #200: Improved code scanning with addition of CodeQL +- #201: Testing now includes Go 1.20. Go 1.17 has been dropped +- #202: Migrated Fuzz testing to Go built-in Fuzzing. CI runs daily +- #203: Docs updated for security details + +### Fixed + +- #199: Fixed issue with range transformations + ## 3.2.0 (2022-11-28) ### Added diff --git a/vendor/github.com/Masterminds/semver/v3/Makefile b/vendor/github.com/Masterminds/semver/v3/Makefile index 0e7b5c713..9ca87a2c7 100644 --- a/vendor/github.com/Masterminds/semver/v3/Makefile +++ b/vendor/github.com/Masterminds/semver/v3/Makefile @@ -19,6 +19,7 @@ test-cover: .PHONY: fuzz fuzz: @echo "==> Running Fuzz Tests" + go env GOCACHE go test -fuzz=FuzzNewVersion -fuzztime=15s . go test -fuzz=FuzzStrictNewVersion -fuzztime=15s . go test -fuzz=FuzzNewConstraint -fuzztime=15s . @@ -27,4 +28,4 @@ $(GOLANGCI_LINT): # Install golangci-lint. The configuration for it is in the .golangci.yml # file in the root of the repository echo ${GOPATH} - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.17.1 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.56.2 diff --git a/vendor/github.com/Masterminds/semver/v3/README.md b/vendor/github.com/Masterminds/semver/v3/README.md index eab8cac3b..ed5693608 100644 --- a/vendor/github.com/Masterminds/semver/v3/README.md +++ b/vendor/github.com/Masterminds/semver/v3/README.md @@ -13,12 +13,9 @@ Active](https://masterminds.github.io/stability/active.svg)](https://masterminds [![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/github.com/Masterminds/semver/v3) [![Go Report Card](https://goreportcard.com/badge/github.com/Masterminds/semver)](https://goreportcard.com/report/github.com/Masterminds/semver) -If you are looking for a command line tool for version comparisons please see -[vert](https://github.com/Masterminds/vert) which uses this library. - ## Package Versions -Note, import `github.com/github.com/Masterminds/semver/v3` to use the latest version. +Note, import `github.com/Masterminds/semver/v3` to use the latest version. There are three major versions fo the `semver` package. @@ -80,12 +77,12 @@ There are two methods for comparing versions. One uses comparison methods on differences to notes between these two methods of comparison. 1. When two versions are compared using functions such as `Compare`, `LessThan`, - and others it will follow the specification and always include prereleases + and others it will follow the specification and always include pre-releases within the comparison. It will provide an answer that is valid with the comparison section of the spec at https://semver.org/#spec-item-11 2. When constraint checking is used for checks or validation it will follow a different set of rules that are common for ranges with tools like npm/js - and Rust/Cargo. This includes considering prereleases to be invalid if the + and Rust/Cargo. This includes considering pre-releases to be invalid if the ranges does not include one. If you want to have it include pre-releases a simple solution is to include `-0` in your range. 3. Constraint ranges can have some complex rules including the shorthand use of @@ -113,7 +110,7 @@ v, err := semver.NewVersion("1.3") if err != nil { // Handle version not being parsable. } -// Check if the version meets the constraints. The a variable will be true. +// Check if the version meets the constraints. The variable a will be true. a := c.Check(v) ``` @@ -137,20 +134,20 @@ The basic comparisons are: ### Working With Prerelease Versions Pre-releases, for those not familiar with them, are used for software releases -prior to stable or generally available releases. Examples of prereleases include -development, alpha, beta, and release candidate releases. A prerelease may be +prior to stable or generally available releases. Examples of pre-releases include +development, alpha, beta, and release candidate releases. A pre-release may be a version such as `1.2.3-beta.1` while the stable release would be `1.2.3`. In the -order of precedence, prereleases come before their associated releases. In this +order of precedence, pre-releases come before their associated releases. In this example `1.2.3-beta.1 < 1.2.3`. -According to the Semantic Version specification prereleases may not be +According to the Semantic Version specification, pre-releases may not be API compliant with their release counterpart. It says, > A pre-release version indicates that the version is unstable and might not satisfy the intended compatibility requirements as denoted by its associated normal version. -SemVer comparisons using constraints without a prerelease comparator will skip -prerelease versions. For example, `>=1.2.3` will skip prereleases when looking -at a list of releases while `>=1.2.3-0` will evaluate and find prereleases. +SemVer's comparisons using constraints without a pre-release comparator will skip +pre-release versions. For example, `>=1.2.3` will skip pre-releases when looking +at a list of releases while `>=1.2.3-0` will evaluate and find pre-releases. The reason for the `0` as a pre-release version in the example comparison is because pre-releases can only contain ASCII alphanumerics and hyphens (along with @@ -171,6 +168,9 @@ These look like: * `1.2 - 1.4.5` which is equivalent to `>= 1.2 <= 1.4.5` * `2.3.4 - 4.5` which is equivalent to `>= 2.3.4 <= 4.5` +Note that `1.2-1.4.5` without whitespace is parsed completely differently; it's +parsed as a single constraint `1.2.0` with _prerelease_ `1.4.5`. + ### Wildcards In Comparisons The `x`, `X`, and `*` characters can be used as a wildcard character. This works diff --git a/vendor/github.com/Masterminds/semver/v3/version.go b/vendor/github.com/Masterminds/semver/v3/version.go index 7c4bed334..ff499fb66 100644 --- a/vendor/github.com/Masterminds/semver/v3/version.go +++ b/vendor/github.com/Masterminds/semver/v3/version.go @@ -83,22 +83,23 @@ func StrictNewVersion(v string) (*Version, error) { original: v, } - // check for prerelease or build metadata - var extra []string - if strings.ContainsAny(parts[2], "-+") { - // Start with the build metadata first as it needs to be on the right - extra = strings.SplitN(parts[2], "+", 2) - if len(extra) > 1 { - // build metadata found - sv.metadata = extra[1] - parts[2] = extra[0] + // Extract build metadata + if strings.Contains(parts[2], "+") { + extra := strings.SplitN(parts[2], "+", 2) + sv.metadata = extra[1] + parts[2] = extra[0] + if err := validateMetadata(sv.metadata); err != nil { + return nil, err } + } - extra = strings.SplitN(parts[2], "-", 2) - if len(extra) > 1 { - // prerelease found - sv.pre = extra[1] - parts[2] = extra[0] + // Extract build prerelease + if strings.Contains(parts[2], "-") { + extra := strings.SplitN(parts[2], "-", 2) + sv.pre = extra[1] + parts[2] = extra[0] + if err := validatePrerelease(sv.pre); err != nil { + return nil, err } } @@ -114,7 +115,7 @@ func StrictNewVersion(v string) (*Version, error) { } } - // Extract the major, minor, and patch elements onto the returned Version + // Extract major, minor, and patch var err error sv.major, err = strconv.ParseUint(parts[0], 10, 64) if err != nil { @@ -131,23 +132,6 @@ func StrictNewVersion(v string) (*Version, error) { return nil, err } - // No prerelease or build metadata found so returning now as a fastpath. - if sv.pre == "" && sv.metadata == "" { - return sv, nil - } - - if sv.pre != "" { - if err = validatePrerelease(sv.pre); err != nil { - return nil, err - } - } - - if sv.metadata != "" { - if err = validateMetadata(sv.metadata); err != nil { - return nil, err - } - } - return sv, nil } @@ -381,15 +365,31 @@ func (v *Version) LessThan(o *Version) bool { return v.Compare(o) < 0 } +// LessThanEqual tests if one version is less or equal than another one. +func (v *Version) LessThanEqual(o *Version) bool { + return v.Compare(o) <= 0 +} + // GreaterThan tests if one version is greater than another one. func (v *Version) GreaterThan(o *Version) bool { return v.Compare(o) > 0 } +// GreaterThanEqual tests if one version is greater or equal than another one. +func (v *Version) GreaterThanEqual(o *Version) bool { + return v.Compare(o) >= 0 +} + // Equal tests if two versions are equal to each other. // Note, versions can be equal with different metadata since metadata // is not considered part of the comparable version. func (v *Version) Equal(o *Version) bool { + if v == o { + return true + } + if v == nil || o == nil { + return false + } return v.Compare(o) == 0 } diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go index 0221b461b..0be4d2a6b 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go @@ -17,7 +17,11 @@ limitations under the License. package v1alpha1 func (l License) DisableAnalytics() bool { - return len(l.FeatureFlags) > 0 && l.FeatureFlags["DisableAnalytics"] == "true" + return len(l.FeatureFlags) > 0 && l.FeatureFlags[FeatureDisableAnalytics] == "true" +} + +func (l License) EnableClientBilling() bool { + return len(l.FeatureFlags) > 0 && l.FeatureFlags[FeatureEnableClientBilling] == "true" } func (i *License) Less(j *License) bool { diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go index eb8d56217..bb8adf577 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go @@ -17,7 +17,11 @@ limitations under the License. package v1alpha1 import ( + "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/sets" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -26,20 +30,20 @@ import ( type License struct { metav1.TypeMeta `json:",inline,omitempty"` - Data []byte `json:"-"` - Issuer string `json:"issuer,omitempty"` // byte.builders - ProductLine string `json:"productLine,omitempty"` - TierName string `json:"tierName,omitempty"` - PlanName string `json:"planName,omitempty"` - Features []string `json:"features,omitempty"` - FeatureFlags map[string]string `json:"featureFlags,omitempty"` - Clusters []string `json:"clusters,omitempty"` // cluster_id ? - User *User `json:"user,omitempty"` - NotBefore *metav1.Time `json:"notBefore,omitempty"` // start of subscription start - NotAfter *metav1.Time `json:"notAfter,omitempty"` // if set, use this - ID string `json:"id,omitempty"` // license ID - Status LicenseStatus `json:"status"` - Reason string `json:"reason"` + Data []byte `json:"-"` + Issuer string `json:"issuer,omitempty"` // byte.builders + ProductLine string `json:"productLine,omitempty"` + TierName string `json:"tierName,omitempty"` + PlanName string `json:"planName,omitempty"` + Features []string `json:"features,omitempty"` + FeatureFlags FeatureFlags `json:"featureFlags,omitempty"` + Clusters []string `json:"clusters,omitempty"` // cluster_id ? + User *User `json:"user,omitempty"` + NotBefore *metav1.Time `json:"notBefore,omitempty"` // start of subscription start + NotAfter *metav1.Time `json:"notAfter,omitempty"` // if set, use this + ID string `json:"id,omitempty"` // license ID + Status LicenseStatus `json:"status"` + Reason string `json:"reason"` } type User struct { @@ -62,3 +66,36 @@ type Contract struct { StartTimestamp metav1.Time `json:"startTimestamp"` ExpiryTimestamp metav1.Time `json:"expiryTimestamp"` } + +type FeatureFlag string + +const ( + FeatureDisableAnalytics FeatureFlag = "DisableAnalytics" + FeatureRestrictions FeatureFlag = "Restrictions" + FeatureEnableClientBilling FeatureFlag = "EnableClientBilling" +) + +var knownFlags = sets.New[FeatureFlag](FeatureDisableAnalytics, FeatureRestrictions, FeatureEnableClientBilling) + +type FeatureFlags map[FeatureFlag]string + +func (f FeatureFlags) IsValid() error { + var errs []error + for k := range f { + if !knownFlags.Has(k) { + errs = append(errs, fmt.Errorf("unknown feature flag %q", k)) + } + } + return errors.NewAggregate(errs) +} + +func (f FeatureFlags) ToSlice() []string { + if len(f) == 0 { + return nil + } + result := make([]string, 0, len(f)) + for k, v := range f { + result = append(result, fmt.Sprintf("%s=%s", k, v)) + } + return result +} diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go index a191107c0..9ba4b716c 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go @@ -43,6 +43,28 @@ func (in *Contract) DeepCopy() *Contract { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in FeatureFlags) DeepCopyInto(out *FeatureFlags) { + { + in := &in + *out = make(FeatureFlags, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + return + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlags. +func (in FeatureFlags) DeepCopy() FeatureFlags { + if in == nil { + return nil + } + out := new(FeatureFlags) + in.DeepCopyInto(out) + return *out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *License) DeepCopyInto(out *License) { *out = *in @@ -59,7 +81,7 @@ func (in *License) DeepCopyInto(out *License) { } if in.FeatureFlags != nil { in, out := &in.FeatureFlags, &out.FeatureFlags - *out = make(map[string]string, len(*in)) + *out = make(FeatureFlags, len(*in)) for key, val := range *in { (*out)[key] = val } diff --git a/vendor/go.bytebuilders.dev/license-verifier/lib.go b/vendor/go.bytebuilders.dev/license-verifier/lib.go index 5f8c107ce..34c62fd3d 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/lib.go +++ b/vendor/go.bytebuilders.dev/license-verifier/lib.go @@ -115,11 +115,11 @@ func ParseLicense(opts ParserOptions) (v1alpha1.License, error) { license.TierName = parts[1] } } - license.FeatureFlags = map[string]string{} + license.FeatureFlags = v1alpha1.FeatureFlags{} for _, ff := range cert.Subject.Locality { parts := strings.SplitN(ff, "=", 2) if len(parts) == 2 { - license.FeatureFlags[parts[0]] = parts[1] + license.FeatureFlags[v1alpha1.FeatureFlag(parts[0])] = parts[1] } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4bfbf0a87..70162ec12 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,8 +2,8 @@ ## explicit; go 1.20 filippo.io/edwards25519 filippo.io/edwards25519/field -# github.com/Masterminds/semver/v3 v3.2.1 -## explicit; go 1.18 +# github.com/Masterminds/semver/v3 v3.3.0 +## explicit; go 1.21 github.com/Masterminds/semver/v3 # github.com/PuerkitoBio/purell v1.2.1 ## explicit; go 1.21 @@ -208,20 +208,20 @@ github.com/yudai/golcs # github.com/zeebo/xxh3 v1.0.2 ## explicit; go 1.17 github.com/zeebo/xxh3 -# go.bytebuilders.dev/license-proxyserver v0.0.19 +# go.bytebuilders.dev/license-proxyserver v0.0.20 ## explicit; go 1.22.0 go.bytebuilders.dev/license-proxyserver/apis/proxyserver go.bytebuilders.dev/license-proxyserver/apis/proxyserver/v1alpha1 go.bytebuilders.dev/license-proxyserver/client/clientset/versioned go.bytebuilders.dev/license-proxyserver/client/clientset/versioned/scheme go.bytebuilders.dev/license-proxyserver/client/clientset/versioned/typed/proxyserver/v1alpha1 -# go.bytebuilders.dev/license-verifier v0.14.4 +# go.bytebuilders.dev/license-verifier v0.14.6 ## explicit; go 1.21 go.bytebuilders.dev/license-verifier go.bytebuilders.dev/license-verifier/apis/licenses go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1 go.bytebuilders.dev/license-verifier/info -# go.bytebuilders.dev/license-verifier/kubernetes v0.14.4 +# go.bytebuilders.dev/license-verifier/kubernetes v0.14.6 ## explicit; go 1.22.0 go.bytebuilders.dev/license-verifier/kubernetes # golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 @@ -820,8 +820,8 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 -# stash.appscode.dev/apimachinery v0.38.1-0.20250114050236-cca8469a4c04 -## explicit; go 1.22.0 +# stash.appscode.dev/apimachinery v0.39.0 +## explicit; go 1.22.1 stash.appscode.dev/apimachinery/apis stash.appscode.dev/apimachinery/apis/repositories stash.appscode.dev/apimachinery/apis/repositories/v1alpha1 diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupbatch.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupbatch.go index 2c85e25f3..afcd0849b 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupbatch.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupbatch.go @@ -94,7 +94,6 @@ func TryUpdateBackupBatch(ctx context.Context, c cs.StashV1beta1Interface, meta klog.Errorf("Attempt %d failed to update BackupBatch %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update BackupBatch %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } @@ -148,7 +147,6 @@ func UpdateBackupBatchStatus( } return e2 == nil, nil }) - if err != nil { err = fmt.Errorf("failed to update status of BackupBatch %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupblueprint.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupblueprint.go index cb6b14d73..6ba792a53 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupblueprint.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupblueprint.go @@ -94,7 +94,6 @@ func TryUpdateBackupBlueprint(ctx context.Context, c cs.StashV1beta1Interface, m klog.Errorf("Attempt %d failed to update BackupBlueprint %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update BackupBlueprint %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupconfiguration.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupconfiguration.go index 508033b29..b925d5308 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupconfiguration.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupconfiguration.go @@ -94,7 +94,6 @@ func TryUpdateBackupConfiguration(ctx context.Context, c cs.StashV1beta1Interfac klog.Errorf("Attempt %d failed to update BackupConfiguration %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update BackupConfiguration %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } @@ -148,7 +147,6 @@ func UpdateBackupConfigurationStatus( } return e2 == nil, nil }) - if err != nil { err = fmt.Errorf("failed to update status of BackupConfiguration %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupsession.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupsession.go index 0364f7a2a..c547b8425 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupsession.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/backupsession.go @@ -94,7 +94,6 @@ func TryUpdateBackupSession(ctx context.Context, c cs.StashV1beta1Interface, met klog.Errorf("Attempt %d failed to update BackupSession %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update BackupSession %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } @@ -148,7 +147,6 @@ func UpdateBackupSessionStatus( } return e2 == nil, nil }) - if err != nil { err = fmt.Errorf("failed to update status of BackupSession %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/function.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/function.go index 2398e7ef4..06050c924 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/function.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/function.go @@ -94,7 +94,6 @@ func TryUpdateFunction(ctx context.Context, c cs.StashV1beta1Interface, meta met klog.Errorf("Attempt %d failed to update Function %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update Function %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restorebatch.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restorebatch.go index cc09c319b..4c32fe50f 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restorebatch.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restorebatch.go @@ -94,7 +94,6 @@ func TryUpdateRestoreBatch(ctx context.Context, c cs.StashV1beta1Interface, meta klog.Errorf("Attempt %d failed to update RestoreBatch %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update RestoreBatch %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } @@ -148,7 +147,6 @@ func UpdateRestoreBatchStatus( } return e2 == nil, nil }) - if err != nil { err = fmt.Errorf("failed to update status of RestoreBatch %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restoresession.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restoresession.go index d514555d7..ab547c4d6 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restoresession.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/restoresession.go @@ -94,7 +94,6 @@ func TryUpdateRestoreSession(ctx context.Context, c cs.StashV1beta1Interface, me klog.Errorf("Attempt %d failed to update RestoreSession %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update RestoreSession %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } @@ -148,7 +147,6 @@ func UpdateRestoreSessionStatus( } return e2 == nil, nil }) - if err != nil { err = fmt.Errorf("failed to update status of RestoreSession %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) } diff --git a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/task.go b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/task.go index ae45bbe56..a27d54914 100644 --- a/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/task.go +++ b/vendor/stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util/task.go @@ -94,7 +94,6 @@ func TryUpdateTask(ctx context.Context, c cs.StashV1beta1Interface, meta metav1. klog.Errorf("Attempt %d failed to update Task %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = fmt.Errorf("failed to update Task %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) }