Skip to content

Commit d46fe5b

Browse files
1602077jack munday
1602077
and
jack munday
authored
build(go): upgrade to v1.22.0 (#140)
* chore: gofumpt * build: upgrade to go 1.22 --------- Co-authored-by: jack munday <[email protected]>
1 parent e791fad commit d46fe5b

File tree

16 files changed

+83
-64
lines changed

16 files changed

+83
-64
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build-bin:
1515
stage: build-bin
1616
rules:
1717
- if: $CI_COMMIT_BRANCH || $CI_COMMIT_TAG
18-
image: registry.cern.ch/docker.io/library/golang:1.20
18+
image: registry.cern.ch/docker.io/library/golang:1.22
1919
artifacts:
2020
expire_in: '10 min'
2121
paths:

‎cmd/automount-runner/main.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func main() {
6161
UnmountTimeoutSeconds: *unmountTimeoutSeconds,
6262
HasAlienCache: *hasAlienCache,
6363
})
64-
6564
if err != nil {
6665
log.Fatalf("Failed to initialize automount-runner: %v", err)
6766
}

‎cmd/csi-cvmfsplugin/main.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ func (rf rolesFlag) String() string {
3535
return fmt.Sprintf("%v", []driver.ServiceRole(rf))
3636
}
3737

38-
var (
39-
knownServiceRoles = map[driver.ServiceRole]struct{}{
40-
driver.IdentityServiceRole: {},
41-
driver.NodeServiceRole: {},
42-
driver.ControllerServiceRole: {},
43-
}
44-
)
38+
var knownServiceRoles = map[driver.ServiceRole]struct{}{
39+
driver.IdentityServiceRole: {},
40+
driver.NodeServiceRole: {},
41+
driver.ControllerServiceRole: {},
42+
}
4543

4644
func (rf *rolesFlag) Set(newRoleFlag string) error {
4745
for _, part := range strings.Split(newRoleFlag, ",") {
@@ -105,7 +103,6 @@ func main() {
105103

106104
AutomountDaemonStartupTimeoutSeconds: *automountDaemonStartupTimeoutSeconds,
107105
})
108-
109106
if err != nil {
110107
log.Fatalf("Failed to initialize the driver: %v", err)
111108
}

‎go.mod‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
module github.com/cvmfs-contrib/cvmfs-csi
22

3-
go 1.20
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
6-
github.com/container-storage-interface/spec v1.8.0
7-
github.com/kubernetes-csi/csi-lib-utils v0.13.0
8-
github.com/moby/sys/mountinfo v0.6.2
9-
google.golang.org/grpc v1.55.0
10-
google.golang.org/protobuf v1.30.0
11-
k8s.io/apimachinery v0.26.3
12-
k8s.io/klog/v2 v2.100.1
13-
k8s.io/mount-utils v0.26.3
8+
github.com/container-storage-interface/spec v1.9.0
9+
github.com/kubernetes-csi/csi-lib-utils v0.17.0
10+
github.com/moby/sys/mountinfo v0.7.1
11+
google.golang.org/grpc v1.63.2
12+
google.golang.org/protobuf v1.34.0
13+
k8s.io/apimachinery v0.30.0
14+
k8s.io/klog/v2 v2.120.1
15+
k8s.io/mount-utils v0.30.0
1416
)
1517

1618
require (
17-
github.com/go-logr/logr v1.2.3 // indirect
18-
github.com/golang/protobuf v1.5.3 // indirect
19-
golang.org/x/net v0.8.0 // indirect
20-
golang.org/x/sys v0.6.0 // indirect
21-
golang.org/x/text v0.8.0 // indirect
22-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
23-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
19+
github.com/go-logr/logr v1.4.1 // indirect
20+
github.com/golang/protobuf v1.5.4 // indirect
21+
golang.org/x/net v0.24.0 // indirect
22+
golang.org/x/sys v0.19.0 // indirect
23+
golang.org/x/text v0.14.0 // indirect
24+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
25+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
26+
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
2427
)

‎go.sum‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,74 @@
11
github.com/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI=
22
github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0=
3+
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
4+
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
35
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
46
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
57
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
68
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
9+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
10+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
711
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
812
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
913
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
14+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
15+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
1016
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1117
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1218
github.com/kubernetes-csi/csi-lib-utils v0.13.0 h1:QrTdZVZbHlaSUBN9ReayBPnnF1N0edFIpUKBwVIBW3w=
1319
github.com/kubernetes-csi/csi-lib-utils v0.13.0/go.mod h1:JS9eDIZmSjx4F9o0bLTVK/qfhIIOifdjEfVXzxWapfE=
20+
github.com/kubernetes-csi/csi-lib-utils v0.17.0 h1:xEpJ3WYgMyyYF6fvcKHh4cDRtknuTkBS9rG8bYoLTCU=
21+
github.com/kubernetes-csi/csi-lib-utils v0.17.0/go.mod h1:2Ba5/aQgUjbpqyC2uCcFwMF3rnPVs5jhZXm8jAzcT9Q=
1422
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
1523
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
24+
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
25+
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
1626
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1727
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
1828
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
1929
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
30+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
31+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
2032
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2133
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
2234
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
36+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2337
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
2438
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
39+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
40+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2541
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
2642
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
2743
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
44+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
45+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
46+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE=
47+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
2848
google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
2949
google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
50+
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
51+
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
3052
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
3153
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
3254
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
3355
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
56+
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
57+
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
3458
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
3559
k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
3660
k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
61+
k8s.io/apimachinery v0.30.0 h1:qxVPsyDM5XS96NIh9Oj6LavoVFYff/Pon9cZeDIkHHA=
62+
k8s.io/apimachinery v0.30.0/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
3763
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
3864
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
65+
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
66+
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
3967
k8s.io/mount-utils v0.26.3 h1:FxMDiPLCkrYgonfSaKHWltLNkyTg3Q/Xrwn94uwhd8k=
4068
k8s.io/mount-utils v0.26.3/go.mod h1:95yx9K6N37y8YZ0/lUh9U6ITosMODNaW0/v4wvaa0Xw=
69+
k8s.io/mount-utils v0.30.0 h1:EceYTNYVabfpdtIAHC4KgMzoZkm1B8ovZ1J666mYZQI=
70+
k8s.io/mount-utils v0.30.0/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
4171
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
4272
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
73+
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBGe9UyDahzs9zQzQ=
74+
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=

