mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

csi-addons: address golangci-lint issues

Browse Source 
addressed golangci-lint issues in csi-addons
code.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2024-04-04 10:51:19 +02:00
committed by mergify[bot]
parent a362ef6bd4
commit 29a9114409
10 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/csi-addons/cephfs/network_fence.go
View File

@ -66,7 +66,7 @@ func (fcs *FenceControllerServer) FenceClusterNetwork(
ctx context.Context,
req *fence.FenceClusterNetworkRequest,
) (*fence.FenceClusterNetworkResponse, error) {
err := validateNetworkFenceReq(req.GetCidrs(), req.Parameters)
err := validateNetworkFenceReq(req.GetCidrs(), req.GetParameters())
if err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
@ -77,7 +77,7 @@ func (fcs *FenceControllerServer) FenceClusterNetwork(
}
defer cr.DeleteCredentials()
nwFence, err := nf.NewNetworkFence(ctx, cr, req.Cidrs, req.GetParameters())
nwFence, err := nf.NewNetworkFence(ctx, cr, req.GetCidrs(), req.GetParameters())
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
@ -95,7 +95,7 @@ func (fcs *FenceControllerServer) UnfenceClusterNetwork(
ctx context.Context,
req *fence.UnfenceClusterNetworkRequest,
) (*fence.UnfenceClusterNetworkResponse, error) {
err := validateNetworkFenceReq(req.GetCidrs(), req.Parameters)
err := validateNetworkFenceReq(req.GetCidrs(), req.GetParameters())
if err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
@ -106,7 +106,7 @@ func (fcs *FenceControllerServer) UnfenceClusterNetwork(
}
defer cr.DeleteCredentials()
nwFence, err := nf.NewNetworkFence(ctx, cr, req.Cidrs, req.GetParameters())
nwFence, err := nf.NewNetworkFence(ctx, cr, req.GetCidrs(), req.GetParameters())
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}

6
internal/csi-addons/cephfs/network_fence_test.go
View File

@ -21,7 +21,7 @@ import (
"testing"
"github.com/csi-addons/spec/lib/go/fence"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// TestFenceClusterNetwork is a minimal test for the FenceClusterNetwork()
@ -39,7 +39,7 @@ func TestFenceClusterNetwork(t *testing.T) {
}
_, err := controller.FenceClusterNetwork(context.TODO(), req)
assert.Error(t, err)
require.Error(t, err)
}
// TestUnfenceClusterNetwork is a minimal test for the UnfenceClusterNetwork()
@ -55,5 +55,5 @@ func TestUnfenceClusterNetwork(t *testing.T) {
Cidrs: nil,
}
_, err := controller.UnfenceClusterNetwork(context.TODO(), req)
assert.Error(t, err)
require.Error(t, err)
}