Skip to content

Commit c876ea7

Browse files
PantaniPantani
authored
fix: bump lint and fix issues (#4310)
1 parent edb39af commit c876ea7

File tree

19 files changed

+325
-423
lines changed

19 files changed

+325
-423
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ linters:
2828
- misspell
2929
- nakedret
3030
- nolintlint
31-
- exportloopref
3231
- staticcheck
3332
- reassign
3433
- stylecheck

‎go.mod‎

Lines changed: 65 additions & 62 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 143 additions & 289 deletions
Large diffs are not rendered by default.

‎ignite/config/plugins/parse.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ import (
1717
// given names above are found, then an empty config is returned, w/o errors.
1818
func ParseDir(dir string) (*Config, error) {
1919
// handy function that wraps and prefix err with a common label
20-
errf := func(err error) (*Config, error) {
21-
return nil, errors.Errorf("plugin config parse: %w", err)
20+
errf := func(err error) error {
21+
return errors.Errorf("plugin config parse: %w", err)
2222
}
2323
fi, err := os.Stat(dir)
2424
if err != nil {
25-
return errf(err)
25+
return nil, errf(err)
2626
}
2727
if !fi.IsDir() {
28-
return errf(errors.Errorf("path %s is not a dir", dir))
28+
return nil, errf(errors.Errorf("path %s is not a dir", dir))
2929
}
3030

3131
filename, err := locateFile(dir)
3232
if err != nil {
33-
return errf(err)
33+
return nil, errf(err)
3434
}
3535
c := Config{
3636
path: filename,
@@ -41,13 +41,13 @@ func ParseDir(dir string) (*Config, error) {
4141
if os.IsNotExist(err) {
4242
return &c, nil
4343
}
44-
return errf(err)
44+
return nil, errf(err)
4545
}
4646
defer f.Close()
4747

4848
// if the error is end of file meaning an empty file on read return nil
4949
if err := yaml.NewDecoder(f).Decode(&c); err != nil && !errors.Is(err, io.EOF) {
50-
return errf(err)
50+
return nil, errf(err)
5151
}
5252
return &c, nil
5353
}

‎ignite/internal/plugin/testdata/execute_fail/go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ require (
2222
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
2323
github.com/cockroachdb/redact v1.1.5 // indirect
2424
github.com/cosmos/btcutil v1.0.5 // indirect
25-
github.com/cosmos/cosmos-sdk v0.50.8 // indirect
25+
github.com/cosmos/cosmos-sdk v0.50.9 // indirect
2626
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
2727
github.com/emirpasic/gods v1.18.1 // indirect
28-
github.com/fatih/color v1.16.0 // indirect
28+
github.com/fatih/color v1.17.0 // indirect
2929
github.com/fatih/structs v1.1.0 // indirect
3030
github.com/getsentry/sentry-go v0.27.0 // indirect
3131
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -75,22 +75,22 @@ require (
7575
github.com/skeema/knownhosts v1.2.2 // indirect
7676
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
7777
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
78-
github.com/spf13/cobra v1.8.0 // indirect
78+
github.com/spf13/cobra v1.8.1 // indirect
7979
github.com/spf13/pflag v1.0.5 // indirect
8080
github.com/xanzy/ssh-agent v0.3.3 // indirect
8181
go.etcd.io/bbolt v1.3.9 // indirect
82-
golang.org/x/crypto v0.24.0 // indirect
83-
golang.org/x/mod v0.17.0 // indirect
84-
golang.org/x/net v0.26.0 // indirect
85-
golang.org/x/sync v0.7.0 // indirect
86-
golang.org/x/sys v0.21.0 // indirect
87-
golang.org/x/term v0.21.0 // indirect
88-
golang.org/x/text v0.16.0 // indirect
89-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
82+
golang.org/x/crypto v0.26.0 // indirect
83+
golang.org/x/mod v0.20.0 // indirect
84+
golang.org/x/net v0.28.0 // indirect
85+
golang.org/x/sync v0.8.0 // indirect
86+
golang.org/x/sys v0.23.0 // indirect
87+
golang.org/x/term v0.23.0 // indirect
88+
golang.org/x/text v0.17.0 // indirect
89+
golang.org/x/tools v0.24.0 // indirect
9090
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
91-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
9292
google.golang.org/grpc v1.64.1 // indirect
93-
google.golang.org/protobuf v1.34.1 // indirect
93+
google.golang.org/protobuf v1.34.2 // indirect
9494
gopkg.in/warnings.v0 v0.1.2 // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
9696
)

‎ignite/internal/plugin/testdata/execute_ok/go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ require (
2222
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
2323
github.com/cockroachdb/redact v1.1.5 // indirect
2424
github.com/cosmos/btcutil v1.0.5 // indirect
25-
github.com/cosmos/cosmos-sdk v0.50.8 // indirect
25+
github.com/cosmos/cosmos-sdk v0.50.9 // indirect
2626
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
2727
github.com/emirpasic/gods v1.18.1 // indirect
28-
github.com/fatih/color v1.16.0 // indirect
28+
github.com/fatih/color v1.17.0 // indirect
2929
github.com/fatih/structs v1.1.0 // indirect
3030
github.com/getsentry/sentry-go v0.27.0 // indirect
3131
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -75,22 +75,22 @@ require (
7575
github.com/skeema/knownhosts v1.2.2 // indirect
7676
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
7777
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
78-
github.com/spf13/cobra v1.8.0 // indirect
78+
github.com/spf13/cobra v1.8.1 // indirect
7979
github.com/spf13/pflag v1.0.5 // indirect
8080
github.com/xanzy/ssh-agent v0.3.3 // indirect
8181
go.etcd.io/bbolt v1.3.9 // indirect
82-
golang.org/x/crypto v0.24.0 // indirect
83-
golang.org/x/mod v0.17.0 // indirect
84-
golang.org/x/net v0.26.0 // indirect
85-
golang.org/x/sync v0.7.0 // indirect
86-
golang.org/x/sys v0.21.0 // indirect
87-
golang.org/x/term v0.21.0 // indirect
88-
golang.org/x/text v0.16.0 // indirect
89-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
82+
golang.org/x/crypto v0.26.0 // indirect
83+
golang.org/x/mod v0.20.0 // indirect
84+
golang.org/x/net v0.28.0 // indirect
85+
golang.org/x/sync v0.8.0 // indirect
86+
golang.org/x/sys v0.23.0 // indirect
87+
golang.org/x/term v0.23.0 // indirect
88+
golang.org/x/text v0.17.0 // indirect
89+
golang.org/x/tools v0.24.0 // indirect
9090
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
91-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
9292
google.golang.org/grpc v1.64.1 // indirect
93-
google.golang.org/protobuf v1.34.1 // indirect
93+
google.golang.org/protobuf v1.34.2 // indirect
9494
gopkg.in/warnings.v0 v0.1.2 // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
9696
)

‎ignite/internal/tools/gen-config-doc/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/gobuffalo/genny/v2 v2.1.0
99
github.com/gobuffalo/plush/v4 v4.1.20
1010
github.com/ignite/cli/v29 v29.0.0-00010101000000-000000000000
11-
github.com/spf13/cobra v1.8.0
11+
github.com/spf13/cobra v1.8.1
1212
)
1313

1414
require (
@@ -23,7 +23,7 @@ require (
2323
github.com/cockroachdb/redact v1.1.5 // indirect
2424
github.com/emicklei/proto v1.12.2 // indirect
2525
github.com/emicklei/proto-contrib v0.15.0 // indirect
26-
github.com/fatih/color v1.16.0 // indirect
26+
github.com/fatih/color v1.17.0 // indirect
2727
github.com/fatih/structs v1.1.0 // indirect
2828
github.com/getsentry/sentry-go v0.27.0 // indirect
2929
github.com/gobuffalo/flect v0.3.0 // indirect
@@ -61,10 +61,10 @@ require (
6161
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
6262
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
6363
github.com/spf13/pflag v1.0.5 // indirect
64-
golang.org/x/net v0.26.0 // indirect
65-
golang.org/x/sys v0.21.0 // indirect
66-
golang.org/x/term v0.21.0 // indirect
67-
golang.org/x/text v0.16.0 // indirect
64+
golang.org/x/net v0.28.0 // indirect
65+
golang.org/x/sys v0.23.0 // indirect
66+
golang.org/x/term v0.23.0 // indirect
67+
golang.org/x/text v0.17.0 // indirect
6868
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
6969
gopkg.in/yaml.v3 v3.0.1 // indirect
7070
)

‎ignite/internal/tools/gen-config-doc/go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9D
2626
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
2727
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
2828
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
29+
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
2930
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3031
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
3132
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -39,6 +40,7 @@ github.com/emicklei/proto-contrib v0.15.0 h1:5D8JKpV1qekMDFwEJp8NVJGY1We6t14dn9D
3940
github.com/emicklei/proto-contrib v0.15.0/go.mod h1:p6zmoy14hFYiwUb35X7nJ4u4l1vfvjc1mWrIt8QB3kw=
4041
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
4142
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
43+
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
4244
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
4345
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
4446
github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
@@ -159,6 +161,7 @@ github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG
159161
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
160162
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
161163
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
164+
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
162165
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
163166
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
164167
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -196,6 +199,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
196199
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
197200
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
198201
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
202+
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
203+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
199204
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
200205
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
201206
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -222,13 +227,17 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
222227
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
223228
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
224229
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
230+
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
231+
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
225232
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
226233
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
227234
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
228235
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
229236
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
230237
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
231238
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
239+
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
240+
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
232241
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
233242
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
234243
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -237,6 +246,7 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
237246
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
238247
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
239248
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
249+
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
240250
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
241251
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
242252
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

‎ignite/internal/tools/gen-mig-diffs/go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/gobwas/glob v0.2.3
1313
github.com/hexops/gotextdiff v1.0.3
1414
github.com/ignite/cli/v29 v29.0.0-00010101000000-000000000000
15-
github.com/spf13/cobra v1.8.0
15+
github.com/spf13/cobra v1.8.1
1616
github.com/stretchr/testify v1.9.0
1717
)
1818

@@ -35,7 +35,7 @@ require (
3535
github.com/emicklei/proto v1.13.2 // indirect
3636
github.com/emicklei/proto-contrib v0.16.0 // indirect
3737
github.com/emirpasic/gods v1.18.1 // indirect
38-
github.com/fatih/color v1.16.0 // indirect
38+
github.com/fatih/color v1.17.0 // indirect
3939
github.com/fatih/structs v1.1.0 // indirect
4040
github.com/getsentry/sentry-go v0.27.0 // indirect
4141
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -79,14 +79,14 @@ require (
7979
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
8080
github.com/spf13/pflag v1.0.5 // indirect
8181
github.com/xanzy/ssh-agent v0.3.3 // indirect
82-
golang.org/x/crypto v0.24.0 // indirect
83-
golang.org/x/mod v0.17.0 // indirect
84-
golang.org/x/net v0.26.0 // indirect
85-
golang.org/x/sync v0.7.0 // indirect
86-
golang.org/x/sys v0.21.0 // indirect
87-
golang.org/x/term v0.21.0 // indirect
88-
golang.org/x/text v0.16.0 // indirect
89-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
82+
golang.org/x/crypto v0.26.0 // indirect
83+
golang.org/x/mod v0.20.0 // indirect
84+
golang.org/x/net v0.28.0 // indirect
85+
golang.org/x/sync v0.8.0 // indirect
86+
golang.org/x/sys v0.23.0 // indirect
87+
golang.org/x/term v0.23.0 // indirect
88+
golang.org/x/text v0.17.0 // indirect
89+
golang.org/x/tools v0.24.0 // indirect
9090
gopkg.in/warnings.v0 v0.1.2 // indirect
9191
gopkg.in/yaml.v3 v3.0.1 // indirect
9292
)

0 commit comments

Comments
 (0)