From: Ward Vandewege <ward@curii.com>
Date: Tue, 25 Aug 2020 02:11:09 +0000 (-0400)
Subject: Fix a few gofmt warnings.
X-Git-Tag: 2.1.0~111
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d51eee69da0b9b572b5319d3429267bedb2fb3ae

Fix a few gofmt warnings.

No issue #

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

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index e38a4775e8..3f4fb74822 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -601,7 +601,7 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 		}
 		if len(svc.InternalURLs) == 0 {
 			svc.InternalURLs = map[arvados.URL]arvados.ServiceInstance{
-				arvados.URL{Scheme: "http", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost)), Path: "/"}: arvados.ServiceInstance{},
+				{Scheme: "http", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost)), Path: "/"}: {},
 			}
 		}
 	}
diff --git a/lib/controller/federation/federation_test.go b/lib/controller/federation/federation_test.go
index 256afc8e6b..5079b402b7 100644
--- a/lib/controller/federation/federation_test.go
+++ b/lib/controller/federation/federation_test.go
@@ -38,7 +38,7 @@ func (s *FederationSuite) SetUpTest(c *check.C) {
 		ClusterID:       "aaaaa",
 		SystemRootToken: arvadostest.SystemRootToken,
 		RemoteClusters: map[string]arvados.RemoteCluster{
-			"aaaaa": arvados.RemoteCluster{
+			"aaaaa": {
 				Host: os.Getenv("ARVADOS_API_HOST"),
 			},
 		},
diff --git a/lib/controller/localdb/login_ldap_test.go b/lib/controller/localdb/login_ldap_test.go
index 700d757c27..bce1ecfcf2 100644
--- a/lib/controller/localdb/login_ldap_test.go
+++ b/lib/controller/localdb/login_ldap_test.go
@@ -64,7 +64,7 @@ func (s *LDAPSuite) SetUpSuite(c *check.C) {
 						return []*godap.LDAPSimpleSearchResultEntry{}
 					}
 					return []*godap.LDAPSimpleSearchResultEntry{
-						&godap.LDAPSimpleSearchResultEntry{
+						{
 							DN: "cn=" + req.FilterValue + "," + req.BaseDN,
 							Attrs: map[string]interface{}{
 								"SN":   req.FilterValue,
diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index 5f3cc608c3..fb0fc0d783 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -54,7 +54,7 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
 	s.cluster, err = cfg.GetCluster("")
 	c.Assert(err, check.Equals, nil)
 
-	s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: "localhost:0"}: arvados.ServiceInstance{}}
+	s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{{Host: "localhost:0"}: {}}
 	s.cluster.TLS.Insecure = true
 	s.cluster.Git.GitCommand = "/usr/share/gitolite3/gitolite-shell"
 	s.cluster.Git.GitoliteHome = s.gitoliteHome