Skip to content

Commit

Permalink
Adding changes related to linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@tssushma
tssushma committed Dec 27, 2023
1 parent dcf941b commit bf7918c
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 52 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3705,7 +3705,7 @@ var _ = Describe("CSIControllerService", func() {
RemoteResourceId: validRemoteGroupID,
StorageElementPairs: []gopowerstore.StorageElementPair{{
LocalStorageElementId: validBaseVolID,
RemoteStorageElementId: validRemoteVolId,
RemoteStorageElementId: validRemoteVolID,
}},
}, nil)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/replication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func EnsureReplicationRuleExists(ctx context.Context, arr *array.PowerStoreArray
}

// GetReplicationCapabilities is a getter for replication capabilities
func (s *Service) GetReplicationCapabilities(ctx context.Context, req *csiext.GetReplicationCapabilityRequest) (*csiext.GetReplicationCapabilityResponse, error) {
func (s *Service) GetReplicationCapabilities(_ context.Context, _ *csiext.GetReplicationCapabilityRequest) (*csiext.GetReplicationCapabilityResponse, error) {
rep := new(csiext.GetReplicationCapabilityResponse)
rep.Capabilities = []*csiext.ReplicationCapability{
{
Expand Down Expand Up @@ -337,7 +337,7 @@ func (s *Service) ExecuteAction(ctx context.Context,
}
client := pstoreClient
var execAction gopowerstore.ActionType
var params *gopowerstore.FailoverParams = nil
var params *gopowerstore.FailoverParams = ""

Check failure on line 340 in pkg/controller/replication.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

cannot use "" (untyped string constant) as *gopowerstore.FailoverParams value in variable declaration) (typecheck)

Check failure on line 340 in pkg/controller/replication.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

cannot use "" (untyped string constant) as *gopowerstore.FailoverParams value in variable declaration) (typecheck)

Check failure on line 340 in pkg/controller/replication.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

cannot use "" (untyped string constant) as *gopowerstore.FailoverParams value in variable declaration) (typecheck)

Check failure on line 340 in pkg/controller/replication.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

cannot use "" (untyped string constant) as *gopowerstore.FailoverParams value in variable declaration) (typecheck)

Check failure on line 340 in pkg/controller/replication.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

