Merge pull request #292 from covexo/configure

Configure

Author: FabianKramm

cmd/add.go

@@ -134,7 +134,7 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 	}
 
 	configutil.Merge(config, &v1.Config{
-		Version: configutil.String("v1"),
+		Version: configutil.String(configutil.CurrentConfigVersion),
 		DevSpace: &v1.DevSpaceConfig{
 			Deployments: &[]*v1.DeploymentConfig{},
 		},

cmd/init.go

@@ -1,24 +1,17 @@
 package cmd
 
 import (
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/covexo/devspace/pkg/devspace/config/configutil"
-	"github.com/covexo/devspace/pkg/devspace/config/v1"
-	helmClient "github.com/covexo/devspace/pkg/devspace/helm"
-	"github.com/covexo/devspace/pkg/devspace/kubectl"
+	"github.com/covexo/devspace/pkg/devspace/configure"
 	"github.com/covexo/devspace/pkg/util/log"
-	"github.com/covexo/devspace/pkg/util/yamlutil"
 	"github.com/spf13/cobra"
 )
 
 // RemoveCmd holds the information needed for the remove command
 type RemoveCmd struct {
-	syncFlags    *removeSyncCmdFlags
-	portFlags    *removePortCmdFlags
-	packageFlags *removePackageCmdFlags
+	syncFlags       *removeSyncCmdFlags
+	portFlags       *removePortCmdFlags
+	packageFlags    *removePackageCmdFlags
+	deploymentFlags *removeDeploymentCmdFlags
 }
 
 type removeSyncCmdFlags struct {
@@ -38,11 +31,16 @@ type removePackageCmdFlags struct {
 	Deployment string
 }
 
+type removeDeploymentCmdFlags struct {
+	RemoveAll bool
+}
+
 func init() {
 	cmd := &RemoveCmd{
-		syncFlags:    &removeSyncCmdFlags{},
-		portFlags:    &removePortCmdFlags{},
-		packageFlags: &removePackageCmdFlags{},
+		syncFlags:       &removeSyncCmdFlags{},
+		portFlags:       &removePortCmdFlags{},
+		packageFlags:    &removePackageCmdFlags{},
+		deploymentFlags: &removeDeploymentCmdFlags{},
 	}
 
 	removeCmd := &cobra.Command{
@@ -131,213 +129,60 @@ func init() {
 	removePackageCmd.Flags().BoolVar(&cmd.packageFlags.RemoveAll, "all", false, "Remove all packages")
 	removePackageCmd.Flags().StringVarP(&cmd.packageFlags.Deployment, "deployment", "d", "", "The deployment name to use")
 	removeCmd.AddCommand(removePackageCmd)
-}
-
-// RunRemovePackage executes the remove package command logic
-func (cmd *RemoveCmd) RunRemovePackage(cobraCmd *cobra.Command, args []string) {
-	config := configutil.GetConfig()
-	if config.DevSpace.Deployments == nil || (len(*config.DevSpace.Deployments) != 1 && cmd.packageFlags.Deployment == "") {
-		log.Fatalf("Please specify the deployment via the -d flag")
-	}
-
-	var deploymentConfig *v1.DeploymentConfig
-	for _, deployConfig := range *config.DevSpace.Deployments {
-		if cmd.packageFlags.Deployment == "" || cmd.packageFlags.Deployment == *deployConfig.Name {
-			if deployConfig.Helm == nil || deployConfig.Helm.ChartPath == nil {
-				log.Fatalf("Selected deployment %s is not a valid helm deployment", *deployConfig.Name)
-			}
 
-			deploymentConfig = deployConfig
-			break
-		}
-	}
-
-	if deploymentConfig == nil {
-		log.Fatalf("Deployment %s not found", cmd.packageFlags.Deployment)
+	removeDeploymentCmd := &cobra.Command{
+		Use:   "deployment",
+		Short: "Removes one or all deployments from the devspace",
+		Long: `
+	#######################################################
+	############ devspace remove deployment ###############
+	#######################################################
+	Removes one or all deployments from a devspace:
+	devspace remove deployment devspace-default
+	devspace remove deployment --all
+	#######################################################
+	`,
+		Args: cobra.MaximumNArgs(1),
+		Run:  cmd.RunRemoveDeployment,
 	}
 
-	chartPath, err := filepath.Abs(*deploymentConfig.Helm.ChartPath)
-	if err != nil {
-		log.Fatal(err)
-	}
+	removeDeploymentCmd.Flags().BoolVar(&cmd.deploymentFlags.RemoveAll, "all", false, "Remove all deployments")
+	removeCmd.AddCommand(removeDeploymentCmd)
+}
 
-	if len(args) == 0 && cmd.packageFlags.RemoveAll == false {
-		log.Fatal("You need to specify a package name or the --all flag")
+// RunRemoveDeployment executes the specified deployment
+func (cmd *RemoveCmd) RunRemoveDeployment(cobraCmd *cobra.Command, args []string) {
+	name := ""
+	if len(args) > 0 {
+		name = args[0]
 	}
 
-	requirementsPath := filepath.Join(chartPath, "requirements.yaml")
-	yamlContents := map[interface{}]interface{}{}
-
-	err = yamlutil.ReadYamlFromFile(requirementsPath, yamlContents)
+	err := configure.RemoveDeployment(cmd.deploymentFlags.RemoveAll, name)
 	if err != nil {
 		log.Fatal(err)
 	}
-
-	if dependencies, ok := yamlContents["dependencies"]; ok {
-		dependenciesArr, ok := dependencies.([]interface{})
-		if ok == false {
-			log.Fatalf("Error parsing yaml: %v", dependencies)
-		}
-
-		if cmd.packageFlags.RemoveAll == false {
-			for key, dependency := range dependenciesArr {
-				dependencyMap, ok := dependency.(map[interface{}]interface{})
-				if ok == false {
-					log.Fatalf("Error parsing yaml: %v", dependencies)
-				}
-
-				if name, ok := dependencyMap["name"]; ok {
-					if name == args[0] {
-						dependenciesArr = append(dependenciesArr[:key], dependenciesArr[key+1:]...)
-						yamlContents["dependencies"] = dependenciesArr
-
-						cmd.rebuildDependencies(chartPath, yamlContents)
-						break
-					}
-				}
-			}
-
-			log.Donef("Successfully removed dependency %s", args[0])
-			return
-		}
-
-		yamlContents["dependencies"] = []interface{}{}
-
-		cmd.rebuildDependencies(chartPath, yamlContents)
-		log.Done("Successfully removed all dependencies")
-		return
-	}
-
-	log.Done("No dependencies found")
 }
 
-func (cmd *RemoveCmd) rebuildDependencies(chartPath string, newYamlContents map[interface{}]interface{}) {
-	err := yamlutil.WriteYamlToFile(newYamlContents, filepath.Join(chartPath, "requirements.yaml"))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Rebuild dependencies
-	kubectl, err := kubectl.NewClient()
-	if err != nil {
-		log.Fatalf("Unable to create new kubectl client: %v", err)
-	}
-
-	helm, err := helmClient.NewClient(kubectl, log.GetInstance(), false)
-	if err != nil {
-		log.Fatalf("Error initializing helm client: %v", err)
-	}
-
-	log.StartWait("Update chart dependencies")
-	err = helm.UpdateDependencies(chartPath)
-	log.StopWait()
-
+// RunRemovePackage executes the remove package command logic
+func (cmd *RemoveCmd) RunRemovePackage(cobraCmd *cobra.Command, args []string) {
+	err := configure.RemovePackage(cmd.packageFlags.RemoveAll, cmd.packageFlags.Deployment, args, log.GetInstance())
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
 // RunRemoveSync executes the remove sync command logic
 func (cmd *RemoveCmd) RunRemoveSync(cobraCmd *cobra.Command, args []string) {
-	config := configutil.GetConfig()
-	labelSelectorMap, err := parseSelectors(cmd.syncFlags.Selector)
-
+	err := configure.RemoveSyncPath(cmd.syncFlags.RemoveAll, cmd.syncFlags.LocalPath, cmd.syncFlags.ContainerPath, cmd.syncFlags.Selector)
 	if err != nil {
-		log.Fatalf("Error parsing selectors: %s", err.Error())
-	}
-
-	if len(labelSelectorMap) == 0 && cmd.syncFlags.RemoveAll == false && cmd.syncFlags.LocalPath == "" && cmd.syncFlags.ContainerPath == "" {
-		log.Errorf("You have to specify at least one of the supported flags")
-		cobraCmd.Help()
-
-		return
-	}
-
-	if config.DevSpace.Sync != nil && len(*config.DevSpace.Sync) > 0 {
-		newSyncPaths := make([]*v1.SyncConfig, 0, len(*config.DevSpace.Sync)-1)
-
-		for _, v := range *config.DevSpace.Sync {
-			if cmd.syncFlags.RemoveAll ||
-				cmd.syncFlags.LocalPath == *v.LocalSubPath ||
-				cmd.syncFlags.ContainerPath == *v.ContainerPath ||
-				isMapEqual(labelSelectorMap, *v.LabelSelector) {
-				continue
-			}
-
-			newSyncPaths = append(newSyncPaths, v)
-		}
-
-		config.DevSpace.Sync = &newSyncPaths
-
-		err = configutil.SaveConfig()
-		if err != nil {
-			log.Fatalf("Couldn't save config file: %s", err.Error())
-		}
+		log.Fatal(err)
 	}
 }
 
 // RunRemovePort executes the remove port command logic
 func (cmd *RemoveCmd) RunRemovePort(cobraCmd *cobra.Command, args []string) {
-	config := configutil.GetConfig()
-
-	labelSelectorMap, err := parseSelectors(cmd.portFlags.Selector)
+	err := configure.RemovePort(cmd.portFlags.RemoveAll, cmd.portFlags.Selector, args)
 	if err != nil {
-		log.Fatalf("Error parsing selectors: %s", err.Error())
-	}
-
-	argPorts := ""
-	if len(args) == 1 {
-		argPorts = args[0]
-	}
-
-	if len(labelSelectorMap) == 0 && cmd.portFlags.RemoveAll == false && argPorts == "" {
-		log.Errorf("You have to specify at least one of the supported flags")
-		cobraCmd.Help()
-
-		return
-	}
-
-	ports := strings.Split(argPorts, ",")
-
-	if config.DevSpace.Ports != nil && len(*config.DevSpace.Ports) > 0 {
-		newPortForwards := make([]*v1.PortForwardingConfig, 0, len(*config.DevSpace.Ports)-1)
-
-		for _, v := range *config.DevSpace.Ports {
-			if cmd.portFlags.RemoveAll || isMapEqual(labelSelectorMap, *v.LabelSelector) {
-				continue
-			}
-
-			newPortMappings := []*v1.PortMapping{}
-
-			for _, pm := range *v.PortMappings {
-				if containsPort(strconv.Itoa(*pm.LocalPort), ports) || containsPort(strconv.Itoa(*pm.RemotePort), ports) {
-					continue
-				}
-
-				newPortMappings = append(newPortMappings, pm)
-			}
-
-			if len(newPortMappings) > 0 {
-				v.PortMappings = &newPortMappings
-				newPortForwards = append(newPortForwards, v)
-			}
-		}
-
-		config.DevSpace.Ports = &newPortForwards
-
-		err = configutil.SaveConfig()
-		if err != nil {
-			log.Fatalf("Couldn't save config file: %s", err.Error())
-		}
-	}
-}
-
-func containsPort(port string, ports []string) bool {
-	for _, v := range ports {
-		if strings.TrimSpace(v) == port {
-			return true
-		}
+		log.Fatal(err)
 	}
-
-	return false
 }

cmd/remove.go

@@ -81,7 +81,7 @@ func (cmd *ResetCmd) deleteInternalRegistry() {
 
 	if config.InternalRegistry != nil {
 		shouldRegistryRemoved := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Should the internal registry be removed? (y/n)",
+			Question:               "\n\nShould the internal registry be removed? (y/n)",
 			DefaultValue:           "y",
 			ValidationRegexPattern: "^(y|n)$",
 		}) == "y"
@@ -112,7 +112,7 @@ func (cmd *ResetCmd) deleteTiller() {
 
 	if config.Tiller != nil {
 		shouldRemoveTiller := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Should the tiller server be removed? (y/n)",
+			Question:               "\n\nShould the tiller server be removed? (y/n)",
 			DefaultValue:           "y",
 			ValidationRegexPattern: "^(y|n)$",
 		}) == "y"
@@ -143,7 +143,7 @@ func (cmd *ResetCmd) deleteDeploymentFiles() {
 					_, err := os.Stat(absChartPath)
 					if os.IsNotExist(err) == false {
 						deleteChart := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-							Question:               "Should the Chart (" + *deployConfig.Helm.ChartPath + "/*) be removed? (y/n)",
+							Question:               "\n\nShould the Chart (" + *deployConfig.Helm.ChartPath + "/*) be removed? (y/n)",
 							DefaultValue:           "y",
 							ValidationRegexPattern: "^(y|n)$",
 						}) == "y"
@@ -176,7 +176,7 @@ func (cmd *ResetCmd) deleteImageFiles() {
 		_, err = os.Stat(absDockerfilePath)
 		if os.IsNotExist(err) == false {
 			deleteDockerfile := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-				Question:               "Should " + dockerfilePath + " be removed? (y/n)",
+				Question:               "\n\nShould " + dockerfilePath + " be removed? (y/n)",
 				DefaultValue:           "y",
 				ValidationRegexPattern: "^(y|n)$",
 			}) == "y"
@@ -201,7 +201,7 @@ func (cmd *ResetCmd) deleteImageFiles() {
 		_, err = os.Stat(absDockerIgnorePath)
 		if os.IsNotExist(err) == false {
 			deleteDockerIgnore := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-				Question:               "Should " + absDockerIgnorePath + " be removed? (y/n)",
+				Question:               "\n\nShould " + absDockerIgnorePath + " be removed? (y/n)",
 				DefaultValue:           "y",
 				ValidationRegexPattern: "^(y|n)$",
 			}) == "y"
@@ -218,7 +218,7 @@ func (cmd *ResetCmd) deleteClusterRoleBinding() {
 	_, err := cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Get(clusterRoleBindingName, metav1.GetOptions{})
 	if err == nil {
 		deleteRoleBinding := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Should the ClusterRoleBinding '" + clusterRoleBindingName + "' be removed? (y/n)",
+			Question:               "\n\nShould the ClusterRoleBinding '" + clusterRoleBindingName + "' be removed? (y/n)",
 			DefaultValue:           "y",
 			ValidationRegexPattern: "^(y|n)$",
 		}) == "y"
@@ -239,7 +239,7 @@ func (cmd *ResetCmd) deleteClusterRoleBinding() {
 
 func (cmd *ResetCmd) deleteDevspaceFolder() {
 	deleteDevspaceFolder := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Should the .devspace folder be removed? (y/n)",
+		Question:               "\n\nShould the .devspace folder be removed? (y/n)",
 		DefaultValue:           "y",
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"

cmd/reset.go

@@ -150,7 +150,7 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 
 		defer func() {
 			for _, v := range syncConfigs {
-				v.Stop()
+				v.Stop(nil)
 			}
 		}()
 	}

cmd/up.go

@@ -28,6 +28,9 @@ const OverwriteConfigPath = "/.devspace/overwrite.yaml"
 // DefaultDevspaceDeploymentName is the name of the initial default deployment
 const DefaultDevspaceDeploymentName = "devspace-default"
 
+// CurrentConfigVersion has the value of the current config version
+const CurrentConfigVersion = "v1alpha1"
+
 // Global config vars
 var config *v1.Config
 var configRaw *v1.Config
@@ -84,6 +87,10 @@ func GetConfig() *v1.Config {
 		merge(overwriteConfig, overwriteConfigRaw, unsafe.Pointer(&overwriteConfig), unsafe.Pointer(overwriteConfigRaw))
 		merge(config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
 
+		if config.Version == nil || *config.Version != CurrentConfigVersion {
+			log.Fatal("Your config is out of date. Please run `devspace init -r` to update your config")
+		}
+
 		SetDefaults(config)
 	})