From a6c14c051f33aefa2a13c9b7f987bee48b206cff Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 2 Jun 2023 11:41:39 +0200 Subject: [PATCH] build: address `golint` warnings Signed-off-by: Niels de Vos --- e2e/cephfs.go | 2 +- e2e/deploy-vault.go | 2 +- e2e/nfs.go | 2 +- e2e/rbd.go | 2 +- e2e/resize.go | 2 +- e2e/snapshot.go | 2 +- e2e/upgrade-cephfs.go | 2 +- e2e/upgrade-rbd.go | 2 +- internal/rbd/rbd_util.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 43ca46ba2..44b148856 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -23,7 +23,7 @@ import ( "sync" snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1" - . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" diff --git a/e2e/deploy-vault.go b/e2e/deploy-vault.go index 1ee7d626e..6424f3c16 100644 --- a/e2e/deploy-vault.go +++ b/e2e/deploy-vault.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - . "github.com/onsi/gomega" + . "github.com/onsi/gomega" //nolint:golint // e2e uses Expect() and other Gomega functions metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" diff --git a/e2e/nfs.go b/e2e/nfs.go index 17fdea90c..d1790d269 100644 --- a/e2e/nfs.go +++ b/e2e/nfs.go @@ -24,7 +24,7 @@ import ( "time" snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1" - . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions v1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/e2e/rbd.go b/e2e/rbd.go index 6b9648bfa..7a629b617 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -25,7 +25,7 @@ import ( "github.com/ceph/ceph-csi/internal/util" - . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/e2e/resize.go b/e2e/resize.go index 10347b650..e1df9f4a0 100644 --- a/e2e/resize.go +++ b/e2e/resize.go @@ -22,7 +22,7 @@ import ( "strings" "time" - . "github.com/onsi/gomega" + . "github.com/onsi/gomega" //nolint:golint // e2e uses Expect() and other Gomega functions v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/e2e/snapshot.go b/e2e/snapshot.go index 8b0a7adb8..cde7c6bb3 100644 --- a/e2e/snapshot.go +++ b/e2e/snapshot.go @@ -23,7 +23,7 @@ import ( snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1" snapclient "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/typed/volumesnapshot/v1" - . "github.com/onsi/gomega" + . "github.com/onsi/gomega" //nolint:golint // e2e uses Expect() and other Gomega functions v1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/e2e/upgrade-cephfs.go b/e2e/upgrade-cephfs.go index 7a8c5e1e8..0e7cb171c 100644 --- a/e2e/upgrade-cephfs.go +++ b/e2e/upgrade-cephfs.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/e2e/upgrade-rbd.go b/e2e/upgrade-rbd.go index 1c3264071..bb3ba0fd0 100644 --- a/e2e/upgrade-rbd.go +++ b/e2e/upgrade-rbd.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 08428eba6..4e299ec60 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1161,7 +1161,7 @@ func generateVolumeFromVolumeID( // GenVolFromVolID generates a rbdVolume structure from the provided identifier, updating // the structure with elements from on-disk image metadata as well. // - +//nolint:golint // TODO: returning unexported rbdVolume type, use an interface instead. func GenVolFromVolID( ctx context.Context, volumeID string,