Skip to content

Commit 90919d6

Browse files
1gtm1gtm
authored
[cherry-pick] Update dependencies (#1310) (#1320)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 71bf43c commit 90919d6

File tree

8 files changed

+29
-23
lines changed

8 files changed

+29
-23
lines changed

‎go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.15
55
require (
66
github.com/pkg/errors v0.9.1
77
github.com/spf13/cobra v1.1.3
8-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.5
8+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6
99
gomodules.xyz/flags v0.1.3
1010
gomodules.xyz/go-sh v0.1.0
1111
gomodules.xyz/logs v0.0.6
@@ -17,6 +17,7 @@ require (
1717
k8s.io/klog/v2 v2.8.0
1818
kmodules.xyz/client-go v0.0.0-20211122091731-6c471b24a4ea // indirect
1919
kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52
20+
kmodules.xyz/objectstore-api v0.0.0-20211116180107-8720be0c9bf7 // indirect
2021
kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41
2122
kubedb.dev/apimachinery v0.23.0
2223
stash.appscode.dev/apimachinery v0.16.0

‎go.sum

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -712,10 +712,10 @@ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPS
712712
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
713713
go.bytebuilders.dev/audit v0.0.10/go.mod h1:jhNyXHoeVHijC4tM7EYpcB9RqkwnI27IoRN3k0ivick=
714714
go.bytebuilders.dev/license-verifier v0.9.3/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
715-
go.bytebuilders.dev/license-verifier v0.9.5 h1:XUbFH3LzHSpQFtVS/MiT5RN0gr/KNNBvnOm78KYoAEQ=
716-
go.bytebuilders.dev/license-verifier v0.9.5/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
717-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.5 h1:KWzmh4qZ+3cR8LpBuUfufb2goK5NuULyE0uKYgt3D50=
718-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.5/go.mod h1:mg5pZDweHlpTTw57kOdLj4bU107hHVP/1xTKKZ1eUNc=
715+
go.bytebuilders.dev/license-verifier v0.9.6 h1:nT4Eplu0OQWM7Re81ZQibkYKeno6nDAwOzaz14Yvadc=
716+
go.bytebuilders.dev/license-verifier v0.9.6/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
717+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6 h1:QwiUgNug1pD4cwxLuSQmSLn1WvvNreKfBajdymoRmeM=
718+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6/go.mod h1:b1oIjrDuNN1T3d1ixnr020hi2i0sXlR7CIsWrhkzga4=
719719
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
720720
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
721721
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@@ -1155,8 +1155,9 @@ kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e/go.mod h1:pGabe
11551155
kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52 h1:UWVpU7y5znTUusU+JhPB+ojh26f6K2v8sNb37U1DolQ=
11561156
kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52/go.mod h1:yHLFe4wVYxepTnN00CFUf29xH+jEHDokq6d2fbp9pks=
11571157
kmodules.xyz/monitoring-agent-api v0.0.0-20210928135619-38ca075a2dbd/go.mod h1:08pBqfEuy29EjhaMrHB2XFy2iekoFi7AjaXcJS+xAck=
1158-
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e h1:2QZBUcUI6r7mLU5/9+Xxd1eDClEIEkZkJlyCU91UoY8=
11591158
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8=
1159+
kmodules.xyz/objectstore-api v0.0.0-20211116180107-8720be0c9bf7 h1:JIAEFjN3GDhLEG1Fh1zYpy/QFyyN337mJTM+ODEGosg=
1160+
kmodules.xyz/objectstore-api v0.0.0-20211116180107-8720be0c9bf7/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=
11601161
kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns=
11611162
kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41 h1:GCDyb1fbgCHUNuFk9MecSFvzMq/WCeGk8pDEtqivziA=
11621163
kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41/go.mod h1:sJYyxf84ZvbVz4SivxMgSelGRYn19wOLUtObiEncCxk=

‎vendor/go.bytebuilders.dev/license-verifier/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) windows/amd64 darwin/amd64
6161
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
6262
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6363

64-
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian10
65-
BASEIMAGE_DBG ?= debian:buster
64+
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
65+
BASEIMAGE_DBG ?= debian:bullseye
6666

6767
GO_VERSION ?= 1.17
6868
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)

‎vendor/go.bytebuilders.dev/license-verifier/info/lib.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"net/url"
2121
"path"
2222
"strconv"
23+
"strings"
24+
"unicode"
2325
)
2426

