From a7bdad0664cabdfa6709e9607878686758a3feef Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 15 Aug 2018 20:16:58 +0200 Subject: [PATCH] fixed issue reporte from gosimple code checker --- cmd/util.go | 2 +- pkg/hetzner/hetzner_provider.go | 3 +-- pkg/hetzner/hetzner_provider_test.go | 2 +- pkg/hetzner/util.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/util.go b/cmd/util.go index 5a825d2f..59c9d815 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -47,7 +47,7 @@ func waitAction(ctx context.Context, client *hcloud.Client, action *hcloud.Actio switch action.Status { case hcloud.ActionStatusRunning: sendProgress(action.Progress) - break + case hcloud.ActionStatusSuccess: sendProgress(100) errCh <- nil diff --git a/pkg/hetzner/hetzner_provider.go b/pkg/hetzner/hetzner_provider.go index 93b5370a..11403271 100644 --- a/pkg/hetzner/hetzner_provider.go +++ b/pkg/hetzner/hetzner_provider.go @@ -80,8 +80,7 @@ func (provider *Provider) CreateNodes(suffix string, template clustermanager.Nod var nodes []clustermanager.Node for i := 1; i <= count; i++ { - var serverOpts hcloud.ServerCreateOpts - serverOpts = serverOptsTemplate + serverOpts := serverOptsTemplate nodeNumber := i + offset serverOpts.Name = strings.Replace(serverNameTemplate, "@idx", fmt.Sprintf("%.02d", nodeNumber), 1) serverOpts.Datacenter = &hcloud.Datacenter{ diff --git a/pkg/hetzner/hetzner_provider_test.go b/pkg/hetzner/hetzner_provider_test.go index 1bfe6699..0f5782fa 100644 --- a/pkg/hetzner/hetzner_provider_test.go +++ b/pkg/hetzner/hetzner_provider_test.go @@ -306,7 +306,7 @@ func TestProviderGetMasterNodeIsMissing(t *testing.T) { func TestProviderInitCluster(t *testing.T) { provider := getProviderWithNodes([]clustermanager.Node{}) - provider.InitCluster("cluster-name", "10.0.1.0/24") + _, err = provider.GetMasterNode() if provider.GetNodeCidr() != "10.0.1.0/24" { t.Error("cluster node cidr is not correctly set") diff --git a/pkg/hetzner/util.go b/pkg/hetzner/util.go index 6d10045a..a980f21f 100644 --- a/pkg/hetzner/util.go +++ b/pkg/hetzner/util.go @@ -55,7 +55,7 @@ func waitAction(ctx context.Context, client *hcloud.Client, action *hcloud.Actio switch action.Status { case hcloud.ActionStatusRunning: sendProgress(action.Progress) - break + case hcloud.ActionStatusSuccess: sendProgress(100) errCh <- nil