‎internal/cvmfs/automount/automount.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ func readEffectiveDefaultCvmfsConfig() (map[string]string, error) {
8989
// the default, not repository-specific values.
9090
"x",
9191
))
92-
9392
if err != nil {
9493
execErr, ok := err.(*goexec.ExitError)
9594
if !ok {
@@ -155,7 +154,7 @@ func readEffectiveDefaultCvmfsConfig() (map[string]string, error) {
155154
func setupCvmfs(o *Opts) error {
156155
if o.HasAlienCache {
157156
// Make sure the volume is writable by CVMFS processes.
158-
if err := os.Chmod(AlienCachePath, 0777); err != nil {
157+
if err := os.Chmod(AlienCachePath, 0o777); err != nil {
159158
return err
160159
}
161160
}
@@ -191,7 +190,7 @@ func setupCvmfs(o *Opts) error {
191190

192191
func setupAutofs(o *Opts) error {
193192
writeFmtFile := func(filepath, format string, fmtValues ...any) error {
194-
if err := os.WriteFile(filepath, []byte(fmt.Sprintf(format, fmtValues...)), 0644); err != nil {
193+
if err := os.WriteFile(filepath, []byte(fmt.Sprintf(format, fmtValues...)), 0o644); err != nil {
195194
return fmt.Errorf("failed to write autofs configuration to %s: %v", filepath, err)
196195
}
197196
return nil

‎internal/cvmfs/controller/csiserver.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ type Server struct {
3131
caps []*csi.ControllerServiceCapability
3232
}
3333

34-
var (
35-
_ csi.ControllerServer = (*Server)(nil)
36-
)
34+
var _ csi.ControllerServer = (*Server)(nil)
3735

3836
func New() *Server {
3937
enabledCaps := []csi.ControllerServiceCapability_RPC_Type{
@@ -184,6 +182,13 @@ func (srv *Server) ControllerGetVolume(
184182
return nil, status.Error(codes.Unimplemented, "")
185183
}
186184

185+
func (srv *Server) ControllerModifyVolume(
186+
context.Context,
187+
*csi.ControllerModifyVolumeRequest,
188+
) (*csi.ControllerModifyVolumeResponse, error) {
189+
return nil, status.Error(codes.Unimplemented, "")
190+
}
191+
187192
func validateCreateVolumeRequest(req *csi.CreateVolumeRequest) error {
188193
if req.GetName() == "" {
189194
return errors.New("volume name cannot be empty")

‎internal/cvmfs/driver/driver.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ const (
8585
maxDriverNameLength = 63
8686
)
8787

88-
var (
89-
errTimeout = errors.New("timed out waiting for condition")
90-
)
88+
var errTimeout = errors.New("timed out waiting for condition")
9189

9290
func (o *Opts) validate() error {
9391
required := func(name, value string) error {

‎internal/cvmfs/driver/grpclogger.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ import (
2727
"google.golang.org/grpc"
2828
)
2929

30-
var (
31-
// Counter value used for pairing up GRPC call and response log messages.
32-
grpcCallCounter uint64
33-
)
30+
// Counter value used for pairing up GRPC call and response log messages.
31+
var grpcCallCounter uint64
3432

3533
func fmtGRPCLogMsg(grpcCallID uint64, msg string) string {
3634
return fmt.Sprintf("Call-ID %d: %s", grpcCallID, msg)

‎internal/cvmfs/node/csiserver.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ const (
4444
cvmfsRoot = "/cvmfs"
4545
)
4646

47-
var (
48-
_ csi.NodeServer = (*Server)(nil)
49-
)
47+
var _ csi.NodeServer = (*Server)(nil)
5048

5149
func New(nodeID, singlemountRunnerEndpoint string) *Server {
5250
enabledCaps := []csi.NodeServiceCapability_RPC_Type{
@@ -104,7 +102,7 @@ func (srv *Server) NodePublishVolume(
104102
"failed to parse volume context: %v", err)
105103
}
106104

107-
if err := os.MkdirAll(targetPath, 0700); err != nil {
105+
if err := os.MkdirAll(targetPath, 0o700); err != nil {
108106
return nil, status.Errorf(codes.Internal,
109107
"failed to create mountpoint directory at %s: %v", targetPath, err)
110108
}

0 commit comments

Comments
 (0)