Fix a few gofmt warnings.

No issue #

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

diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index ba8a836dd06aa6a30658a6cf5f7516ca178a815e..7f949d9bdb3e2fb83c539a0df5f15efec6ca2612 100644 (file)
--- a/lib/cloud/azure/azure.go
+++ b/lib/cloud/azure/azure.go
@@ -419,7 +419,7 @@ func (az *azureInstanceSet) Create(
                Tags:     tags,
                InterfacePropertiesFormat: &network.InterfacePropertiesFormat{
                        IPConfigurations: &[]network.InterfaceIPConfiguration{
-                               network.InterfaceIPConfiguration{
+                               {
                                        Name: to.StringPtr("ip1"),
                                        InterfaceIPConfigurationPropertiesFormat: &network.InterfaceIPConfigurationPropertiesFormat{
                                                Subnet: &network.Subnet{
@@ -501,7 +501,7 @@ func (az *azureInstanceSet) Create(
                        StorageProfile: storageProfile,
                        NetworkProfile: &compute.NetworkProfile{
                                NetworkInterfaces: &[]compute.NetworkInterfaceReference{
-                                       compute.NetworkInterfaceReference{
+                                       {
                                                ID: nic.ID,
                                                NetworkInterfaceReferenceProperties: &compute.NetworkInterfaceReferenceProperties{
                                                        Primary: to.BoolPtr(true),

diff --git a/lib/dispatchcloud/test/queue.go b/lib/dispatchcloud/test/queue.go
index 74b84122f286d912d8f8ef392e3eb860e6b1831d..8a8f686e168ff6372f0c19813d31cd2ced26509c 100644 (file)
--- a/lib/dispatchcloud/test/queue.go
+++ b/lib/dispatchcloud/test/queue.go
@@ -185,18 +185,18 @@ func (q *Queue) Notify(upd arvados.Container) bool {
 }
 
 var allowContainerUpdate = map[arvados.ContainerState]map[arvados.ContainerState]bool{
-       arvados.ContainerStateQueued: map[arvados.ContainerState]bool{
+       arvados.ContainerStateQueued: {
                arvados.ContainerStateQueued:    true,
                arvados.ContainerStateLocked:    true,
                arvados.ContainerStateCancelled: true,
        },
-       arvados.ContainerStateLocked: map[arvados.ContainerState]bool{
+       arvados.ContainerStateLocked: {
                arvados.ContainerStateQueued:    true,
                arvados.ContainerStateLocked:    true,
                arvados.ContainerStateRunning:   true,
                arvados.ContainerStateCancelled: true,
        },
-       arvados.ContainerStateRunning: map[arvados.ContainerState]bool{
+       arvados.ContainerStateRunning: {
                arvados.ContainerStateRunning:   true,
                arvados.ContainerStateCancelled: true,
                arvados.ContainerStateComplete:  true,

diff --git a/services/arv-git-httpd/auth_handler_test.go b/services/arv-git-httpd/auth_handler_test.go
index 4b8f95ef334fd4a0323d242ae023c2846fe4e128..4e1a47dcb25bdff037f05b382e953a4b6627b1fe 100644 (file)
--- a/services/arv-git-httpd/auth_handler_test.go
+++ b/services/arv-git-httpd/auth_handler_test.go
@@ -44,7 +44,7 @@ func (s *AuthHandlerSuite) 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/bin/git"
        s.cluster.Git.Repositories = repoRoot

diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index c14030f95da629c516a5a46968724d5c51602b4f..dafe5d31d7f3b3c0dc49145a6232653ef0c075a5 100644 (file)
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -28,7 +28,7 @@ func (s *GitHandlerSuite) 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:80"}: arvados.ServiceInstance{}}
+       s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{{Host: "localhost:80"}: {}}
        s.cluster.Git.GitoliteHome = "/test/ghh"
        s.cluster.Git.Repositories = "/"
 }

diff --git a/services/arv-git-httpd/integration_test.go b/services/arv-git-httpd/integration_test.go
index b50c2a2341185807ac0f9668d0175f4bb5494054..12ddc5b770940d767342cdaa871a299bfd3a113a 100644 (file)
--- a/services/arv-git-httpd/integration_test.go
+++ b/services/arv-git-httpd/integration_test.go
@@ -68,7 +68,7 @@ func (s *IntegrationSuite) 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/bin/git"
                s.cluster.Git.Repositories = s.tmpRepoRoot

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 94ed05bff1dbdb0585226741a792d2b77fa7fd29..6a02ab9bd3a8374dd5c7fed5888edd5c9a4217f8 100644 (file)
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -131,7 +131,7 @@ func runProxy(c *C, bogusClientToken bool, loadKeepstoresFromConfig bool) *keepc
                cluster.Services.Keepstore.InternalURLs = make(map[arvados.URL]arvados.ServiceInstance)
        }
 
-       cluster.Services.Keepproxy.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: ":0"}: arvados.ServiceInstance{}}
+       cluster.Services.Keepproxy.InternalURLs = map[arvados.URL]arvados.ServiceInstance{{Host: ":0"}: {}}
 
        listener = nil
        go func() {