fix post rebase issues

xetys · Aug 23, 2018 · 5b57ac6 · 5b57ac6
1 parent 972259b
commit 5b57ac6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/hetzner/hetzner_provider_test.go b/pkg/hetzner/hetzner_provider_test.go
@@ -1,8 +1,10 @@
 package hetzner_test
 
 import (
+	"context"
 	"testing"
 
+	"github.com/hetznercloud/hcloud-go/hcloud"
 	"github.com/magiconair/properties/assert"
 	"github.com/xetys/hetzner-kube/pkg/clustermanager"
 	"github.com/xetys/hetzner-kube/pkg/hetzner"
@@ -306,7 +308,7 @@ func TestProviderGetMasterNodeIsMissing(t *testing.T) {
 func TestProviderInitCluster(t *testing.T) {
 	provider := getProviderWithNodes([]clustermanager.Node{})
 
-	_, err = provider.GetMasterNode()
+	_, err := provider.GetMasterNode()
 
 	if err == nil {
 		t.Error("no error omitted with no master")
@@ -321,10 +323,19 @@ func TestProviderGetCluster(t *testing.T) {
 		{Name: "kube-master-1", IsMaster: true},
 		{Name: "kube-worker-1"},
 	}
-	provider := getProviderWithNodes(nodes)
 
-	provider.InitCluster("cluster-name", "10.0.1.0/24")
-	provider.SetCloudInitFile("cloud/init.file")
+	provider := hetzner.NewHetznerProvider(
+		context.Background(),
+		&hcloud.Client{},
+		clustermanager.Cluster{
+			Name:          "cluster-name",
+			NodeCIDR:      "10.0.1.0/24",
+			CloudInitFile: "cloud/init.file",
+		},
+		"token-string",
+	)
+
+	provider.SetNodes(nodes)
 
 	cluster := provider.GetCluster()
 	expectedCluster := clustermanager.Cluster{