From 48d2e2ce2dac9411a46b1b3492f5807cb9bba281 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 4 Apr 2024 10:54:24 +0200 Subject: [PATCH] nfs: address golangci-lint issues addressing golangci-lint issues for the nfs code. Signed-off-by: Madhu Rajanna --- internal/nfs/controller/controllerserver.go | 6 +++--- internal/nfs/controller/volume.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/nfs/controller/controllerserver.go b/internal/nfs/controller/controllerserver.go index 36a55a9bd..15c610131 100644 --- a/internal/nfs/controller/controllerserver.go +++ b/internal/nfs/controller/controllerserver.go @@ -84,9 +84,9 @@ func (cs *Server) CreateVolume( return nil, err } - backend := res.Volume + backend := res.GetVolume() - log.DebugLog(ctx, "CephFS volume created: %s", backend.VolumeId) + log.DebugLog(ctx, "CephFS volume created: %s", backend.GetVolumeId()) secret := req.GetSecrets() cr, err := util.NewAdminCredentials(secret) @@ -97,7 +97,7 @@ func (cs *Server) CreateVolume( } defer cr.DeleteCredentials() - nfsVolume, err := NewNFSVolume(ctx, backend.VolumeId) + nfsVolume, err := NewNFSVolume(ctx, backend.GetVolumeId()) if err != nil { return nil, status.Error(codes.InvalidArgument, err.Error()) } diff --git a/internal/nfs/controller/volume.go b/internal/nfs/controller/volume.go index 271393d97..f8ca47d2b 100644 --- a/internal/nfs/controller/volume.go +++ b/internal/nfs/controller/volume.go @@ -127,12 +127,12 @@ func (nv *NFSVolume) CreateExport(backend *csi.Volume) error { if !nv.connected { return fmt.Errorf("can not created export for %q: %w", nv, ErrNotConnected) } - - fs := backend.VolumeContext["fsName"] - nfsCluster := backend.VolumeContext["nfsCluster"] - path := backend.VolumeContext["subvolumePath"] - secTypes := backend.VolumeContext["secTypes"] - clients := backend.VolumeContext["clients"] + vctx := backend.GetVolumeContext() + fs := vctx["fsName"] + nfsCluster := vctx["nfsCluster"] + path := vctx["subvolumePath"] + secTypes := vctx["secTypes"] + clients := vctx["clients"] err := nv.setNFSCluster(nfsCluster) if err != nil {