remove utils ProviderAndManager that create two unrelated object

xetys · Aug 23, 2018 · f393126 · f393126
1 parent cbfc457
commit f393126
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 24 deletions.
diff --git a/cmd/cluster_add_worker.go b/cmd/cluster_add_worker.go
@@ -93,7 +93,8 @@ You can specify the worker server type as in cluster create.`,
 		}
 
 		coordinator := pkg.NewProgressCoordinator()
-		hetznerProvider, clusterManager := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, coordinator, AppConf.CurrentContext.Token)
+		hetznerProvider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
+		clusterManager := clustermanager.NewClusterManagerFromCluster(*cluster, hetznerProvider, AppConf.SSHClient, coordinator)
 		err := AppConf.SSHClient.(*clustermanager.SSHCommunicator).CapturePassphrase(sshKeyName)
 		if err != nil {
 			log.Fatal(err)

diff --git a/cmd/cluster_addon.go b/cmd/cluster_addon.go
@@ -55,7 +55,7 @@ func validateAddonSubCommand(cmd *cobra.Command, args []string) error {
 		return errors.New("exactly one argument expected")
 	}
 	addonName := args[0]
-	provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token)
+	provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
 	addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient)
 	if !addonService.AddonExists(addonName) {
 		return fmt.Errorf("addon %s not found", addonName)

diff --git a/cmd/cluster_addon_install.go b/cmd/cluster_addon_install.go
@@ -35,7 +35,7 @@ var clusterAddonInstallCmd = &cobra.Command{
 		_, cluster := AppConf.Config.FindClusterByName(name)
 
 		log.Printf("installing addon %s", addonName)
-		provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token)
+		provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
 		addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient)
 		masterNode, err := provider.GetMasterNode()
 		FatalOnError(err)

diff --git a/cmd/cluster_addon_list.go b/cmd/cluster_addon_list.go
@@ -36,7 +36,7 @@ var clusterAddonListCmd = &cobra.Command{
 		fmt.Fprintln(tw, "NAME\tREQUIRES\tDESCRIPTION\tURL")
 
 		cluster := &clustermanager.Cluster{Nodes: []clustermanager.Node{clustermanager.Node{IsMaster: true}}}
-		provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token)
+		provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
 		addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient)
 		for _, addon := range addonService.Addons() {
 			requires := "-"

diff --git a/cmd/cluster_addon_uninstall.go b/cmd/cluster_addon_uninstall.go
@@ -35,7 +35,7 @@ var clusterAddonUninstallCmd = &cobra.Command{
 		_, cluster := AppConf.Config.FindClusterByName(name)
 
 		log.Printf("removing addon %s", addonName)
-		provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token)
+		provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
 		masterNode, err := provider.GetMasterNode()
 		FatalOnError(err)
 

diff --git a/cmd/cluster_create_test.go b/cmd/cluster_create_test.go
@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/xetys/hetzner-kube/pkg/clustermanager"
 	"testing"
+
+	"github.com/xetys/hetzner-kube/pkg/clustermanager"
 )
 
 func TestClusterCmdValidate(t *testing.T) {

diff --git a/cmd/cluster_kubeconfig.go b/cmd/cluster_kubeconfig.go
@@ -46,7 +46,7 @@ Example 4: hetzner-kube cluster kubeconfig -n my-cluster -p > my-conf.yaml # pri
 		name := args[0]
 		_, cluster := AppConf.Config.FindClusterByName(name)
 
-		provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token)
+		provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
 		masterNode, err := provider.GetMasterNode()
 		FatalOnError(err)
 

diff --git a/pkg/hetzner/util.go b/pkg/hetzner/util.go