From 238051613d0adcc49ac7caea9cd3293e31e64d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Tue, 23 Sep 2025 17:24:45 +0200 Subject: [PATCH 1/3] chore: bump golangci-lint to 2.5.0 --- .../instance/v1/custom_image_test.go | 2 +- .../instance/v1/custom_server_action_test.go | 6 ++--- .../vpc/v2/custom_private_network.go | 22 +++++++++---------- internal/tasks/tasks.go | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/namespaces/instance/v1/custom_image_test.go b/internal/namespaces/instance/v1/custom_image_test.go index 13a568ceb5..2e7990249e 100644 --- a/internal/namespaces/instance/v1/custom_image_test.go +++ b/internal/namespaces/instance/v1/custom_image_test.go @@ -88,7 +88,7 @@ func Test_ImageDelete(t *testing.T) { _, err := api.GetSnapshot(&instanceSDK.GetSnapshotRequest{ SnapshotID: snapshot.Snapshot.ID, }) - assert.IsType(t, &scw.ResourceNotFoundError{}, err) + assert.ErrorIs(t, err, &scw.ResourceNotFoundError{}) }, ), AfterFunc: deleteServer("Server"), diff --git a/internal/namespaces/instance/v1/custom_server_action_test.go b/internal/namespaces/instance/v1/custom_server_action_test.go index 8b6371dad7..c335cddc1d 100644 --- a/internal/namespaces/instance/v1/custom_server_action_test.go +++ b/internal/namespaces/instance/v1/custom_server_action_test.go @@ -74,7 +74,7 @@ func Test_ServerTerminate(t *testing.T) { _, err := api.GetIP(&instanceSDK.GetIPRequest{ IP: server.PublicIP.ID, }) - require.IsType(t, &scw.PermissionsDeniedError{}, err) + require.ErrorIs(t, err, &scw.PermissionsDeniedError{}) }, ), DisableParallel: true, @@ -131,14 +131,14 @@ func Test_ServerTerminate(t *testing.T) { VolumeID: rootVolume.ID, Zone: server.Zone, }) - require.IsType(t, &scw.ResourceNotFoundError{}, err) + require.ErrorIs(t, err, &scw.ResourceNotFoundError{}) additionalVolume := testhelpers.MapTValue(t, server.Volumes, "1") _, err = api.GetVolume(&blockSDK.GetVolumeRequest{ VolumeID: additionalVolume.ID, Zone: server.Zone, }) - require.IsType(t, &scw.ResourceNotFoundError{}, err) + require.ErrorIs(t, err, &scw.ResourceNotFoundError{}) }, ), DisableParallel: true, diff --git a/internal/namespaces/vpc/v2/custom_private_network.go b/internal/namespaces/vpc/v2/custom_private_network.go index 24f2eaafd3..29dcc1fd9b 100644 --- a/internal/namespaces/vpc/v2/custom_private_network.go +++ b/internal/namespaces/vpc/v2/custom_private_network.go @@ -71,57 +71,57 @@ func privateNetworkGetBuilder(c *core.Command) *core.Command { g.Go(func() (err error) { instanceServers, err = listCustomInstanceServers(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { baremetalServers, err = listCustomBaremetalServers(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { k8sClusters, err = listCustomK8sClusters(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { lbs, err = listCustomLBs(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { rdbs, err = listCustomRdbs(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { redisClusters, err = listCustomRedisClusters(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { gateways, err = listCustomGateways(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { appleSiliconServers, err = listCustomAppleSiliconServers(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { mongoDBs, err = listCustomMongoDBs(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { ipamIPs, err = listCustomIPAMIPs(groupCtx, client, pn) - return + return err }) g.Go(func() (err error) { inferenceDeployments, err = listCustomInferenceDeployments(groupCtx, client, pn) - return + return err }) if err = g.Wait(); err != nil { diff --git a/internal/tasks/tasks.go b/internal/tasks/tasks.go index 3fad2a3d29..8dfaa9568c 100644 --- a/internal/tasks/tasks.go +++ b/internal/tasks/tasks.go @@ -78,7 +78,7 @@ func Add[TaskArg any, TaskReturn any]( passedData, err = taskFunc(t, i.(TaskArg)) } - return + return passedData, err }, }) } From 9c2982b19f151ce0953d43b86bbea31af737cfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 24 Sep 2025 10:27:49 +0200 Subject: [PATCH 2/3] Fix --- internal/namespaces/instance/v1/custom_image_test.go | 2 +- .../namespaces/instance/v1/custom_server_action_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/namespaces/instance/v1/custom_image_test.go b/internal/namespaces/instance/v1/custom_image_test.go index 2e7990249e..13a568ceb5 100644 --- a/internal/namespaces/instance/v1/custom_image_test.go +++ b/internal/namespaces/instance/v1/custom_image_test.go @@ -88,7 +88,7 @@ func Test_ImageDelete(t *testing.T) { _, err := api.GetSnapshot(&instanceSDK.GetSnapshotRequest{ SnapshotID: snapshot.Snapshot.ID, }) - assert.ErrorIs(t, err, &scw.ResourceNotFoundError{}) + assert.IsType(t, &scw.ResourceNotFoundError{}, err) }, ), AfterFunc: deleteServer("Server"), diff --git a/internal/namespaces/instance/v1/custom_server_action_test.go b/internal/namespaces/instance/v1/custom_server_action_test.go index c335cddc1d..8b6371dad7 100644 --- a/internal/namespaces/instance/v1/custom_server_action_test.go +++ b/internal/namespaces/instance/v1/custom_server_action_test.go @@ -74,7 +74,7 @@ func Test_ServerTerminate(t *testing.T) { _, err := api.GetIP(&instanceSDK.GetIPRequest{ IP: server.PublicIP.ID, }) - require.ErrorIs(t, err, &scw.PermissionsDeniedError{}) + require.IsType(t, &scw.PermissionsDeniedError{}, err) }, ), DisableParallel: true, @@ -131,14 +131,14 @@ func Test_ServerTerminate(t *testing.T) { VolumeID: rootVolume.ID, Zone: server.Zone, }) - require.ErrorIs(t, err, &scw.ResourceNotFoundError{}) + require.IsType(t, &scw.ResourceNotFoundError{}, err) additionalVolume := testhelpers.MapTValue(t, server.Volumes, "1") _, err = api.GetVolume(&blockSDK.GetVolumeRequest{ VolumeID: additionalVolume.ID, Zone: server.Zone, }) - require.ErrorIs(t, err, &scw.ResourceNotFoundError{}) + require.IsType(t, &scw.ResourceNotFoundError{}, err) }, ), DisableParallel: true, From 2907dbac695f8ae8265834c12cc0a3a53606fcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 24 Sep 2025 10:43:31 +0200 Subject: [PATCH 3/3] Fix errors --- internal/namespaces/instance/v1/custom_image_test.go | 2 +- .../namespaces/instance/v1/custom_server_action_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/namespaces/instance/v1/custom_image_test.go b/internal/namespaces/instance/v1/custom_image_test.go index 13a568ceb5..feab0761b4 100644 --- a/internal/namespaces/instance/v1/custom_image_test.go +++ b/internal/namespaces/instance/v1/custom_image_test.go @@ -88,7 +88,7 @@ func Test_ImageDelete(t *testing.T) { _, err := api.GetSnapshot(&instanceSDK.GetSnapshotRequest{ SnapshotID: snapshot.Snapshot.ID, }) - assert.IsType(t, &scw.ResourceNotFoundError{}, err) + assert.ErrorAs(t, err, new(*scw.ResourceNotFoundError)) }, ), AfterFunc: deleteServer("Server"), diff --git a/internal/namespaces/instance/v1/custom_server_action_test.go b/internal/namespaces/instance/v1/custom_server_action_test.go index 8b6371dad7..9a96f9ca5f 100644 --- a/internal/namespaces/instance/v1/custom_server_action_test.go +++ b/internal/namespaces/instance/v1/custom_server_action_test.go @@ -74,7 +74,7 @@ func Test_ServerTerminate(t *testing.T) { _, err := api.GetIP(&instanceSDK.GetIPRequest{ IP: server.PublicIP.ID, }) - require.IsType(t, &scw.PermissionsDeniedError{}, err) + require.ErrorAs(t, err, new(*scw.PermissionsDeniedError)) }, ), DisableParallel: true, @@ -131,14 +131,14 @@ func Test_ServerTerminate(t *testing.T) { VolumeID: rootVolume.ID, Zone: server.Zone, }) - require.IsType(t, &scw.ResourceNotFoundError{}, err) + require.ErrorAs(t, err, new(*scw.ResourceNotFoundError)) additionalVolume := testhelpers.MapTValue(t, server.Volumes, "1") _, err = api.GetVolume(&blockSDK.GetVolumeRequest{ VolumeID: additionalVolume.ID, Zone: server.Zone, }) - require.IsType(t, &scw.ResourceNotFoundError{}, err) + require.ErrorAs(t, err, new(*scw.ResourceNotFoundError)) }, ), DisableParallel: true,