cleanup: address ifshort linter issues

This commit addresses ifshort linter issues which
checks if short syntax for if-statements is possible.

updates: #1586

Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
Rakshith R 2021-05-06 15:19:27 +05:30 committed by mergify[bot]
parent 6618e2012d
commit b891e5585d
9 changed files with 10 additions and 19 deletions

View File

@ -210,8 +210,7 @@ func execCommandInPodAndAllowFail(f *framework.Framework, c, ns string, opt *met
func loadApp(path string) (*v1.Pod, error) {
app := v1.Pod{}
err := unmarshal(path, &app)
if err != nil {
if err := unmarshal(path, &app); err != nil {
return nil, err
}
for i := range app.Spec.Containers {

View File

@ -27,8 +27,7 @@ func upgradeCSI(version string) error {
// upgradeAndDeployCSI upgrades the CSI to a specific release.
func upgradeAndDeployCSI(version, testtype string) error {
err := upgradeCSI(version)
if err != nil {
if err := upgradeCSI(version); err != nil {
return fmt.Errorf("failed to upgrade driver %w", err)
}
switch testtype {

View File

@ -153,8 +153,7 @@ var id uint64
func contextIDInjector(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
atomic.AddUint64(&id, 1)
ctx = context.WithValue(ctx, util.CtxKey, id)
reqID := getReqID(req)
if reqID != "" {
if reqID := getReqID(req); reqID != "" {
ctx = context.WithValue(ctx, util.ReqID, reqID)
}
return handler(ctx, req)

View File

@ -278,7 +278,7 @@ func (rv *rbdVolume) Exists(ctx context.Context, parentVol *rbdVolume) (bool, er
// NOTE: Return volsize should be on-disk volsize, not request vol size, so
// save it for size checks before fetching image data
requestSize := rv.VolSize
requestSize := rv.VolSize //nolint:ifshort // FIXME: rename and split function into helpers
// Fetch on-disk image attributes and compare against request
err = rv.getImageInfo()
if err != nil {

View File

@ -156,8 +156,7 @@ func (cp *ConnPool) Get(monitors, user, keyfile string) (*rados.Conn, error) {
cp.lock.Lock()
defer cp.lock.Unlock()
oldConn := cp.getConn(unique)
if oldConn != nil {
if oldConn := cp.getConn(unique); oldConn != nil {
// there was a race, oldConn already exists
ce.destroy()
return oldConn, nil

View File

@ -62,8 +62,7 @@ func (cp *ConnPool) fakeGet(monitors, user, keyfile string) (*rados.Conn, string
cp.lock.Lock()
defer cp.lock.Unlock()
oldConn := cp.getConn(unique)
if oldConn != nil {
if oldConn := cp.getConn(unique); oldConn != nil {
// there was a race, oldConn already exists
ce.destroy()
return oldConn, unique, nil

View File

@ -64,8 +64,7 @@ func TestJoinErrors(t *testing.T) {
assertErrorIs(x, errFoo, false)
assertErrorIs(x, errBar, true)
s1 := "w{w{w{x}}: w{w{foo: bar}}}"
s2 := w1w2Xw2FooBar.Error()
if s1 != s2 {
if s2 := w1w2Xw2FooBar.Error(); s1 != s2 {
t.Errorf("%s != %s", s1, s2)
}
}

View File

@ -47,9 +47,8 @@ func RoundOffVolSize(size int64) int64 {
// size less than 1MiB will be round off to 1MiB.
func RoundOffBytes(bytes int64) int64 {
var num int64
floatBytes := float64(bytes)
// round off the value if its in decimal
if floatBytes < helpers.GiB {
if floatBytes := float64(bytes); floatBytes < helpers.GiB {
num = int64(math.Ceil(floatBytes / helpers.MiB))
num *= helpers.MiB
} else {
@ -142,8 +141,7 @@ func ValidateDriverName(driverName string) error {
// 'utsname' structs 'release' component.
func GetKernelVersion() (string, error) {
utsname := unix.Utsname{}
err := unix.Uname(&utsname)
if err != nil {
if err := unix.Uname(&utsname); err != nil {
return "", err
}
return strings.TrimRight(string(utsname.Release[:]), "\x00"), nil

View File

@ -188,8 +188,7 @@ func initVaultTokensKMS(args KMSInitializerArgs) (EncryptionKMS, error) {
var err error
config := args.Config
_, ok := config[kmsProviderKey]
if ok {
if _, ok := config[kmsProviderKey]; ok {
// configuration comes from the ConfigMap, needs to be
// converted to vaultTokenConf type
config, err = transformConfig(config)