Skip to content

Commit b1a8455

Browse files
PulokSaha07061gtm
PulokSaha0706
authored and
1gtm
committed
Use golangci-lint 2.x (#290)
/cherry-pick Signed-off-by: Pulok Saha <puloksaha@appscode.com> Signed-off-by: PulokSaha0706 <puloksaha@appscode.com>
1 parent c5a2aae commit b1a8455

152 files changed

Lines changed: 15974 additions & 15479 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: "2"
2+
linters:
3+
default: standard
4+
enable:
5+
- unparam
6+
7+
formatters:
8+
enable:
9+
- gofmt
10+
- goimports
11+
settings:
12+
gofmt:
13+
rewrite-rules:
14+
- pattern: 'interface{}'
15+
replacement: 'any'
16+
17+
issues:
18+
max-same-issues: 100
19+
20+
exclude-files:
21+
- generated.*\\.go
22+
23+
exclude-dirs:
24+
- client
25+
- vendor
26+
27+
run:
28+
timeout: 10m

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ lint: $(BUILD_DIRS)
283283
--env GO111MODULE=on \
284284
--env GOFLAGS="-mod=vendor" \
285285
$(BUILD_IMAGE) \
286-
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=30m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
286+
golangci-lint run
287287

288288
$(BUILD_DIRS):
289289
@mkdir -p $@

‎go.mod‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module stash.appscode.dev/redis
22

3-
go 1.23.0
4-
5-
toolchain go1.24.4
3+
go 1.24.0
64

75
replace github.com/yannh/redis-dump-go => github.com/kubedb/redis-dump-go v0.8.1-ac
86

97
require (
108
github.com/mediocregopher/radix/v3 v3.8.1
119
github.com/spf13/cobra v1.8.0
1210
github.com/yannh/redis-dump-go v0.0.0-00010101000000-000000000000
13-
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6
11+
go.bytebuilders.dev/license-verifier/kubernetes v0.14.10
1412
gomodules.xyz/flags v0.1.3
1513
gomodules.xyz/go-sh v0.1.0
1614
gomodules.xyz/logs v0.0.7
@@ -19,11 +17,11 @@ require (
1917
k8s.io/apimachinery v0.30.2
2018
k8s.io/client-go v0.30.2
2119
k8s.io/klog/v2 v2.130.1
22-
kmodules.xyz/client-go v0.30.44
20+
kmodules.xyz/client-go v0.30.48
2321
kmodules.xyz/custom-resources v0.30.0
2422
kmodules.xyz/offshoot-api v0.30.1
2523
kubedb.dev/apimachinery v0.47.0
26-
stash.appscode.dev/apimachinery v0.42.0
24+
stash.appscode.dev/apimachinery v0.42.1-0.20251212070131-ba26c6b88bc6
2725
)
2826

2927
require (
@@ -83,17 +81,17 @@ require (
8381
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
8482
github.com/zeebo/xxh3 v1.0.2 // indirect
8583
go.bytebuilders.dev/license-proxyserver v0.0.20 // indirect
86-
go.bytebuilders.dev/license-verifier v0.14.6 // indirect
84+
go.bytebuilders.dev/license-verifier v0.14.10 // indirect
8785
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
88-
golang.org/x/net v0.38.0 // indirect
86+
golang.org/x/net v0.47.0 // indirect
8987
golang.org/x/oauth2 v0.27.0 // indirect
90-
golang.org/x/sys v0.31.0 // indirect
91-
golang.org/x/term v0.30.0 // indirect
92-
golang.org/x/text v0.23.0 // indirect
88+
golang.org/x/sys v0.38.0 // indirect
89+
golang.org/x/term v0.37.0 // indirect
90+
golang.org/x/text v0.31.0 // indirect
9391
golang.org/x/time v0.5.0 // indirect
9492
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
9593
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
96-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
94+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
9795
gomodules.xyz/mergo v0.3.13 // indirect
9896
gomodules.xyz/pointer v0.1.0 // indirect
9997
gomodules.xyz/sets v0.2.1 // indirect

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
320320
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
321321
go.bytebuilders.dev/license-proxyserver v0.0.20 h1:gzRSwUmX/LSwPVE6T9oy5RLIutU1EeI7hmS+QGsYBY4=
322322
go.bytebuilders.dev/license-proxyserver v0.0.20/go.mod h1:2PJmjMCXncVyeP3fIVQ+hwZnuhmWSTmbcuEMBrFKIac=
323-
go.bytebuilders.dev/license-verifier v0.14.6 h1:0iHYGURUbx8toiXvFKftn/qMpeHzqHbAgEnEzOCNLvo=
324-
go.bytebuilders.dev/license-verifier v0.14.6/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs=
325-
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6 h1:NxmASX0A3lu+ABd4zuT5Ib+I63y3j5uJxmlUFEGxqWg=
326-
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6/go.mod h1:N5QxsJF4EGLduOsTsW9gGfRuuMvN33T8pg5Y9NfKzuo=
323+
go.bytebuilders.dev/license-verifier v0.14.10 h1:K4VZjaoDXQde8QtL2kzpgk0jHw3W5CxFK9vh78RbDbQ=
324+
go.bytebuilders.dev/license-verifier v0.14.10/go.mod h1:+cr+kft45r9BbsmZ9D5MGK9CrOf0VL3kBuOd/MiahdA=
325+
go.bytebuilders.dev/license-verifier/kubernetes v0.14.10 h1:5L7ICdR4kkOVy8rb0tMrTR3wC/yGvam9DIQvKHo8yk8=
326+
go.bytebuilders.dev/license-verifier/kubernetes v0.14.10/go.mod h1:DXxySMXnkwJuGtzkPkY2nf3D5tBS9H6qrlQaCIQ5VPU=
327327
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
328328
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
329329
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -381,8 +381,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
381381
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
382382
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
383383
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
384-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
385-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
384+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
385+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
386386
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
387387
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
388388
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -410,16 +410,16 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
410410
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
411411
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
412412
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
413-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
414-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
415-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
416-
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
413+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
414+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
415+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
416+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
417417
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
418418
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
419419
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
420420
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
421-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
422-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
421+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
422+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
423423
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
424424
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
425425
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -444,8 +444,8 @@ golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtn
444444
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
445445
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
446446
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
447-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
448-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
447+
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
448+
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
449449
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
450450
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
451451
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -458,8 +458,8 @@ gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs=
458458
gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs=
459459
gomodules.xyz/go-sh v0.1.0 h1:1BJAuGREh2RhePt7HRrpmjnkbgfpXlCzc42SiyZ5dkc=
460460
gomodules.xyz/go-sh v0.1.0/go.mod h1:N8IrjNiYppUI/rxENYrWD6FOrSxSyEZnIekPEWM7LP0=
461-
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
462-
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
461+
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
462+
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
463463
gomodules.xyz/logs v0.0.7 h1:dkhpdQuzj+pOS3S7VaOq+JV7BVU7f68/k3uDYufhPow=
464464
gomodules.xyz/logs v0.0.7/go.mod h1:IEIZbRl9zua2jb35NU4KoqxUEDPmKvem3PhfRHqQI54=
465465
gomodules.xyz/mergo v0.3.13 h1:q6cL/MMXZH/MrR2+yjSihFFq6UifXqjwaqI48B6cMEM=
@@ -543,8 +543,8 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI
543543
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
544544
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
545545
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
546-
kmodules.xyz/client-go v0.30.44 h1:mLOBXQhvCIhdega9WoN4Px/usqobuKTT2vOPQcbGhXQ=
547-
kmodules.xyz/client-go v0.30.44/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
546+
kmodules.xyz/client-go v0.30.48 h1:TpDn03xq6xYATx+9kZ4PkiukIO1tgPrrip1UNq5QJlQ=
547+
kmodules.xyz/client-go v0.30.48/go.mod h1:8rqSBZeyAHatINE5VQNuIzbJJJbGSDZygAwFNyOXzP8=
548548
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
549549
kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
550550
kmodules.xyz/objectstore-api v0.29.1 h1:uUsjf8KU0w4LYowSEOnl0AbHT3hsHIu1wNLHqGe1o6s=
@@ -562,5 +562,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
562562
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
563563
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
564564
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
565-
stash.appscode.dev/apimachinery v0.42.0 h1:tqGAhAbII/WoYxM4LyQW+Hc6jgjRgBYUcI3AORwBLYs=
566-
stash.appscode.dev/apimachinery v0.42.0/go.mod h1:Q7iqhJAS0n7IV545NxaYNE5C31bBrWklZj7SfjOyryc=
565+
stash.appscode.dev/apimachinery v0.42.1-0.20251212070131-ba26c6b88bc6 h1:8c7pW5uSstbnW6eOd/UXeHd5HIHeFzZZ2Ehc4pwxlIM=
566+
stash.appscode.dev/apimachinery v0.42.1-0.20251212070131-ba26c6b88bc6/go.mod h1:XZiXo8eKlbOJ61CmA/zaW99IHE5YVsEg4QxSziMDCQ0=

‎lintconf.yaml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎pkg/restore.go‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/client-go/kubernetes"
3737
"k8s.io/client-go/tools/clientcmd"
38+
"k8s.io/klog/v2"
3839
appcatalog "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
3940
appcatalog_cs "kmodules.xyz/custom-resources/client/clientset/versioned"
4041
v1 "kmodules.xyz/offshoot-api/api/v1"
@@ -291,7 +292,13 @@ func (opt *redisOptions) restoreRedis(targetRef api_v1beta1.TargetRef) (*restic.
291292
} else {
292293
afterKeys += size
293294
}
294-
client.Close()
295+
296+
func() {
297+
if err := client.Close(); err != nil {
298+
klog.Errorf("Error closing radix client: %v", err)
299+
}
300+
}()
301+
295302
}
296303
}
297304

@@ -300,7 +307,12 @@ func (opt *redisOptions) restoreRedis(targetRef api_v1beta1.TargetRef) (*restic.
300307
if err != nil {
301308
return nil, err
302309
}
303-
defer client.Close()
310+
311+
defer func() {
312+
if err := client.Close(); err != nil {
313+
klog.Errorf("Error closing radix client: %v", err)
314+
}
315+
}()
304316

305317
var strBackedupKeys string
306318
err = client.Do(radix.Cmd(&strBackedupKeys, "GET", config.KeyTotalKeys))
@@ -320,8 +332,11 @@ func (opt *redisOptions) restoreRedis(targetRef api_v1beta1.TargetRef) (*restic.
320332
if err != nil {
321333
return nil, err
322334
}
323-
defer client.Close()
324-
335+
defer func() {
336+
if err := client.Close(); err != nil {
337+
klog.Errorf("Error closing radix client: %v", err)
338+
}
339+
}()
325340
_ = client.Do(radix.Cmd(nil, "DEL", config.KeyTotalKeys))
326341
}
327342

‎vendor/go.bytebuilders.dev/license-verifier/.golangci.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: "2"
2+
linters:
3+
default: standard
4+
enable:
5+
- unparam
6+
7+
formatters:
8+
enable:
9+
- gofmt
10+
- goimports
11+
settings:
12+
gofmt:
13+
rewrite-rules:
14+
- pattern: 'interface{}'
15+
replacement: 'any'
16+
17+
issues:
18+
max-same-issues: 100
19+
20+
exclude-files:
21+
- generated.*\\.go
22+
23+
exclude-dirs:
24+
- client
25+
- vendor
26+
- kubernetes/vendor
27+
28+
run:
29+
timeout: 10m

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COMPRESS ?= no
2121

2222
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
2323
CRD_OPTIONS ?= "crd:maxDescLen=0,generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
24-
CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.29
24+
CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.32
2525
API_GROUPS ?= licenses:v1alpha1
2626

2727
# Where to push the docker image.
@@ -64,7 +64,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6464
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
6565
BASEIMAGE_DBG ?= debian:12
6666

67-
GO_VERSION ?= 1.23
67+
GO_VERSION ?= 1.25
6868
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
6969

7070
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
@@ -201,8 +201,6 @@ unit-tests: $(BUILD_DIRS)
201201
./hack/test.sh $(SRC_PKGS) \
202202
"
203203

204-
ADDTL_LINTERS := goconst,gofmt,goimports,unparam
205-
206204
.PHONY: lint
207205
lint: $(BUILD_DIRS)
208206
@echo "running linter"
@@ -220,7 +218,7 @@ lint: $(BUILD_DIRS)
220218
--env GO111MODULE=on \
221219
--env GOFLAGS="-mod=vendor" \
222220
$(BUILD_IMAGE) \
223-
golangci-lint run --enable $(ADDTL_LINTERS) --deadline=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default --skip-dirs=client,vendor
221+
golangci-lint run
224222

225223
$(BUILD_DIRS):
226224
@mkdir -p $@
@@ -256,7 +254,7 @@ add-license:
256254
--env HTTP_PROXY=$(HTTP_PROXY) \
257255
--env HTTPS_PROXY=$(HTTPS_PROXY) \
258256
$(BUILD_IMAGE) \
259-
ltag -t "./hack/license" --excludes "vendor contrib libbuild" -v
257+
ltag -t "./hack/license" --excludes ".go vendor contrib libbuild" -v
260258

261259
.PHONY: check-license
262260
check-license:
@@ -269,7 +267,7 @@ check-license:
269267
--env HTTP_PROXY=$(HTTP_PROXY) \
270268
--env HTTPS_PROXY=$(HTTPS_PROXY) \
271269
$(BUILD_IMAGE) \
272-
ltag -t "./hack/license" --excludes "vendor contrib libbuild" --check -v
270+
ltag -t "./hack/license" --excludes ".go vendor contrib libbuild" --check -v
273271

274272
.PHONY: ci
275273
ci: verify check-license lint build unit-tests #cover

‎vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ func (l License) EnableClientBilling() bool {
2424
return len(l.FeatureFlags) > 0 && l.FeatureFlags[FeatureEnableClientBilling] == "true"
2525
}
2626

27+
func (l License) ActivationMode() ActivationMode {
28+
if l.FeatureFlags[FeatureActivationMode] == string(ActivationModeCertification) {
29+
return ActivationModeCertification
30+
}
31+
return ActivationModeFull
32+
}
33+
2734
func (i *License) Less(j *License) bool {
2835
if i == nil {
2936
return true
@@ -56,11 +63,12 @@ func (i *License) Less(j *License) bool {
5663

5764
func rankTier(t string) int {
5865
// prefer enterprise licenses in a min priority queue
59-
if t == "enterprise" {
66+
switch t {
67+
case "enterprise":
6068
return 0
61-
} else if t == "" {
69+
case "":
6270
return 2
63-
} else {
71+
default:
6472
return 1
6573
}
6674
}

0 commit comments

Comments
 (0)