diff --git a/Gopkg.lock b/Gopkg.lock index 936b442a..935756ab 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -219,14 +219,6 @@ revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9" version = "v1.1.0" -[[projects]] - branch = "master" - digest = "1:d2a36ba38f4f6871cd4346b5b3c327873c3b8da0a4c915ae82fba65c67a9a40c" - name = "github.com/thcyron/uiprogress" - packages = ["."] - pruneopts = "UT" - revision = "25e98ffb0e98b5192b475d8f2fd78083bfe9a67e" - [[projects]] branch = "master" digest = "1:10e257965f5774c1ef03b258130a6caa8dddbfe03041f69d7c16a00463dece62" @@ -292,7 +284,6 @@ "github.com/mitchellh/go-homedir", "github.com/spf13/cobra", "github.com/spf13/viper", - "github.com/thcyron/uiprogress", "golang.org/x/crypto/ssh", "golang.org/x/crypto/ssh/terminal", ] diff --git a/pkg/hetzner/hetzner_provider_test.go b/pkg/hetzner/hetzner_provider_test.go index 4f43dc8d..63efff66 100644 --- 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" @@ -297,7 +299,7 @@ func TestProviderGetMasterNodeIsMissing(t *testing.T) { _, err := provider.GetMasterNode() if err == nil { - t.Error("no error ommited with no master") + t.Error("no error omitted with no master") } }) } @@ -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{