Skip to content

Commit

Permalink
ci: non-constant format string (govet)
Browse files Browse the repository at this point in the history 
Signed-off-by: Praveen M <[email protected]>
  • Loading branch information
@iPraveenParihar
iPraveenParihar committed Jan 2, 2025
1 parent 2578b99 commit 3dd1f73
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 57 deletions.
30 changes: 16 additions & 14 deletions e2e/cephfs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ var _ = Describe(cephfsType, func() {

err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
}
})

Expand Down Expand Up @@ -261,7 +261,7 @@ var _ = Describe(cephfsType, func() {

err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
}

if deployCephFS {
Expand Down Expand Up @@ -768,7 +768,7 @@ var _ = Describe(cephfsType, func() {
for i := range deplPods {
err = ensureStatSucceeds(deplPods[i].Name)
if err != nil {
framework.Failf(err.Error())
framework.Failf("ensureStatSucceeds failed for pod %q: %v", deplPods[i].Name, err.Error())
}
}
// Kill ceph-fuse in cephfs-csi node plugin Pods.
Expand Down Expand Up @@ -797,12 +797,12 @@ var _ = Describe(cephfsType, func() {
// the pod with hopefully mounts working again.
err = deletePod(pod2Name, depl.Namespace, c, deployTimeout)
if err != nil {
framework.Failf(err.Error())
framework.Failf("failed to delete pod %s: %v", pod2Name, err.Error())
}
// Wait for the second Pod to be recreated.
err = waitForDeploymentComplete(c, depl.Name, depl.Namespace, deployTimeout)
if err != nil {
framework.Failf(err.Error())
framework.Failf("timeout waiting for deployment %s: %v", depl.Name, err.Error())
}
// List Deployment's pods again to get name of the new pod.
deplPods, err = listPods(f, depl.Namespace, &metav1.ListOptions{
Expand All @@ -828,7 +828,7 @@ var _ = Describe(cephfsType, func() {
// Verify Pod pod2Name has its ceph-fuse mount working again.
err = ensureStatSucceeds(pod2Name)
if err != nil {
framework.Failf(err.Error())
framework.Failf("ensureStatSucceeds failed for pod %q: %v", pod2Name, err.Error())
}

// Delete created resources.
Expand Down Expand Up @@ -967,11 +967,11 @@ var _ = Describe(cephfsType, func() {

err = createSubvolumegroup(f, fileSystemName, subvolgrp1)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp1, err)
}
err = createSubvolumegroup(f, fileSystemName, subvolgrp2)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp2, err)
}
err = createCustomConfigMap(f.ClientSet, cephFSDirPath, clusterInfo)
if err != nil {
Expand Down Expand Up @@ -1019,11 +1019,11 @@ var _ = Describe(cephfsType, func() {
}
err = deleteSubvolumegroup(f, fileSystemName, subvolgrp1)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp1, err)
}
err = deleteSubvolumegroup(f, fileSystemName, subvolgrp2)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp2, err)
}
err = deleteConfigMap(cephFSDirPath)
if err != nil {
Expand Down Expand Up @@ -1076,14 +1076,15 @@ var _ = Describe(cephfsType, func() {
}

filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' >" + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' >"+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}

// delete PVC and app
Expand Down Expand Up @@ -2406,14 +2407,15 @@ var _ = Describe(cephfsType, func() {
}

filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}

// delete cloned ROX pvc and app
Expand Down
9 changes: 5 additions & 4 deletions e2e/nfs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ var _ = Describe("nfs", func() {

err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
}
})

Expand Down Expand Up @@ -320,7 +320,7 @@ var _ = Describe("nfs", func() {
}
err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
}

if deployNFS {
Expand Down Expand Up @@ -607,14 +607,15 @@ var _ = Describe("nfs", func() {
}

filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}

// delete PVC and app
Expand Down
19 changes: 11 additions & 8 deletions e2e/rbd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@ var _ = Describe("RBD", func() {
}
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}

Expand Down Expand Up @@ -1798,7 +1798,7 @@ var _ = Describe("RBD", func() {
}
readOnlyErr := fmt.Sprintf("'%s': Operation not permitted", devPath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}
err = deletePVCAndDeploymentApp(f, pvcClone, appClone)
Expand Down Expand Up @@ -3350,14 +3350,15 @@ var _ = Describe("RBD", func() {
}

filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
appClone.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}

Expand Down Expand Up @@ -3464,14 +3465,15 @@ var _ = Describe("RBD", func() {
}

filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
appClone.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}

Expand Down Expand Up @@ -4126,14 +4128,15 @@ var _ = Describe("RBD", func() {
}

filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}

// delete PVC and app
Expand Down
2 changes: 1 addition & 1 deletion e2e/rbd_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
return true, nil
}
errReason = fmt.Errorf("found %d images found in trash. Image details %v", len(imagesInTrash), imagesInTrash)
framework.Logf(errReason.Error())
framework.Logf("%v", errReason.Error())

return false, nil
})
Expand Down
2 changes: 1 addition & 1 deletion e2e/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func validateOmapCount(f *framework.Framework, count int, driver, pool, mode str
framework.Logf("additional debug info: rados ls command output: %s, stdErr: %s", stdOut, stdErr)
}
}
framework.Failf("%v", saveErr)
framework.Fail(saveErr.Error())
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions internal/cephfs/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (fs *Driver) Run(conf *util.Config) {
if conf.IsNodeServer && k8s.RunsOnKubernetes() {
nodeLabels, err = k8s.GetNodeLabels(conf.NodeID)
if err != nil {
log.FatalLogMsg(err.Error())
log.FatalLogMsg("%v", err.Error())
}
}

Expand Down Expand Up @@ -159,7 +159,7 @@ func (fs *Driver) Run(conf *util.Config) {
if conf.IsNodeServer {
topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
if err != nil {
log.FatalLogMsg(err.Error())
log.FatalLogMsg("%v", err.Error())
}
fs.ns = NewNodeServer(
fs.cd, conf.Vtype,
Expand All @@ -176,7 +176,7 @@ func (fs *Driver) Run(conf *util.Config) {
if !conf.IsControllerServer && !conf.IsNodeServer {
topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
if err != nil {
log.FatalLogMsg(err.Error())
log.FatalLogMsg("%v", err.Error())
}
fs.ns = NewNodeServer(
fs.cd, conf.Vtype,
Expand All @@ -189,7 +189,7 @@ func (fs *Driver) Run(conf *util.Config) {
// configure CSI-Addons server and components
err = fs.setupCSIAddonsServer(conf)
if err != nil {
log.FatalLogMsg(err.Error())
log.FatalLogMsg("%v", err.Error())
}

server := csicommon.NewNonBlockingGRPCServer()
Expand Down
4 changes: 2 additions & 2 deletions internal/cephfs/nodeserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func getBackingSnapshotRoot(
if err != nil {
log.ErrorLog(ctx, "failed to open %s when searching for snapshot root: %v", snapshotsBase, err)

return "", status.Errorf(codes.Internal, err.Error())
return "", status.Error(codes.Internal, err.Error())
}
defer dir.Close()

Expand All @@ -446,7 +446,7 @@ func getBackingSnapshotRoot(
if err != nil {
log.ErrorLog(ctx, "failed to read %s when searching for snapshot root: %v", snapshotsBase, err)

return "", status.Errorf(codes.Internal, err.Error())
return "", status.Error(codes.Internal, err.Error())
}

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/persistentvolume/persistentvolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (r *ReconcilePersistentVolume) getCredentials(

if name == "" || namespace == "" {
errStr := "secret name or secret namespace is empty"
log.ErrorLogMsg(errStr)
log.ErrorLogMsg("%v", errStr)

return nil, errors.New(errStr)
}
Expand Down
4 changes: 2 additions & 2 deletions internal/csi-addons/rbd/encryptionkeyrotation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ func (ekrs *EncryptionKeyRotationServer) EncryptionKeyRotate(
err = status.Errorf(codes.NotFound, "volume ID %s not found", volID)
case errors.Is(err, util.ErrPoolNotFound):
log.ErrorLog(ctx, "failed to get backend volume for %s: %v", volID, err)
err = status.Errorf(codes.NotFound, err.Error())
err = status.Error(codes.NotFound, err.Error())
default:
err = status.Errorf(codes.Internal, err.Error())
err = status.Error(codes.Internal, err.Error())
}

return nil, err
Expand Down
10 changes: 5 additions & 5 deletions internal/csi-addons/rbd/replication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func getForceOption(ctx context.Context, parameters map[string]string) (bool, er
}
force, err := strconv.ParseBool(val)
if err != nil {
return false, status.Errorf(codes.Internal, err.Error())
return false, status.Error(codes.Internal, err.Error())
}

return force, nil
Expand Down Expand Up @@ -636,7 +636,7 @@ func (rs *ReplicationServer) ResyncVolume(ctx context.Context,
// it takes time for this operation.
log.ErrorLog(ctx, err.Error())

return nil, status.Errorf(codes.Aborted, err.Error())
return nil, status.Error(codes.Aborted, err.Error())
}

if info.GetState() != librbd.MirrorImageEnabled.String() {
Expand Down Expand Up @@ -832,11 +832,11 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
if err != nil {
switch {
case errors.Is(err, corerbd.ErrImageNotFound):
err = status.Errorf(codes.NotFound, err.Error())
err = status.Error(codes.NotFound, err.Error())
case errors.Is(err, util.ErrPoolNotFound):
err = status.Errorf(codes.NotFound, err.Error())
err = status.Error(codes.NotFound, err.Error())
default:
err = status.Errorf(codes.Internal, err.Error())
err = status.Error(codes.Internal, err.Error())
}

return nil, err
Expand Down
2 changes: 1 addition & 1 deletion internal/liveness/liveness.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func recordLiveness(endpoint, drivername string, pollTime, timeout time.Duration
// register prometheus metrics
err := prometheus.Register(liveness)
if err != nil {
log.FatalLogMsg(err.Error())
log.FatalLogMsg("%v", err.Error())
}

csiConn, err := connlib.Connect(context.Background(), endpoint, liveMetricsManager)
Expand Down
Loading

0 comments on commit 3dd1f73

Please sign in to comment.