Resolving lint issues

dell · Sep 17, 2024 · 8231814 · 8231814
1 parent efd6b39
commit 8231814
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/service/controller.go b/service/controller.go
@@ -16,16 +16,18 @@ package service
 import (
 	"errors"
 	"fmt"
-	"github.com/dell/csi-vxflexos/v2/k8sutils"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"math"
 	"net/http"
-	"sigs.k8s.io/yaml"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/dell/csi-vxflexos/v2/k8sutils"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"sigs.k8s.io/yaml"
+
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -1170,7 +1172,6 @@ func (s *service) DeleteVolume(
 }
 
 func (s *service) findNetworkInterfaceIPs() ([]string, error) {
-
 	if K8sClientset == nil {
 		err := k8sutils.CreateKubeClientSet()
 		if err != nil {

diff --git a/service/service.go b/service/service.go
@@ -515,7 +515,6 @@ func (s *service) BeforeServe(
 }
 
 func (s *service) updateConfigMap(getIPAddressByInterfacefunc GetIPAddressByInterfacefunc, configFilePath string) {
-
 	configFileData, err := os.ReadFile(configFilePath)
 	if err != nil {
 		Log.Errorf("Failed to read ConfigMap file: %v", err)

diff --git a/service/service_unit_test.go b/service/service_unit_test.go
@@ -18,6 +18,7 @@ import (
 	"errors"
 	"fmt"
 	v1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
@@ -27,27 +28,23 @@ import (
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	siotypes "github.com/dell/goscaleio/types/v1"
 	"github.com/stretchr/testify/assert"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
-type mockService struct {
-}
+type mockService struct{}
 
 func (s *mockService) InterfaceByName(interfaceName string) (*net.Interface, error) {
-
 	if interfaceName == "" {
 		return nil, fmt.Errorf("invalid interface name")
-
 	} else if interfaceName != "eth0" {
 		return nil, nil
 	}
 	return &net.Interface{
-			Name: interfaceName},
+			Name: interfaceName,
+		},
 		nil
 }
 
 func (s *mockService) Addrs(interfaceObj *net.Interface) ([]net.Addr, error) {
-
 	if interfaceObj == nil {
 		return nil, fmt.Errorf("invalid interface object")
 	}
@@ -483,7 +480,6 @@ func TestValidateQoSParameters(t *testing.T) {
 }
 
 func TestGetIPAddressByInterface(t *testing.T) {
-
 	tests := []struct {
 		name          string
 		interfaceName string
@@ -548,7 +544,8 @@ func TestFindNetworkInterfaceIPs(t *testing.T) {
 						Kind: "configmaps",
 					},
 					Code: 404,
-				}},
+				},
+			},
 			client:        fake.NewSimpleClientset(),
 			configMapData: nil,
 			createConfigMap: func(map[string]string, kubernetes.Interface) {

diff --git a/service/step_defs_test.go b/service/step_defs_test.go
@@ -3103,7 +3103,6 @@ func (f *feature) thereAreNoRemainingMounts() error {
 }
 
 func (f *feature) theConfigMapIsUpdated() error {
-
 	// Initializing a fake Kubernetes ClientSet
 	clientSet := fake.NewSimpleClientset()
 	K8sClientset = clientSet