From 924295f7ac01f918cb607283b239f0bdf69ab669 Mon Sep 17 00:00:00 2001
From: fabiankramm <kramm@covexo.com>
Date: Mon, 12 Nov 2018 10:43:01 +0100
Subject: [PATCH] implement config-overwrite flag (#373)

---
 cmd/deploy.go                         | 21 +++++++++++++--------
 cmd/up.go                             |  6 ++++++
 main.go                               | 16 +++++-----------
 pkg/devspace/config/configutil/get.go |  5 ++++-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/cmd/deploy.go b/cmd/deploy.go
index e6462f7aec..54939f9172 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -25,14 +25,15 @@ type DeployCmd struct {
 
 // DeployCmdFlags holds the possible down cmd flags
 type DeployCmdFlags struct {
-	Namespace     string
-	KubeContext   string
-	Config        string
-	DockerTarget  string
-	CloudTarget   string
-	SwitchContext bool
-	SkipBuild     bool
-	GitBranch     string
+	Namespace       string
+	KubeContext     string
+	Config          string
+	ConfigOverwrite string
+	DockerTarget    string
+	CloudTarget     string
+	SwitchContext   bool
+	SkipBuild       bool
+	GitBranch       string
 }
 
 func init() {
@@ -63,6 +64,7 @@ devspace deploy https://github.com/covexo/devspace --branch test
 	cobraCmd.Flags().StringVar(&cmd.flags.Namespace, "namespace", "", "The namespace to deploy to")
 	cobraCmd.Flags().StringVar(&cmd.flags.KubeContext, "kube-context", "", "The kubernetes context to use for deployment")
 	cobraCmd.Flags().StringVar(&cmd.flags.Config, "config", configutil.ConfigPath, "The devspace config file to load (default: '.devspace/config.yaml'")
+	cobraCmd.Flags().StringVar(&cmd.flags.ConfigOverwrite, "config-overwrite", configutil.OverwriteConfigPath, "The devspace config overwrite file to load (default: '.devspace/overwrite.yaml'")
 	cobraCmd.Flags().StringVar(&cmd.flags.DockerTarget, "docker-target", "", "The docker target to use for building")
 	cobraCmd.Flags().StringVar(&cmd.flags.CloudTarget, "cloud-target", "", "When using a cloud provider, the target to use")
 	cobraCmd.Flags().BoolVar(&cmd.flags.SwitchContext, "switch-context", false, "Switches the kube context to the deploy context")
@@ -164,6 +166,9 @@ func (cmd *DeployCmd) prepareConfig() {
 		// Don't use overwrite config if we use a different config
 		configutil.OverwriteConfigPath = ""
 	}
+	if configutil.OverwriteConfigPath != cmd.flags.ConfigOverwrite {
+		configutil.OverwriteConfigPath = cmd.flags.ConfigOverwrite
+	}
 
 	// Load Config and modify it
 	config := configutil.GetConfigWithoutDefaults()
diff --git a/cmd/up.go b/cmd/up.go
index 811d3fa5fc..e9a50d17a0 100644
--- a/cmd/up.go
+++ b/cmd/up.go
@@ -40,6 +40,7 @@ type UpCmdFlags struct {
 	labelSelector   string
 	namespace       string
 	config          string
+	configOverwrite string
 }
 
 //UpFlagsDefault are the default flags for UpCmdFlags
@@ -98,6 +99,7 @@ Starts and connects your DevSpace:
 	cobraCmd.Flags().StringVarP(&cmd.flags.labelSelector, "label-selector", "l", "", "Comma separated key=value selector list (e.g. release=test)")
 	cobraCmd.Flags().StringVarP(&cmd.flags.namespace, "namespace", "n", "", "Namespace where to select pods")
 	cobraCmd.Flags().StringVar(&cmd.flags.config, "config", configutil.ConfigPath, "The devspace config file to load (default: '.devspace/config.yaml'")
+	cobraCmd.Flags().StringVar(&cmd.flags.configOverwrite, "config-overwrite", configutil.OverwriteConfigPath, "The devspace config overwrite file to load (default: '.devspace/overwrite.yaml'")
 }
 
 // Run executes the command logic
@@ -108,12 +110,16 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 		// Don't use overwrite config if we use a different config
 		configutil.OverwriteConfigPath = ""
 	}
+	if configutil.OverwriteConfigPath != cmd.flags.configOverwrite {
+		configutil.OverwriteConfigPath = cmd.flags.configOverwrite
+	}
 
 	log.StartFileLogging()
 	var err error
 
 	configExists, _ := configutil.ConfigExists()
 	if !configExists {
+		log.Info("Config does not exist")
 		initFlags := &InitCmdFlags{
 			reconfigure:      false,
 			overwrite:        false,
diff --git a/main.go b/main.go
index 0067b066a6..a4baf6cdbf 100644
--- a/main.go
+++ b/main.go
@@ -1,24 +1,18 @@
 package main
 
 import (
-	"fmt"
+	"os"
 
-	"github.com/covexo/devspace/pkg/util/stdinutil"
+	"github.com/covexo/devspace/cmd"
+	"github.com/covexo/devspace/pkg/devspace/upgrade"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
 var version string
 
 func main() {
-	/*upgrade.SetVersion(version)
+	upgrade.SetVersion(version)
 
 	cmd.Execute()
-	os.Exit(0)*/
-	useDevSpaceCloud := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Do you want to use the DevSpace Cloud? (free ready-to-use Kubernetes) (yes | no)",
-		DefaultValue:           "yes",
-		ValidationRegexPattern: "^(yes)|(no)$",
-	})
-
-	fmt.Println(useDevSpaceCloud)
+	os.Exit(0)
 }
diff --git a/pkg/devspace/config/configutil/get.go b/pkg/devspace/config/configutil/get.go
index 23461fc303..2487ad51ff 100644
--- a/pkg/devspace/config/configutil/get.go
+++ b/pkg/devspace/config/configutil/get.go
@@ -24,11 +24,14 @@ generated.yaml
 // DefaultConfigPath is the default config path to use
 const DefaultConfigPath = "/.devspace/config.yaml"
 
+// DefaultOverwriteConfigPath is the default overwrite config path to use
+const DefaultOverwriteConfigPath = "/.devspace/overwrite.yaml"
+
 // ConfigPath is the path for the main config
 var ConfigPath = DefaultConfigPath
 
 // OverwriteConfigPath specifies where the override.yaml lies
-var OverwriteConfigPath = "/.devspace/overwrite.yaml"
+var OverwriteConfigPath = DefaultOverwriteConfigPath
 
 // DefaultDevspaceServiceName is the name of the initial default service
 const DefaultDevspaceServiceName = "default"