Fix more golint warnings.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/lib/crunchrun/logging.go b/lib/crunchrun/logging.go
index d5de184e5c41bf8e9dc434fe226d8d5ed17fa1f9..febfb1404d32b4f59776a97c45692d7b5c5ab0a9 100644 (file)
--- a/lib/crunchrun/logging.go
+++ b/lib/crunchrun/logging.go
@@ -368,9 +368,8 @@ func (arvlog *ArvLogWriter) rateLimit(line []byte, now time.Time) (bool, []byte)
                // instead of the log message that exceeded the limit.
                message += " A complete log is still being written to Keep, and will be available when the job finishes."
                return true, []byte(message)
-       } else {
-               return arvlog.logThrottleIsOpen, line
        }
+       return arvlog.logThrottleIsOpen, line
 }
 
 // load the rate limit discovery config parameters

diff --git a/sdk/go/arvados/fs_base.go b/sdk/go/arvados/fs_base.go
index 5e57fed3beab3281b1d498936edb4eed813398ec..aa75fee7c4d0f5bf47826d12300b51cdcf08a424 100644 (file)
--- a/sdk/go/arvados/fs_base.go
+++ b/sdk/go/arvados/fs_base.go
@@ -598,9 +598,8 @@ func (fs *fileSystem) remove(name string, recursive bool) error {
 func (fs *fileSystem) Sync() error {
        if syncer, ok := fs.root.(syncer); ok {
                return syncer.Sync()
-       } else {
-               return ErrInvalidOperation
        }
+       return ErrInvalidOperation
 }
 
 func (fs *fileSystem) Flush(string, bool) error {

diff --git a/sdk/go/arvados/fs_collection.go b/sdk/go/arvados/fs_collection.go
index 060b57b493cbf555d4d87d9b71db4f6171ff85b8..d4429f5d72026bbfe9cfb142a9b33e21429ed074 100644 (file)
--- a/sdk/go/arvados/fs_collection.go
+++ b/sdk/go/arvados/fs_collection.go
@@ -109,16 +109,15 @@ func (fs *collectionFileSystem) newNode(name string, perm os.FileMode, modTime t
                                inodes: make(map[string]inode),
                        },
                }, nil
-       } else {
-               return &filenode{
-                       fs: fs,
-                       fileinfo: fileinfo{
-                               name:    name,
-                               mode:    perm & ^os.ModeDir,
-                               modTime: modTime,
-                       },
-               }, nil
        }
+       return &filenode{
+               fs: fs,
+               fileinfo: fileinfo{
+                       name:    name,
+                       mode:    perm & ^os.ModeDir,
+                       modTime: modTime,
+               },
+       }, nil
 }
 
 func (fs *collectionFileSystem) Child(name string, replace func(inode) (inode, error)) (inode, error) {
@@ -802,9 +801,8 @@ func (dn *dirnode) commitBlock(ctx context.Context, refs []fnSegmentRef, bufsize
        }()
        if sync {
                return <-errs
-       } else {
-               return nil
        }
+       return nil
 }
 
 type flushOpts struct {

diff --git a/sdk/go/health/handler_test.go b/sdk/go/health/handler_test.go
index c9f6a0b675b17b6de869198008054793bae7f141..097e292d386bc540b1955d37ce1506afbef3e933 100644 (file)
--- a/sdk/go/health/handler_test.go
+++ b/sdk/go/health/handler_test.go
@@ -81,9 +81,8 @@ func (s *Suite) TestPingOverride(c *check.C) {
                                ok = !ok
                                if ok {
                                        return nil
-                               } else {
-                                       return errors.New("good error")
                                }
+                               return errors.New("good error")
                        },
                },
        }

diff --git a/sdk/go/httpserver/logger.go b/sdk/go/httpserver/logger.go
index 59981e3e55265be4eed1827d3570391533ac3a30..5336488df0508039e968d9434cae343f66b26c63 100644 (file)
--- a/sdk/go/httpserver/logger.go
+++ b/sdk/go/httpserver/logger.go
@@ -64,9 +64,8 @@ func rewrapResponseWriter(w http.ResponseWriter, wrapped http.ResponseWriter) ht
                        http.ResponseWriter
                        http.Hijacker
                }{w, hijacker}
-       } else {
-               return w
        }
+       return w
 }
 
 func Logger(req *http.Request) logrus.FieldLogger {