From a84890bb3791f3df021afc79ccfaf15698696e93 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Sun, 25 Oct 2020 11:42:59 -0400 Subject: [PATCH] Fix more golint warnings. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- lib/controller/localdb/login_oidc.go | 3 +-- lib/service/cmd.go | 2 +- services/keep-web/s3aws_test.go | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go index 2da7ca5ccf..5f96da5624 100644 --- 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 - } else { - ta.cache.Remove(tok) } + ta.cache.Remove(tok) } else { // cached positive result aca := cached.(arvados.APIClientAuthorization) diff --git a/lib/service/cmd.go b/lib/service/cmd.go index 901fda2289..a81cf50529 100644 --- a/lib/service/cmd.go +++ b/lib/service/cmd.go @@ -2,7 +2,7 @@ // // 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 ( diff --git a/services/keep-web/s3aws_test.go b/services/keep-web/s3aws_test.go index d3db94e5db..d528dbaf79 100644 --- 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 - } else { - return endpoints.NewDefaultResolver().ResolveEndpoint(service, region) } + return endpoints.NewDefaultResolver().ResolveEndpoint(service, region) }) client := s3.New(cfg) client.ForcePathStyle = true -- 2.30.2