Skip to content

Commit e0a206f

Browse files
Laure-diLaure-di
authored
chore: update go version (scaleway#2515)
1 parent 5577145 commit e0a206f

File tree

6 files changed

+21
-77
lines changed

6 files changed

+21
-77
lines changed

‎.github/workflows/pull-request.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
unit-test:
99
strategy:
1010
matrix:
11-
go-version: [1.17.x, 1.18.x]
11+
go-version: [1.23.x, 1.24.x]
1212
platform: [ubuntu-latest]
1313
runs-on: ${{ matrix.platform }}
1414
steps:
@@ -27,7 +27,7 @@ jobs:
2727
build-arch-test:
2828
strategy:
2929
matrix:
30-
go-version: [1.17.x, 1.18.x]
30+
go-version: [1.23.x, 1.24.x]
3131
platform: [ubuntu-latest]
3232
arch: [386, amd64, arm, arm64]
3333
runs-on: ${{ matrix.platform }}
@@ -47,7 +47,7 @@ jobs:
4747
build-platform-test:
4848
strategy:
4949
matrix:
50-
go-version: [1.17.x, 1.18.x]
50+
go-version: [1.23.x, 1.24.x]
5151
platform: [windows-latest, macos-latest]
5252
runs-on: ${{ matrix.platform }}
5353
steps:

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Set up Go
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.17
24+
go-version: 1.23
2525
-
2626
name: Run GoReleaser
2727
uses: goreleaser/goreleaser-action@v6

‎api/instance/v1/sweepers/sweepers.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,24 @@ func SweepServers(scwClient *scw.Client, zone scw.Zone) error {
6767
}
6868

6969
for _, srv := range listServers.Servers {
70-
if srv.State == instance.ServerStateStopped || srv.State == instance.ServerStateStoppedInPlace {
70+
switch srv.State {
71+
case instance.ServerStateStopped, instance.ServerStateStoppedInPlace:
7172
err := instanceAPI.DeleteServer(&instance.DeleteServerRequest{
7273
Zone: zone,
7374
ServerID: srv.ID,
7475
})
7576
if err != nil {
76-
return fmt.Errorf("error deleting server in sweeper: %s", err)
77+
return fmt.Errorf("error deleting server in sweeper: %w", err)
7778
}
78-
} else if srv.State == instance.ServerStateRunning {
79+
80+
case instance.ServerStateRunning:
7981
_, err := instanceAPI.ServerAction(&instance.ServerActionRequest{
8082
Zone: zone,
8183
ServerID: srv.ID,
8284
Action: instance.ServerActionTerminate,
8385
})
8486
if err != nil {
85-
return fmt.Errorf("error terminating server in sweeper: %s", err)
87+
return fmt.Errorf("error terminating server in sweeper: %w", err)
8688
}
8789
}
8890
}

‎api/vpcgw/v1/sweepers/sweepers.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import (
1010
func SweepVPCPublicGateway(scwClient *scw.Client, zone scw.Zone) error {
1111
api := vpcgwSDK.NewAPI(scwClient)
1212

13-
listGatewayResponse, err := api.ListGateways(&vpcgwSDK.ListGatewaysRequest{
13+
listGatewayResponse, err := api.ListGateways(&vpcgwSDK.ListGatewaysRequest{ //nolint:staticcheck
1414
Zone: zone,
1515
}, scw.WithAllPages())
1616
if err != nil {
1717
return fmt.Errorf("error listing public gateway in sweeper: %w", err)
1818
}
1919

2020
for _, gateway := range listGatewayResponse.Gateways {
21-
err := api.DeleteGateway(&vpcgwSDK.DeleteGatewayRequest{
21+
err := api.DeleteGateway(&vpcgwSDK.DeleteGatewayRequest{ //nolint:staticcheck
2222
Zone: zone,
2323
GatewayID: gateway.ID,
2424
})
@@ -32,15 +32,15 @@ func SweepVPCPublicGateway(scwClient *scw.Client, zone scw.Zone) error {
3232
func SweepGatewayNetworks(scwClient *scw.Client, zone scw.Zone) error {
3333
api := vpcgwSDK.NewAPI(scwClient)
3434

35-
listPNResponse, err := api.ListGatewayNetworks(&vpcgwSDK.ListGatewayNetworksRequest{
35+
listPNResponse, err := api.ListGatewayNetworks(&vpcgwSDK.ListGatewayNetworksRequest{ //nolint:staticcheck
3636
Zone: zone,
3737
}, scw.WithAllPages())
3838
if err != nil {
3939
return fmt.Errorf("error listing gateway network in sweeper: %s", err)
4040
}
4141

4242
for _, gn := range listPNResponse.GatewayNetworks {
43-
err := api.DeleteGatewayNetwork(&vpcgwSDK.DeleteGatewayNetworkRequest{
43+
err := api.DeleteGatewayNetwork(&vpcgwSDK.DeleteGatewayNetworkRequest{ //nolint:staticcheck
4444
GatewayNetworkID: gn.GatewayID,
4545
Zone: zone,
4646
// Cleanup the dhcp resource related. DON'T CALL THE SWEEPER DHCP
@@ -56,15 +56,15 @@ func SweepGatewayNetworks(scwClient *scw.Client, zone scw.Zone) error {
5656
func SweepVPCPublicGatewayIP(scwClient *scw.Client, zone scw.Zone) error {
5757
api := vpcgwSDK.NewAPI(scwClient)
5858

59-
listIPResponse, err := api.ListIPs(&vpcgwSDK.ListIPsRequest{
59+
listIPResponse, err := api.ListIPs(&vpcgwSDK.ListIPsRequest{ //nolint:staticcheck
6060
Zone: zone,
6161
}, scw.WithAllPages())
6262
if err != nil {
6363
return fmt.Errorf("error listing public gateway ip in sweeper: %s", err)
6464
}
6565

6666
for _, ip := range listIPResponse.IPs {
67-
err := api.DeleteIP(&vpcgwSDK.DeleteIPRequest{
67+
err := api.DeleteIP(&vpcgwSDK.DeleteIPRequest{ //nolint:staticcheck
6868
Zone: zone,
6969
IPID: ip.ID,
7070
})
@@ -78,15 +78,15 @@ func SweepVPCPublicGatewayIP(scwClient *scw.Client, zone scw.Zone) error {
7878
func SweepVPCPublicGatewayDHCP(scwClient *scw.Client, zone scw.Zone) error {
7979
api := vpcgwSDK.NewAPI(scwClient)
8080

81-
listDHCPsResponse, err := api.ListDHCPs(&vpcgwSDK.ListDHCPsRequest{
81+
listDHCPsResponse, err := api.ListDHCPs(&vpcgwSDK.ListDHCPsRequest{ //nolint:staticcheck
8282
Zone: zone,
8383
}, scw.WithAllPages())
8484
if err != nil {
8585
return fmt.Errorf("error listing public gateway dhcps in sweeper: %w", err)
8686
}
8787

8888
for _, dhcp := range listDHCPsResponse.Dhcps {
89-
err := api.DeleteDHCP(&vpcgwSDK.DeleteDHCPRequest{
89+
err := api.DeleteDHCP(&vpcgwSDK.DeleteDHCPRequest{ //nolint:staticcheck
9090
Zone: zone,
9191
DHCPID: dhcp.ID,
9292
})

‎go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/scaleway/scaleway-sdk-go
22

3-
go 1.17
3+
go 1.23.0
4+
5+
toolchain go1.24.1
46

57
require (
68
github.com/dnaeon/go-vcr v1.2.0

‎go.sum‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,8 @@
11
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
22
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
3-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
43
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
5-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
6-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
8-
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
9-
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
10-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
11-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
12-
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
13-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
14-
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
15-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
16-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
17-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
18-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
19-
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
20-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
21-
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
22-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
23-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
24-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
25-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
26-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
27-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
28-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
29-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
30-
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
31-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
32-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
33-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
34-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
38-
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
39-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
40-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
41-
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
42-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
43-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
44-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
45-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
46-
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
47-
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
48-
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
49-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
50-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
51-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
52-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
53-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
54-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
55-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
56-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
574
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
585
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
59-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
60-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
61-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
62-
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
63-
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
64-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
65-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
666
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
677
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
688
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)