[ARVADOS] updated: 2.1.0-63-ga84890bb3
Git user
git at public.arvados.org
Sun Oct 25 15:43:10 UTC 2020
Summary of changes:
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(-)
via a84890bb3791f3df021afc79ccfaf15698696e93 (commit)
from c4040df1bab985a8490d24ac9dd027de4c118a53 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a84890bb3791f3df021afc79ccfaf15698696e93
Author: Ward Vandewege <ward at curii.com>
Date: Sun Oct 25 11:42:59 2020 -0400
Fix more golint warnings.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index 2da7ca5cc..5f96da562 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 901fda228..a81cf5052 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 d3db94e5d..d528dbaf7 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list