cannot use "" (untyped string constant) as *gopowerstore.FailoverParams value in variable declaration) (typecheck)
switch action {
case csiext.ActionTypes_FAILOVER_REMOTE.String():
execAction = gopowerstore.RS_ACTION_FAILOVER
Expand Down
6 changes: 3 additions & 3 deletions pkg/identity/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Service struct {
}

// GetPluginInfo returns general information about plugin (driver) such as name, version and manifest
func (s Service) GetPluginInfo(context context.Context, request *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
func (s Service) GetPluginInfo(_ context.Context, _ *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
return &csi.GetPluginInfoResponse{
Name: s.name,
VendorVersion: s.version,
Expand All @@ -54,7 +54,7 @@ func (s Service) GetPluginInfo(context context.Context, request *csi.GetPluginIn
}

// GetPluginCapabilities returns capabilities that are supported by the driver
func (s Service) GetPluginCapabilities(context context.Context, request *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
func (s Service) GetPluginCapabilities(_ context.Context, _ *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
var rep csi.GetPluginCapabilitiesResponse
rep.Capabilities = []*csi.PluginCapability{
{
Expand Down Expand Up @@ -91,6 +91,6 @@ func (s Service) GetPluginCapabilities(context context.Context, request *csi.Get
}

// Probe returns current state of the driver and if it is ready to receive requests
func (s Service) Probe(context context.Context, request *csi.ProbeRequest) (*csi.ProbeResponse, error) {
func (s Service) Probe(_ context.Context, _ *csi.ProbeRequest) (*csi.ProbeResponse, error) {
return &csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: s.ready}}, nil
}
10 changes: 5 additions & 5 deletions pkg/interceptors/interceptors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type lockProvider struct {
volNameLocks map[string]gosync.TryLocker
}

func (i *lockProvider) GetLockWithID(ctx context.Context, id string) (gosync.TryLocker, error) {
func (i *lockProvider) GetLockWithID(_ context.Context, id string) (gosync.TryLocker, error) {
i.volIDLocksL.Lock()
defer i.volIDLocksL.Unlock()

Expand All @@ -92,7 +92,7 @@ func (i *lockProvider) GetLockWithID(ctx context.Context, id string) (gosync.Try
return lock, nil
}

func (i *lockProvider) GetLockWithName(ctx context.Context, name string) (gosync.TryLocker, error) {
func (i *lockProvider) GetLockWithName(_ context.Context, name string) (gosync.TryLocker, error) {
i.volNameLocksL.Lock()
defer i.volNameLocksL.Unlock()

Expand Down Expand Up @@ -168,7 +168,7 @@ func (i *interceptor) createMetadataRetrieverClient(ctx context.Context) {
const pending = "pending"

func (i *interceptor) nodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest,
info *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
_ *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
) (res interface{}, resErr error) {
lock, err := i.opts.locker.GetLockWithID(ctx, req.VolumeId)
if err != nil {
Expand All @@ -188,7 +188,7 @@ func (i *interceptor) nodeStageVolume(ctx context.Context, req *csi.NodeStageVol
}

func (i *interceptor) nodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest,
info *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
_ *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
) (res interface{}, resErr error) {
lock, err := i.opts.locker.GetLockWithID(ctx, req.VolumeId)
if err != nil {
Expand All @@ -206,7 +206,7 @@ func (i *interceptor) nodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
}

func (i *interceptor) createVolume(ctx context.Context, req *csi.CreateVolumeRequest,
info *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
_ *grpc.UnaryServerInfo, handler grpc.UnaryHandler,
) (res interface{}, resErr error) {
lock, err := i.opts.locker.GetLockWithID(ctx, req.Name)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/node/base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ func getTargetMount(ctx context.Context, target string, fs fs.Interface) (gofsut
return targetMount, found, nil
}

func getMounts(ctx context.Context, fs fs.Interface) ([]gofsutil.Info, error) {
func getMounts(_ context.Context, fs fs.Interface) ([]gofsutil.Info, error) {
data, err := consistentRead(procMountsPath, procMountsRetries, fs)
if err != nil {
return []gofsutil.Info{}, err
Expand Down Expand Up @@ -349,7 +349,7 @@ func getRWModeString(isRO bool) string {
return "rw"
}

func format(ctx context.Context, source, fsType string, fs fs.Interface, opts ...string) error {
func format(_ context.Context, source, fsType string, fs fs.Interface, opts ...string) error {
f := log.Fields{
"source": source,
"fsType": fsType,
Expand Down
28 changes: 13 additions & 15 deletions pkg/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ func (s *Service) nodeExpandRawBlockVolume(ctx context.Context, volumeWWN string
}

// NodeGetCapabilities returns supported features by the node service
func (s *Service) NodeGetCapabilities(context context.Context, request *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
func (s *Service) NodeGetCapabilities(_ context.Context, _ *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
newCap := func(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
return &csi.NodeServiceCapability{
Type: &csi.NodeServiceCapability_Rpc{
Expand Down Expand Up @@ -1034,7 +1034,7 @@ func (s *Service) NodeGetCapabilities(context context.Context, request *csi.Node
}

// NodeGetInfo returns id of the node and topology constraints
func (s *Service) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
func (s *Service) NodeGetInfo(ctx context.Context, _ *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
// Create the topology keys
// <driver name>/<endpoint>-<protocol>: true
resp := &csi.NodeGetInfoResponse{
Expand Down Expand Up @@ -1066,16 +1066,15 @@ func (s *Service) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest)
if err != nil {
log.Errorf("couldn't discover NVMeFC targets")
continue
} else {
for _, target := range NVMeFCTargets {
err = s.nvmeLib.NVMeFCConnect(target, false)
if err != nil {
log.Errorf("couldn't connect to NVMeFC target")
} else {
nvmefcConnectCount = nvmefcConnectCount + 1
otherTargets := s.nvmeTargets[arr.GlobalID]
s.nvmeTargets[arr.GlobalID] = append(otherTargets, target.TargetNqn)
}
}
for _, target := range NVMeFCTargets {
err = s.nvmeLib.NVMeFCConnect(target, false)
if err != nil {
log.Errorf("couldn't connect to NVMeFC target")
} else {
nvmefcConnectCount = nvmefcConnectCount + 1
otherTargets := s.nvmeTargets[arr.GlobalID]
s.nvmeTargets[arr.GlobalID] = append(otherTargets, target.TargetNqn)
}
}
}
Expand Down Expand Up @@ -1173,9 +1172,8 @@ func (s *Service) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest)
continue
}
break
} else {
log.Debugf("Portal %s is not rechable from the node", address.Portal)
}
log.Debugf("Portal %s is not rechable from the node", address.Portal)
}
// login is also performed as a part of ConnectVolume by using dynamically created chap credentials, In case if it fails here
if len(iscsiTargets) > 0 {
Expand Down Expand Up @@ -1212,7 +1210,7 @@ func (s *Service) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest)
}
}

var maxVolumesPerNode int64 = 0
var maxVolumesPerNode int64

// Setting maxVolumesPerNode using the value of field maxPowerstoreVolumesPerNode specified in values.yaml
if s.opts.MaxVolumesPerNode > 0 {
Expand Down
44 changes: 21 additions & 23 deletions pkg/node/node_connectivity_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *Service) startAPIService(ctx context.Context) {
}

// apiRouter serves http requests
func (s *Service) apiRouter(ctx context.Context) {
func (s *Service) apiRouter(_ context.Context) {
log.Infof("starting http server on port %s", common.APIPort)
// create a new mux router
router := mux.NewRouter()
Expand All @@ -76,7 +76,7 @@ func (s *Service) apiRouter(ctx context.Context) {
}

// connectivityStatus handler returns array connectivity status
func connectivityStatus(w http.ResponseWriter, r *http.Request) {
func connectivityStatus(w http.ResponseWriter, _ *http.Request) {
log.Infof("connectivityStatus called, status is %v \n", probeStatus)
// w.Header().Set("Content-Type", "application/json")
if probeStatus == nil {
Expand Down Expand Up @@ -211,7 +211,7 @@ func (s *Service) testConnectivityAndUpdateStatus(ctx context.Context, array *ar
}

// nodeProbe function used to store the status of array
func (s *Service) nodeProbe(timeOutCtx context.Context, array *array.PowerStoreArray) error {
func (s *Service) nodeProbe(_ context.Context, array *array.PowerStoreArray) error {
// try to get the host
host, err := array.Client.GetHostByName(context.Background(), s.nodeID)
// possibly NFS could be there.
Expand Down Expand Up @@ -255,28 +255,27 @@ func (s *Service) nodeProbe(timeOutCtx context.Context, array *array.PowerStoreA
}
}
return fmt.Errorf("no active fc sessions")
} else {
// check if iscsi sessions are active
// if !s.useNVME && !s.useFC {
log.Debugf("Checking if iscsi sessions are active on node or not")
sessions, _ := s.iscsiLib.GetSessions()
for _, target := range s.iscsiTargets[array.GlobalID] {
for _, session := range sessions {
log.Debugf("matching %v with %v", target, session)
if session.Target == target && session.ISCSISessionState == goiscsi.ISCSISessionStateLOGGEDIN {
if s.useNFS {
s.useNFS = false
}
return nil
}
// check if iscsi sessions are active
// if !s.useNVME && !s.useFC {
log.Debugf("Checking if iscsi sessions are active on node or not")
sessions, _ := s.iscsiLib.GetSessions()
for _, target := range s.iscsiTargets[array.GlobalID] {
for _, session := range sessions {
log.Debugf("matching %v with %v", target, session)
if session.Target == target && session.ISCSISessionState == goiscsi.ISCSISessionStateLOGGEDIN {
if s.useNFS {
s.useNFS = false
}
return nil
}
}
if s.useNFS {
log.Infof("Host Entry found but failed to login to iscsi target, seems to be this worker has only NFS")
return nil
}
return fmt.Errorf("no active iscsi sessions")
}
if s.useNFS {
log.Infof("Host Entry found but failed to login to iscsi target, seems to be this worker has only NFS")
return nil
}
return fmt.Errorf("no active iscsi sessions")
}

// populateTargetsInCache checks if nvmeTargets or iscsiTargets in cache is empty, try to fetch the targets from array and populate the cache
Expand Down Expand Up @@ -355,9 +354,8 @@ func (s *Service) populateTargetsInCache(array *array.PowerStoreArray) {
s.iscsiTargets[array.GlobalID] = append(otherTargets, target.Target)
}
break
} else {
log.Debugf("Portal %s is not rechable from the node", address.Portal)
}
log.Debugf("Portal %s is not rechable from the node", address.Portal)
}

}
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/publisher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (sp *SCSIPublisher) Publish(ctx context.Context, logFields log.Fields, fs f
return sp.publishMount(ctx, logFields, fs, cap, isRO, targetPath, stagingPath)
}

func (sp *SCSIPublisher) publishBlock(ctx context.Context, logFields log.Fields, fs fs.Interface, cap *csi.VolumeCapability, isRO bool, targetPath string, stagingPath string) (*csi.NodePublishVolumeResponse, error) {
func (sp *SCSIPublisher) publishBlock(ctx context.Context, logFields log.Fields, fs fs.Interface, _ *csi.VolumeCapability, isRO bool, targetPath string, stagingPath string) (*csi.NodePublishVolumeResponse, error) {
log.WithFields(logFields).Info("start publishing as block device")

if isRO {
Expand Down

0 comments on commit bf7918c

Please sign in to comment.