[ARVADOS] updated: 1.3.0-3026-gecff7e34e
Git user
git at public.arvados.org
Thu Aug 27 19:07:15 UTC 2020
Summary of changes:
lib/cloud/azure/azure.go | 4 ++--
lib/dispatchcloud/test/queue.go | 6 +++---
services/arv-git-httpd/auth_handler_test.go | 2 +-
services/arv-git-httpd/git_handler_test.go | 2 +-
services/arv-git-httpd/integration_test.go | 2 +-
services/keepproxy/keepproxy_test.go | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
via ecff7e34ea7d5e8321c2821cae476355bffbc248 (commit)
from 5895b2710b4331109a0056275e8b046a53b5ba06 (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 ecff7e34ea7d5e8321c2821cae476355bffbc248
Author: Ward Vandewege <ward at curii.com>
Date: Thu Aug 27 15:06:44 2020 -0400
Fix a few gofmt warnings.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index ba8a836dd..7f949d9bd 100644
--- 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 74b84122f..8a8f686e1 100644
--- 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 4b8f95ef3..4e1a47dcb 100644
--- 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 c14030f95..dafe5d31d 100644
--- 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 b50c2a234..12ddc5b77 100644
--- 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 94ed05bff..6a02ab9bd 100644
--- 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() {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list