(bugbash) Fix Staticcheck warnings (#571)

* Fix ST1019 static check * Fix SA6005 staticcheck * Fix S1008 staticcheck * Fix S1021 staticcheck * Fixed error in test file Signed-off-by: Sahil Raja <[email protected]>
openebs-archive · May 6, 2021 · 76542d9 · 76542d9
1 parent 4c37bc8
commit 76542d9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/integration_tests/k8s/k8sapi.go b/integration_tests/k8s/k8sapi.go
@@ -25,7 +25,6 @@ import (
 	apis "github.com/openebs/node-disk-manager/pkg/apis/openebs/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
 	apiextensionsV1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -43,7 +42,7 @@ const k8sReconcileTime = 10 * time.Second
 // with their status
 func (c K8sClient) ListPodStatus() (map[string]string, error) {
 	pods := make(map[string]string)
-	podList := &v1.PodList{}
+	podList := &corev1.PodList{}
 	podList, err := c.ClientSet.CoreV1().Pods(Namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return nil, err
@@ -58,7 +57,7 @@ func (c K8sClient) ListPodStatus() (map[string]string, error) {
 // their status
 func (c K8sClient) ListNodeStatus() (map[string]string, error) {
 	nodes := make(map[string]string)
-	nodeList := &v1.NodeList{}
+	nodeList := &corev1.NodeList{}
 	nodeList, err := c.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{})
 	if err != nil {
 		return nil, err
@@ -78,8 +77,7 @@ func (c K8sClient) ListBlockDevices() (*apis.BlockDeviceList, error) {
 		},
 	}
 
-	var err error
-	err = c.RunTimeClient.List(context.TODO(), bdList)
+	err := c.RunTimeClient.List(context.TODO(), bdList)
 	if err != nil {
 		return nil, fmt.Errorf("cannot list blockdevices. Error :%v", err)
 	}
@@ -152,37 +150,37 @@ func NewBDC(bdcName string) *apis.BlockDeviceClaim {
 }
 
 // CreateNamespace creates a namespace
-func (c K8sClient) CreateNamespace(namespace v1.Namespace) error {
+func (c K8sClient) CreateNamespace(namespace corev1.Namespace) error {
 	err := c.RunTimeClient.Create(context.Background(), &namespace)
 	return err
 }
 
 // DeleteNamespace deletes a namespace
-func (c K8sClient) DeleteNamespace(namespace v1.Namespace) error {
+func (c K8sClient) DeleteNamespace(namespace corev1.Namespace) error {
 	err := c.RunTimeClient.Delete(context.Background(), &namespace)
 	return err
 }
 
 // CreateConfigMap creates a config map
-func (c K8sClient) CreateConfigMap(configMap v1.ConfigMap) error {
+func (c K8sClient) CreateConfigMap(configMap corev1.ConfigMap) error {
 	err := c.RunTimeClient.Create(context.Background(), &configMap)
 	return err
 }
 
 // DeleteConfigMap deletes the config map
-func (c K8sClient) DeleteConfigMap(configMap v1.ConfigMap) error {
+func (c K8sClient) DeleteConfigMap(configMap corev1.ConfigMap) error {
 	err := c.RunTimeClient.Delete(context.Background(), &configMap)
 	return err
 }
 
 // CreateServiceAccount creates a service account
-func (c K8sClient) CreateServiceAccount(serviceAccount v1.ServiceAccount) error {
+func (c K8sClient) CreateServiceAccount(serviceAccount corev1.ServiceAccount) error {
 	err := c.RunTimeClient.Create(context.Background(), &serviceAccount)
 	return err
 }
 
 // DeleteServiceAc[2050]:4589616count deletes the service account
-func (c K8sClient) DeleteServiceAccount(serviceAccount v1.ServiceAccount) error {
+func (c K8sClient) DeleteServiceAccount(serviceAccount corev1.ServiceAccount) error {
 	err := c.RunTimeClient.Delete(context.Background(), &serviceAccount)
 	return err
 }

diff --git a/pkg/spdk/spdk.go b/pkg/spdk/spdk.go
@@ -103,7 +103,6 @@ func (di *DeviceIdentifier) GetSPDKSuperBlockSignature() (string, error) {
 	spdk = (*C.struct_spdk_bs_super_block)(C.CBytes(buf))
 	defer C.free(unsafe.Pointer(spdk))
 
-	var ptr *C.char
-	ptr = (*C.char)(C.get_signature(spdk))
+	ptr := (*C.char)(C.get_signature(spdk))
 	return C.GoString(ptr), nil
 }
diff --git a/pkg/sysfs/syspath.go b/pkg/sysfs/syspath.go
@@ -317,8 +317,5 @@ func (s Device) GetDeviceType(devType string) (string, error) {
 }
 
 func isDM(devName string) bool {
-	if devName[0:3] == "dm-" {
-		return true
-	}
-	return false
+	return devName[0:3] == "dm-"
 }
diff --git a/pkg/util/strutil.go b/pkg/util/strutil.go
@@ -36,7 +36,7 @@ func Contains(s []string, k string) bool {
 // in array else it returns false. This function is not case sensitive.
 func ContainsIgnoredCase(s []string, k string) bool {
 	for _, e := range s {
-		if strings.ToLower(e) == strings.ToLower(k) {
+		if strings.EqualFold(e,k)  {
 			return true
 		}
 	}