fix more linting errors (#161)

Signed-off-by: Raunak <[email protected]>

Author: raunakkumar

connectivity/client.go

@@ -188,7 +188,7 @@ func (client *Client) DoJSON(r *Request) (int, error) {
 			err = decode(res.Body, r.ResponseError, r)
 			if err != nil {
 				log.Error("Failed to decode error response.")
-				r.ResponseError = "Failed to decode error response, Error:" + string(res.StatusCode)
+				r.ResponseError = "Failed to decode error response, Error:" + fmt.Sprintf("%d", res.StatusCode)
 				return res.StatusCode, err
 			}
 		}

dockerplugin/handler/create.go

@@ -6,12 +6,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	log "github.com/hpe-storage/common-host-libs/logger"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
+	log "github.com/hpe-storage/common-host-libs/logger"
+
 	"github.com/hpe-storage/common-host-libs/chapi"
 	"github.com/hpe-storage/common-host-libs/connectivity"
 	"github.com/hpe-storage/common-host-libs/dockerplugin/plugin"
@@ -219,7 +220,7 @@ func VolumeDriverCreate(w http.ResponseWriter, r *http.Request) {
 // Attach the device, Create filesystem on the device
 // nolint : gocyclo
 func createFileSystemOnVolume(vols []*model.Volume, pluginReq *PluginRequest, fsOpts *model.FilesystemOpts) (*model.Device, error) {
-	log.Trace("createFileSystemOnVolume called for %+v", vols)
+	log.Tracef("createFileSystemOnVolume called for %+v", vols)
 	log.Traceln("Vol :", vols, "Host :", pluginReq.Host)
 
 	// obtain chapi client with large timeout of 5 minutes max for creation

dockerplugin/handler/mount.go

@@ -6,18 +6,19 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/hpe-storage/common-host-libs/chapi"
-	"github.com/hpe-storage/common-host-libs/connectivity"
-	"github.com/hpe-storage/common-host-libs/dockerplugin/plugin"
-	"github.com/hpe-storage/common-host-libs/dockerplugin/provider"
-	log "github.com/hpe-storage/common-host-libs/logger"
-	"github.com/hpe-storage/common-host-libs/model"
 	"net/http"
 	"os"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/hpe-storage/common-host-libs/chapi"
+	"github.com/hpe-storage/common-host-libs/connectivity"
+	"github.com/hpe-storage/common-host-libs/dockerplugin/plugin"
+	"github.com/hpe-storage/common-host-libs/dockerplugin/provider"
+	log "github.com/hpe-storage/common-host-libs/logger"
+	"github.com/hpe-storage/common-host-libs/model"
 )
 
 const (
@@ -130,7 +131,7 @@ func VolumeDriverMount(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	volume := volResp.Volume
-	log.Trace("retrieved volume response from container provider for volume: %+v", volume)
+	log.Tracef("retrieved volume response from container provider for volume: %+v", volume)
 
 	//4.  Get mounts from host
 	err = chapiClient.GetMounts(&respMount, volume.SerialNumber)
@@ -480,7 +481,7 @@ func cleanupStaleMounts(containerProviderClient *connectivity.Client, chapiClien
 	// 1. the volume is not in use
 	// 2. the volume is not connected to this iscsi/fc host
 	if !volumeInfo.InUse || (!isCurrentHostAttachedIscsi(volumeInfo, pluginReq) && !isCurrentHostAttachedFC(volumeInfo, pluginReq)) {
-		log.Tracef("device state is %s, execute unmount on existing mounts for device %s", device.State, volumeInfo.InUse, device.MpathName)
+		log.Tracef("device state is %s, execute unmount on existing mounts for device %v %s", device.State, volumeInfo.InUse, device.MpathName)
 		// check if volume is not in use or in use by a different host
 		// iterate through all the mounts and unmount
 		for _, mount := range respMount {

dockerplugin/handler/remove.go

@@ -5,13 +5,14 @@ package handler
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
+	"time"
+
 	"github.com/hpe-storage/common-host-libs/chapi"
 	"github.com/hpe-storage/common-host-libs/connectivity"
 	"github.com/hpe-storage/common-host-libs/dockerplugin/plugin"
 	"github.com/hpe-storage/common-host-libs/dockerplugin/provider"
 	log "github.com/hpe-storage/common-host-libs/logger"
-	"net/http"
-	"time"
 )
 
 //@APIVersion 1.0.0
@@ -70,7 +71,7 @@ func VolumeDriverRemove(w http.ResponseWriter, r *http.Request) {
 	}
 
 	volume := volResp.Volume
-	log.Trace("Volume found :%+v", volume)
+	log.Tracef("Volume found :%+v", volume)
 
 	// Check if the volume has ACR before we attempt to delete the volume
 	log.Tracef("volume status is %+v ", volResp.Volume.Status)

dockerplugin/plugin/plugin.go

@@ -268,7 +268,7 @@ func CreateConfDirectory(confDir string) error {
 	log.Trace("createConfDirectory called with ", confDir)
 	_, isDir, err := util.FileExists(confDir)
 	if err != nil {
-		log.Error("CreateConfDirectory failed for %s, err %s", confDir, err.Error())
+		log.Errorf("CreateConfDirectory failed for %s, err %s", confDir, err.Error())
 		return err
 	}
 	if isDir == false {

linux/device.go

@@ -392,7 +392,7 @@ func setAltFullPathName(dev *model.Device) (err error) {
 
 // Helper function to perform rescan and detect the newly attached volume (FC/iSCSI volume)
 func rescanLoginVolume(volume *model.Volume) error {
-	log.Traceln(">>>>> rescanLoginVolume %v", volume, "and accessProtocol", volume.AccessProtocol)
+	log.Traceln(">>>>> rescanLoginVolume", volume, "and accessProtocol", volume.AccessProtocol)
 	defer log.Traceln("<<<< rescanLoginVolume")
 	var err error
 	var primaryVolObj *model.Volume
@@ -441,7 +441,7 @@ func rescanLoginVolume(volume *model.Volume) error {
 
 func rescanLoginVolumeForBackend(volObj *model.Volume) error {
 
-	log.Traceln("Called rescanLoginVolumeForBackend %v", volObj, "and accessProtocol", volObj.AccessProtocol)
+	log.Traceln("Called rescanLoginVolumeForBackend", volObj, "and accessProtocol", volObj.AccessProtocol)
 	var err error
 	if strings.EqualFold(volObj.AccessProtocol, "fc") {
 		// FC volume

logger/logger_test.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hpe-storage/common-host-libs/logger"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
@@ -151,22 +150,22 @@ func TestInitLogging(t *testing.T) {
 }
 
 func TestInitJaeger(t *testing.T) {
-	_, lg := logger.InitLogging("test.log", nil, true, true)
+	_, lg := InitLogging("test.log", nil, true, true)
 
 	lg.Info("************** Start Workflow 1 **************")
 	lg.Info("********** Workflow 1 Line 1 **********")
 	s := lg.StartContext("Workflow 2")
 	lg.Info("**************** Start Workflow 2 *****************")
 	lg.Info("********** Workflow 2 Line 1 ******************")
-	logger.EndContext(s)
+	EndContext(s)
 	sp := lg.StartContext("Workflow 2")
 	lg.Info("**************** Start Workflow 2 *****************")
 	lg.Info("********** Workflow 2 Line 1 ******************")
-	logger.EndContext(sp)
+	EndContext(sp)
 	sp2 := lg.StartContext("Workflow 3")
 	lg.Info("**************** Start Workflow 3 *****************")
 	lg.Info("********** Workflow 3 Line 1 ******************")
-	logger.EndContext(sp2)
+	EndContext(sp2)
 	lg.CloseTracer()
 
 }

logger/test.log

@@ -0,0 +1,10 @@
+time="2021-08-04T10:13:40-07:00" level=info msg="Initialized logging." alsoLogToStderr=true logFileLocation=test.log logLevel=info
+time="2021-08-04T10:13:40-07:00" level=info msg="Span Context --- Traceid:Spanid:ParentSpanid:Flags  : 11408528cb21a24e:11408528cb21a24e:0000000000000000:1"
+time="2021-08-04T10:13:40-07:00" level=info msg="************** Start Workflow 1 **************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="********** Workflow 1 Line 1 **********" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="**************** Start Workflow 2 *****************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="********** Workflow 2 Line 1 ******************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="**************** Start Workflow 2 *****************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="********** Workflow 2 Line 1 ******************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="**************** Start Workflow 3 *****************" file="logger_test.go:153"
+time="2021-08-04T10:13:40-07:00" level=info msg="********** Workflow 3 Line 1 ******************" file="logger_test.go:153"

storageprovider/csp/container_storage_provider.go

@@ -937,12 +937,12 @@ func getCspClient(credentials *storageprovider.Credentials) (*connectivity.Clien
 	cspURI := fmt.Sprintf("http://%s:%d", credentials.ServiceName, credentials.ServicePort)
 
 	if credentials.CspClientTimeout == 0 {
-		 credentials.CspClientTimeout = storageprovider.DefaultCSPClientTimeout
+		credentials.CspClientTimeout = storageprovider.DefaultCSPClientTimeout
 	}
 	log.Tracef(">>>>> getCspClient (service) using URI %s and username %s with timeout set to %d seconds", cspURI, credentials.Username, credentials.CspClientTimeout)
 	defer log.Trace("<<<<< getCspClient")
 
-	cspHTTPClientTimeout := time.Duration(credentials.CspClientTimeout)*time.Second
+	cspHTTPClientTimeout := time.Duration(credentials.CspClientTimeout) * time.Second
 	// Setup HTTP client to the CSP service
 	cspClient := connectivity.NewHTTPClientWithTimeout(cspURI, cspHTTPClientTimeout)
 	return cspClient, nil

storageprovider/csp/container_storage_provider_test.go

@@ -41,7 +41,7 @@ func getBackend(t *testing.T) string {
 
 // nolint: gocyclo
 func _TestPluginSuite(t *testing.T) {
-	log.InitLogging("container-storage-provider-test.log", nil, false)
+	log.InitLogging("container-storage-provider-test.log", nil, false, false)
 
 	provider := realCsp(t)