Merge branch 'master' of https://github.com/covexo/devspace

Author: gentele

cmd/init.go

@@ -21,10 +21,11 @@ import (
 
 // InitCmd is a struct that defines a command call for "init"
 type InitCmd struct {
-	flags          *InitCmdFlags
-	workdir        string
-	chartGenerator *generator.ChartGenerator
-	config         *v1.Config
+	flags           *InitCmdFlags
+	workdir         string
+	chartGenerator  *generator.ChartGenerator
+	config          *v1.Config
+	overwriteConfig *v1.Config
 }
 
 // InitCmdFlags are the flags available for the init-command
@@ -119,11 +120,10 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 		Image: &v1.ImageConfig{
 			Name: configutil.String("devspace"),
 		},
-		Cluster: &v1.Cluster{
-			APIServer: configutil.String("https://192.168.99.100:8443"),
-			User:      &v1.User{},
-		},
 	})
+	cmd.overwriteConfig = configutil.GetOverwriteConfig()
+
+	cmd.initChartGenerator()
 
 	createChart := cmd.flags.overwrite
 
@@ -213,12 +213,6 @@ func (cmd *InitCmd) configureDevSpace() {
 		ValidationRegexPattern: v1.Kubernetes.RegexPatterns.Name,
 	})
 
-	cmd.config.DevSpace.Release.Namespace = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Which Kubernetes namespace should your application run in?",
-		DefaultValue:           *cmd.config.DevSpace.Release.Namespace,
-		ValidationRegexPattern: v1.Kubernetes.RegexPatterns.Name,
-	})
-
 	// cmd.appConfig.Container.Ports, _ = strconv.Atoi(stdinutil.GetFromStdin(&stdinutil.GetFromStdin_params{
 	// 	Question:               "Which port(s) does your application listen on? (separated by spaces)",
 	// 	DefaultValue:           strconv.Itoa(cmd.appConfig.Container.Port),
@@ -240,6 +234,12 @@ func (cmd *InitCmd) configureDevSpace() {
 	}
 	cmd.addDefaultSyncConfig()
 
+	cmd.config.DevSpace.Release.Namespace = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+		Question:               "Which Kubernetes namespace should your application run in?",
+		DefaultValue:           *cmd.config.DevSpace.Release.Namespace,
+		ValidationRegexPattern: v1.Kubernetes.RegexPatterns.Name,
+	})
+
 	/* TODO
 	cmd.appConfig.External.Domain = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 		Question:               "Which domain do you want to run your application on?",
@@ -341,6 +341,9 @@ func (cmd *InitCmd) configureKubernetes() {
 	clusterConfig.UseKubeConfig = configutil.Bool(useKubeConfig)
 
 	if !useKubeConfig {
+		if clusterConfig.APIServer == nil {
+			clusterConfig.APIServer = configutil.String("https://192.168.99.100:8443")
+		}
 		clusterConfig.APIServer = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 			Question:               "What is your Kubernetes API Server URL? (e.g. https://127.0.0.1:8443)",
 			DefaultValue:           *clusterConfig.APIServer,
@@ -370,7 +373,6 @@ func (cmd *InitCmd) configureKubernetes() {
 }
 
 func (cmd *InitCmd) configureRegistry() {
-	overwriteConfig := configutil.GetOverwriteConfig()
 	registryConfig := cmd.config.Services.Registry
 
 	enableAutomaticBuilds := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
@@ -405,7 +407,7 @@ func (cmd *InitCmd) configureRegistry() {
 			if registryConfig.Internal.Release.Namespace == nil {
 				registryConfig.Internal.Release.Namespace = cmd.config.DevSpace.Release.Namespace
 			}
-			registryUser := overwriteConfig.Services.Registry.User
+			registryUser := cmd.overwriteConfig.Services.Registry.User
 
 			if registryUser.Username == nil {
 				randomUserSuffix, err := randutil.GenerateRandomString(5)
@@ -495,16 +497,20 @@ func (cmd *InitCmd) determineLanguage() {
 		if err != nil {
 			log.Fatalf("Unable to get supported languages: %s", err.Error())
 		}
-		cmd.chartGenerator.Language, _ = cmd.chartGenerator.GetLanguage()
+		detectedLang, langDetectionErr := cmd.chartGenerator.GetLanguage()
+
+		if langDetectionErr != nil {
+			//log.Error(langDetectionErr)
+		}
 
-		if cmd.chartGenerator.Language == "" {
-			cmd.chartGenerator.Language = "none"
+		if detectedLang == "" {
+			detectedLang = "none"
 		}
 		log.StopWait()
 
 		cmd.chartGenerator.Language = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 			Question:               "What is the major programming language of your project?\nSupported languages: " + strings.Join(supportedLanguages, ", "),
-			DefaultValue:           cmd.chartGenerator.Language,
+			DefaultValue:           detectedLang,
 			ValidationRegexPattern: "^(" + strings.Join(supportedLanguages, ")|(") + ")$",
 		})
 	}