From c968f6407db7f1c3579c778a115700b547e32ba5 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 2 Jun 2023 14:39:58 +0200 Subject: [PATCH] build: address `dupword` warnings Signed-off-by: Niels de Vos --- e2e/rbd_helper.go | 4 ++++ internal/rbd/controllerserver.go | 4 ++-- internal/rbd/nodeserver.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/e2e/rbd_helper.go b/e2e/rbd_helper.go index b9fc53604..43d8ae32a 100644 --- a/e2e/rbd_helper.go +++ b/e2e/rbd_helper.go @@ -792,6 +792,8 @@ func sparsifyBackingRBDImage(f *framework.Framework, pvc *v1.PersistentVolumeCla func deletePool(name string, cephFS bool, f *framework.Framework) error { cmds := []string{} if cephFS { + //nolint:dupword // "ceph osd pool delete" requires the pool 2x + // // ceph fs fail // ceph fs rm myfs --yes-i-really-mean-it // ceph osd pool delete myfs-metadata myfs-metadata @@ -803,6 +805,8 @@ func deletePool(name string, cephFS bool, f *framework.Framework) error { fmt.Sprintf("ceph osd pool delete %s-metadata %s-metadata --yes-i-really-really-mean-it", name, name), fmt.Sprintf("ceph osd pool delete %s-replicated %s-replicated --yes-i-really-really-mean-it", name, name)) } else { + //nolint:dupword // "ceph osd pool delete" requires the pool 2x + // // ceph osd pool delete replicapool replicapool // --yes-i-really-mean-it cmds = append(cmds, fmt.Sprintf("ceph osd pool delete %s %s --yes-i-really-really-mean-it", name, name)) diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index 72ead0f5e..56061b227 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -308,8 +308,8 @@ func (cs *ControllerServer) CreateVolume( return nil, err } - // TODO: create/get a connection from the the ConnPool, and do not pass - // the credentials to any of the utility functions. + // TODO: create/get a connection from the ConnPool, and do not pass the + // credentials to any of the utility functions. cr, err := util.NewUserCredentialsWithMigration(req.GetSecrets()) if err != nil { diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go index 51b69f9e1..22efcf901 100644 --- a/internal/rbd/nodeserver.go +++ b/internal/rbd/nodeserver.go @@ -1023,7 +1023,7 @@ func (ns *NodeServer) NodeUnstageVolume( } // It was not mounted and image metadata is also missing, we are done as the last step in - // in the staging transaction is complete + // the staging transaction is complete return &csi.NodeUnstageVolumeResponse{}, nil }