Continue refactoring

Author: FabianKramm

cmd/add.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
 	"github.com/covexo/devspace/pkg/devspace/config/v1"
-	helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
+	helmClient "github.com/covexo/devspace/pkg/devspace/helm"
 	"github.com/covexo/devspace/pkg/devspace/kubectl"
 	"github.com/covexo/devspace/pkg/util/log"
 	"github.com/russross/blackfriday"
@@ -312,17 +312,15 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
 	config := configutil.GetConfig()
 
 	if cmd.syncFlags.Selector == "" {
-		cmd.syncFlags.Selector = "release=" + *configutil.GetDefaultDevSpaceDefaultReleaseName(config)
+		cmd.syncFlags.Selector = "release=" + getNameOfFirstHelmDeployment()
 	}
 
 	labelSelectorMap, err := parseSelectors(cmd.syncFlags.Selector)
-
 	if err != nil {
 		log.Fatalf("Error parsing selectors: %s", err.Error())
 	}
 
 	excludedPaths := make([]string, 0, 0)
-
 	if cmd.syncFlags.ExcludedPaths != "" {
 		excludedPathStrings := strings.Split(cmd.syncFlags.ExcludedPaths, ",")
 
@@ -333,10 +331,10 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
 	}
 
 	workdir, err := os.Getwd()
-
 	if err != nil {
 		log.Fatalf("Unable to determine current workdir: %s", err.Error())
 	}
+
 	cmd.syncFlags.LocalPath = strings.TrimPrefix(cmd.syncFlags.LocalPath, workdir)
 	cmd.syncFlags.LocalPath = "./" + strings.TrimPrefix(cmd.syncFlags.LocalPath, "./")
 
@@ -365,7 +363,7 @@ func (cmd *AddCmd) RunAddPort(cobraCmd *cobra.Command, args []string) {
 	config := configutil.GetConfig()
 
 	if cmd.portFlags.Selector == "" {
-		cmd.portFlags.Selector = "release=" + *configutil.GetDefaultDevSpaceDefaultReleaseName(config)
+		cmd.portFlags.Selector = "release=" + getNameOfFirstHelmDeployment()
 	}
 
 	labelSelectorMap, err := parseSelectors(cmd.portFlags.Selector)
@@ -490,3 +488,17 @@ func parseSelectors(selectorString string) (map[string]*string, error) {
 
 	return selectorMap, nil
 }
+
+func getNameOfFirstHelmDeployment() string {
+	config := configutil.GetConfig()
+
+	if config.DevSpace.Deployments != nil {
+		for _, deploymentConfig := range *config.DevSpace.Deployments {
+			if deploymentConfig.Helm != nil {
+				return *deploymentConfig.Namespace
+			}
+		}
+	}
+
+	return DefaultDevspaceDeploymentName
+}

cmd/down.go

@@ -2,7 +2,8 @@ package cmd
 
 import (
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
-	helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
+	"github.com/covexo/devspace/pkg/devspace/deploy"
+	deployHelm "github.com/covexo/devspace/pkg/devspace/deploy/helm"
 	deployKubectl "github.com/covexo/devspace/pkg/devspace/deploy/kubectl"
 	"github.com/covexo/devspace/pkg/devspace/kubectl"
 	"github.com/covexo/devspace/pkg/util/log"
@@ -54,63 +55,35 @@ func (cmd *DownCmd) Run(cobraCmd *cobra.Command, args []string) {
 }
 
 func deleteDevSpace(kubectl *kubernetes.Clientset) {
-	var err error
-	var client *helmClient.ClientWrapper
-
 	config := configutil.GetConfig()
 
-	if config.DevSpace.Deploy != nil {
-		for _, deployConfig := range *config.DevSpace.Deploy {
+	if config.DevSpace.Deployments != nil {
+		for _, deployConfig := range *config.DevSpace.Deployments {
+			var deployClient deploy.Interface
+
 			// Delete kubectl engine
-			if deployConfig.Engine != nil && deployConfig.Engine.Kubectl != nil {
-				kubectlDeployConfig, err := deployKubectl.New(config, deployConfig)
+			if deployConfig.Kubectl != nil {
+				deployClient, err := deployKubectl.New(kubectl, deployConfig)
 				if err != nil {
 					log.Warnf("Unable to create kubectl deploy config: %v", err)
 					continue
 				}
-
-				log.StartWait("Deleting kubectl deployment")
-				err = kubectlDeployConfig.Delete()
-				log.StopWait()
-				if err != nil {
-					log.Warnf("Error deleting kubectl manifests: %v", err)
-				}
-
-				log.Donef("Successfully deleted kubectl deployment")
 			} else {
-				// Delete with helm engine
-				defaultReleaseName := configutil.GetDefaultDevSpaceDefaultReleaseName(config)
-
-				releaseName := defaultReleaseName
-				if deployConfig.Engine != nil && deployConfig.Engine.Helm != nil && deployConfig.Engine.Helm.Release != nil {
-					releaseName = deployConfig.Engine.Helm.Release
-				}
-
-				if client == nil {
-					isDeployed := helmClient.IsTillerDeployed(kubectl)
-					if isDeployed == false {
-						continue
-					}
-
-					client, err = helmClient.NewClient(kubectl, false)
-					if err != nil {
-						log.Warnf("Unable to initialize helm client: %s", err.Error())
-						continue
-					}
+				deployClient, err := deployHelm.New(kubectl, deployConfig)
+				if err != nil {
+					log.Warnf("Unable to create helm deploy config: %v", err)
+					continue
 				}
+			}
 
-				log.StartWait("Deleting release " + *releaseName)
-				res, err := client.DeleteRelease(*releaseName, true)
-				log.StopWait()
-
-				if res != nil && res.Info != "" {
-					log.Donef("Successfully deleted release %s: %s", releaseName, res.Info)
-				} else if err != nil {
-					log.Warnf("Error deleting release %s: %s", releaseName, err.Error())
-				} else {
-					log.Donef("Successfully deleted release %s", releaseName)
-				}
+			log.StartWait("Deleting deployment %s" + *deployConfig.Name)
+			err := deployClient.Delete(true)
+			log.StopWait()
+			if err != nil {
+				log.Warnf("Error deleting deployment %s: %v", *deployConfig.Name, err)
 			}
+
+			log.Donef("Successfully deleted deployment %s", *deployConfig.Name)
 		}
 	}
 }

cmd/enter.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
-	helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
+	helmClient "github.com/covexo/devspace/pkg/devspace/helm"
 	"github.com/covexo/devspace/pkg/devspace/kubectl"
 	"github.com/covexo/devspace/pkg/util/log"
 	"github.com/spf13/cobra"