2527
var (
@@ -37,6 +39,12 @@ var (
3739
registrationAPIPath = "api/v1/register"
3840
)
3941

42+
func Features() []string {
43+
return strings.FieldsFunc(ProductName, func(r rune) bool {
44+
return unicode.IsSpace(r) || r == ',' || r == ';'
45+
})
46+
}
47+
4048
func SkipLicenseVerification() bool {
4149
v, _ := strconv.ParseBool(EnforceLicense)
4250
return !v

‎vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.16
44

55
require (
66
github.com/gogo/protobuf v1.3.2
7-
go.bytebuilders.dev/license-verifier v0.9.5
7+
go.bytebuilders.dev/license-verifier v0.9.6
88
k8s.io/api v0.21.1
99
k8s.io/apimachinery v0.21.1
1010
k8s.io/apiserver v0.21.1

‎vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func NewLicenseEnforcer(config *rest.Config, licenseFile string) *LicenseEnforce
7474
config: config,
7575
opts: &verifier.Options{
7676
CACert: []byte(info.LicenseCA),
77-
Features: info.ProductName,
77+
Features: info.Features(),
7878
},
7979
}
8080
}
@@ -227,7 +227,7 @@ func VerifyLicensePeriodically(config *rest.Config, licenseFile string, stopCh <
227227
config: config,
228228
opts: &verifier.Options{
229229
CACert: []byte(info.LicenseCA),
230-
Features: info.ProductName,
230+
Features: info.Features(),
231231
},
232232
}
233233

@@ -286,7 +286,7 @@ func CheckLicenseFile(config *rest.Config, licenseFile string) error {
286286
config: config,
287287
opts: &verifier.Options{
288288
CACert: []byte(info.LicenseCA),
289-
Features: info.ProductName,
289+
Features: info.Features(),
290290
},
291291
}
292292

‎vendor/go.bytebuilders.dev/license-verifier/lib.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import (
2020
"crypto/x509"
2121
"encoding/pem"
2222
"fmt"
23-
"strings"
24-
"unicode"
25-
2623
"go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1"
24+
"strings"
2725

2826
"github.com/pkg/errors"
2927
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,7 +30,7 @@ import (
3230

3331
type Options struct {
3432
ClusterUID string `json:"clusterUID"`
35-
Features string `json:"features"`
33+
Features []string `json:"features"`
3634
CACert []byte `json:"caCert,omitempty"`
3735
License []byte `json:"license"`
3836
}
@@ -165,10 +163,7 @@ func VerifyLicense(opts *Options) (v1alpha1.License, error) {
165163
license.Reason = e2.Error()
166164
return license, e2
167165
}
168-
features := strings.FieldsFunc(opts.Features, func(r rune) bool {
169-
return unicode.IsSpace(r) || r == ',' || r == ';'
170-
})
171-
if !sets.NewString(cert.Subject.Organization...).HasAny(features...) {
166+
if !sets.NewString(cert.Subject.Organization...).HasAny(opts.Features...) {
172167
e2 := fmt.Errorf("license was not issued for %s", opts.Features)
173168
license.Status = v1alpha1.LicenseExpired
174169
license.Reason = e2.Error()

‎vendor/modules.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ github.com/yudai/gojsondiff
123123
github.com/yudai/gojsondiff/formatter
124124
# github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
125125
github.com/yudai/golcs
126-
# go.bytebuilders.dev/license-verifier v0.9.5
126+
# go.bytebuilders.dev/license-verifier v0.9.6
127127
go.bytebuilders.dev/license-verifier
128128
go.bytebuilders.dev/license-verifier/apis/licenses
129129
go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1
130130
go.bytebuilders.dev/license-verifier/info
131-
# go.bytebuilders.dev/license-verifier/kubernetes v0.9.5
131+
# go.bytebuilders.dev/license-verifier/kubernetes v0.9.6
132132
## explicit
133133
go.bytebuilders.dev/license-verifier/kubernetes
134134
# golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
@@ -555,7 +555,8 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph
555555
kmodules.xyz/custom-resources/client/clientset/versioned/typed/auditor/v1alpha1
556556
kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1
557557
kmodules.xyz/custom-resources/crds
558-
# kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e
558+
# kmodules.xyz/objectstore-api v0.0.0-20211116180107-8720be0c9bf7
559+
## explicit
559560
kmodules.xyz/objectstore-api/api/v1
560561
# kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41
561562
## explicit

0 commit comments

Comments
 (0)