Fix more golint warnings.

No issue #

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

diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index 2da7ca5ccf98e14a6c2cb32d4602ecb81eb68101..5f96da56244325d86b3e9d4f252ec714f55f534c 100644 (file)
--- a/lib/controller/localdb/login_oidc.go
+++ b/lib/controller/localdb/login_oidc.go
@@ -390,9 +390,8 @@ func (ta *oidcTokenAuthorizer) registerToken(ctx context.Context, tok string) er
                // cached negative result (value is expiry time)
                if time.Now().Before(exp) {
                        return nil
                // cached negative result (value is expiry time)
                if time.Now().Before(exp) {
                        return nil

-               } else {
-                       ta.cache.Remove(tok)

                }
                }

+               ta.cache.Remove(tok)

        } else {
                // cached positive result
                aca := cached.(arvados.APIClientAuthorization)
        } else {
                // cached positive result
                aca := cached.(arvados.APIClientAuthorization)

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 901fda22897cd301d60539c372d77bc6815a799e..a81cf505294e0ce1bbc442da3b844d4cb5c5b073 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
 //
 // SPDX-License-Identifier: Apache-2.0
 

-// package service provides a cmd.Handler that brings up a system service.
+// Package service provides a cmd.Handler that brings up a system service.

 package service
 
 import (
 package service
 
 import (

diff --git a/services/keep-web/s3aws_test.go b/services/keep-web/s3aws_test.go
index d3db94e5db6c2ad62f59c347c441ad821b0ef1bb..d528dbaf79894807ba0120d58dd1fbd65c60cbd4 100644 (file)
--- a/services/keep-web/s3aws_test.go
+++ b/services/keep-web/s3aws_test.go
@@ -34,9 +34,8 @@ func (s *IntegrationSuite) TestS3AWSSDK(c *check.C) {
                                URL:           "http://" + s.testServer.Addr,
                                SigningRegion: "custom-signing-region",
                        }, nil
                                URL:           "http://" + s.testServer.Addr,
                                SigningRegion: "custom-signing-region",
                        }, nil

-               } else {
-                       return endpoints.NewDefaultResolver().ResolveEndpoint(service, region)

                }
                }

+               return endpoints.NewDefaultResolver().ResolveEndpoint(service, region)

        })
        client := s3.New(cfg)
        client.ForcePathStyle = true
        })
        client := s3.New(cfg)
        client.ForcePathStyle = true