Skip to content

Commit 8a708cc

Browse files
Rudro-25tamalsaha
Rudro-25
and
tamalsaha
authored
Linter fix (#143)
Signed-off-by: Rudro-25 <rudro@appscode.com> Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 8c90638 commit 8a708cc

109 files changed

Lines changed: 2503 additions & 1214 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
@@ -325,7 +325,7 @@ lint: $(BUILD_DIRS)
325325
--env HTTPS_PROXY=$(HTTPS_PROXY) \
326326
--env GOFLAGS="-mod=vendor" \
327327
$(BUILD_IMAGE) \
328-
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
328+
golangci-lint run
329329

330330
$(BUILD_DIRS):
331331
@mkdir -p $@

‎go.mod‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module kubevault.dev/unsealer
22

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

75
require (
86
cloud.google.com/go/storage v1.36.0
@@ -17,8 +15,8 @@ require (
1715
github.com/spf13/cobra v1.8.1
1816
github.com/spf13/pflag v1.0.6
1917
github.com/stretchr/testify v1.10.0
20-
golang.org/x/crypto v0.38.0
21-
golang.org/x/text v0.25.0
18+
golang.org/x/crypto v0.45.0
19+
golang.org/x/text v0.31.0
2220
gomodules.xyz/errors v0.1.0
2321
gomodules.xyz/logs v0.0.7
2422
gomodules.xyz/runtime v0.3.0
@@ -126,11 +124,11 @@ require (
126124
go.opentelemetry.io/otel v1.33.0 // indirect
127125
go.opentelemetry.io/otel/metric v1.33.0 // indirect
128126
go.opentelemetry.io/otel/trace v1.33.0 // indirect
129-
golang.org/x/net v0.38.0 // indirect
127+
golang.org/x/net v0.47.0 // indirect
130128
golang.org/x/oauth2 v0.27.0 // indirect
131-
golang.org/x/sync v0.14.0 // indirect
132-
golang.org/x/sys v0.33.0 // indirect
133-
golang.org/x/term v0.32.0 // indirect
129+
golang.org/x/sync v0.18.0 // indirect
130+
golang.org/x/sys v0.38.0 // indirect
131+
golang.org/x/term v0.37.0 // indirect
134132
golang.org/x/time v0.10.0 // indirect
135133
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
136134
gomodules.xyz/flags v0.1.3 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
488488
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
489489
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
490490
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
491-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
492-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
491+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
492+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
493493
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
494494
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
495495
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -533,8 +533,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
533533
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
534534
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
535535
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
536-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
537-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
536+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
537+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
538538
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
539539
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
540540
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -548,8 +548,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
548548
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
549549
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
550550
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
551-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
552-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
551+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
552+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
553553
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
554554
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
555555
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -574,22 +574,22 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
574574
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
575575
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
576576
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
577-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
578-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
577+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
578+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
579579
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
580580
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
581581
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
582-
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
583-
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
582+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
583+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
584584
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
585585
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
586586
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
587587
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
588588
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
589589
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
590590
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
591-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
592-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
591+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
592+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
593593
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
594594
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
595595
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
@@ -616,8 +616,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
616616
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
617617
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
618618
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
619-
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
620-
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
619+
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
620+
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
621621
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
622622
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
623623
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎hack/gendocs/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func main() {
9898
Name string
9999
RootCmd bool
100100
}{
101-
strings.Replace(base, "_", "-", -1),
102-
cases.Title(language.English).String(strings.Replace(base, "_", " ", -1)),
101+
strings.ReplaceAll(base, "_", "-"),
102+
cases.Title(language.English).String(strings.ReplaceAll(base, "_", " ")),
103103
!strings.ContainsRune(base, '_'),
104104
}
105105
var buf bytes.Buffer

‎pkg/kv/azure/azure_key_vault.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ func NewKVService(opts *Options) (kv.Service, error) {
6161

6262
func (k *KVService) Set(key string, value []byte) error {
6363
data := base64.StdEncoding.EncodeToString(value)
64-
return k.SetSecret(strings.Replace(k.getKeyName(key), ".", "-", -1), data)
64+
return k.SetSecret(strings.ReplaceAll(k.getKeyName(key), ".", "-"), data)
6565
}
6666

6767
func (k *KVService) Get(key string) ([]byte, error) {
68-
data, err := k.GetSecret(strings.Replace(k.getKeyName(key), ".", "-", -1))
68+
data, err := k.GetSecret(strings.ReplaceAll(k.getKeyName(key), ".", "-"))
6969
if err != nil {
7070
return nil, kv.NewNotFoundError("unable to get secret(%s) from key vault. reason: %v", key, err)
7171
}

‎pkg/kv/azure/oauth.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func GetConfigFromFile(configFilePath string) (*AzureAuthConfig, error) {
4848
return nil, err
4949
}
5050

51-
defer configFile.Close()
51+
defer configFile.Close() //nolint:errcheck
5252
configReader = configFile
5353
configContents, err := io.ReadAll(configReader)
5454
if err != nil {
@@ -72,7 +72,7 @@ func (c *AzureAuthConfig) GetKeyVaultToken(grantType OAuthGrantType) (authorizer
7272
}
7373

7474
kvEndPoint := env.KeyVaultEndpoint
75-
if '/' == kvEndPoint[len(kvEndPoint)-1] {
75+
if kvEndPoint[len(kvEndPoint)-1] == '/' {
7676
kvEndPoint = kvEndPoint[:len(kvEndPoint)-1]
7777
}
7878
servicePrincipalToken, err := GetServicePrincipalToken(c, env, kvEndPoint)
@@ -94,7 +94,7 @@ func GetServicePrincipalToken(config *AzureAuthConfig, env *azure.Environment, r
9494
klog.V(2).Infoln("azure: using managed identity extension to retrieve access token")
9595
msiEndpoint, err := adal.GetMSIVMEndpoint()
9696
if err != nil {
97-
return nil, fmt.Errorf("Getting the managed service identity endpoint: %v", err)
97+
return nil, fmt.Errorf("getting the managed service identity endpoint: %v", err)
9898
}
9999
return adal.NewServicePrincipalTokenFromMSI(
100100
msiEndpoint,
@@ -128,7 +128,7 @@ func GetServicePrincipalToken(config *AzureAuthConfig, env *azure.Environment, r
128128
env.ServiceManagementEndpoint)
129129
}
130130

131-
return nil, fmt.Errorf("No credentials provided for AAD application %s", config.AADClientID)
131+
return nil, fmt.Errorf("no credentials provided for AAD application %s", config.AADClientID)
132132
}
133133

134134
// ParseAzureEnvironment returns azure environment by name

‎pkg/kv/storage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type NotFoundError struct {
2424

2525
func (e *NotFoundError) Error() string { return e.msg }
2626

27-
func NewNotFoundError(msg string, args ...interface{}) *NotFoundError {
27+
func NewNotFoundError(msg string, args ...any) *NotFoundError {
2828
return &NotFoundError{
2929
msg: fmt.Sprintf(msg, args...),
3030
}

‎pkg/vault/auth/auth.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (k *KubernetesAuthenticator) ConfigureAuth() error {
7878
return errors.New("kubernetes config is nil")
7979
}
8080

81-
payload := map[string]interface{}{
81+
payload := map[string]any{
8282
"kubernetes_host": k.config.Host,
8383
"kubernetes_ca_cert": k.config.CA,
8484
"token_reviewer_jwt": k.config.Token,

‎pkg/vault/auth/auth_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const authList = `
5353
func NewFakeVaultServer() *httptest.Server {
5454
m := pat.New()
5555
m.Put("/v1/auth/kubernetes/config", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
56-
var v map[string]interface{}
57-
defer r.Body.Close()
56+
var v map[string]any
57+
defer r.Body.Close() //nolint:errcheck
5858
utilruntime.Must(json.NewDecoder(r.Body).Decode(&v))
5959
fmt.Println("***")
6060
fmt.Println(v)

0 commit comments

Comments
 (0)