refactor: improve context handling

Author: FabianKramm

cmd/init.go

@@ -287,18 +287,6 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 		}
 
 		if selectedDeploymentOption == DeployOptionHelm {
-			hasOwnHelmChart := "Yes"
-			helmChartAnswer, err := cmd.log.Question(&survey.QuestionOptions{
-				Question: "Do you already have a Helm chart for this project?",
-				Options: []string{
-					"No",
-					hasOwnHelmChart,
-				},
-			})
-			if err != nil {
-				return err
-			}
-
 			if isQuickstart {
 				quickstartYes := "Yes"
 				quickstartAnswer, err := cmd.log.Question(&survey.QuestionOptions{
@@ -317,19 +305,33 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 				}
 			}
 
-			if helmChartAnswer == hasOwnHelmChart && !mustAddComponentChart {
-				err = configureManager.AddHelmDeployment(imageName)
+			if !mustAddComponentChart {
+				hasOwnHelmChart := "Yes"
+				helmChartAnswer, err := cmd.log.Question(&survey.QuestionOptions{
+					Question: "Do you already have a Helm chart for this project?",
+					Options: []string{
+						"No",
+						hasOwnHelmChart,
+					},
+				})
 				if err != nil {
-					if err.Error() != "" {
-						cmd.log.WriteString(logrus.InfoLevel, "\n")
-						cmd.log.Errorf("Error: %s", err.Error())
-					}
+					return err
+				}
+
+				if helmChartAnswer == hasOwnHelmChart {
+					err = configureManager.AddHelmDeployment(imageName)
+					if err != nil {
+						if err.Error() != "" {
+							cmd.log.WriteString(logrus.InfoLevel, "\n")
+							cmd.log.Errorf("Error: %s", err.Error())
+						}
 
-					// Retry questions on error
-					continue
+						// Retry questions on error
+						continue
+					}
+				} else {
+					mustAddComponentChart = true
 				}
-			} else {
-				mustAddComponentChart = true
 			}
 		} else if selectedDeploymentOption == DeployOptionKubectl || selectedDeploymentOption == DeployOptionKustomize {
 			err = configureManager.AddKubectlDeployment(imageName, selectedDeploymentOption == DeployOptionKustomize)

pkg/devspace/configure/deployment.go

@@ -22,14 +22,18 @@ import (
 
 // AddKubectlDeployment adds a new kubectl deployment to the provided config
 func (m *manager) AddKubectlDeployment(deploymentName string, isKustomization bool) error {
-	question := "Please enter the paths to your Kubernetes manifests (comma separated, glob patterns are allowed, e.g. 'manifests/**' or 'kube/pod.yaml')"
+	question := "Please enter the paths to your Kubernetes manifests (comma separated, glob patterns are allowed, e.g. 'manifests/**' or 'kube/pod.yaml') [Enter to abort]"
 	if isKustomization {
 		question = "Please enter path to your Kustomization folder (e.g. ./kube/kustomization/)"
 	}
 
 	manifests, err := m.log.Question(&survey.QuestionOptions{
 		Question: question,
 		ValidationFunc: func(value string) error {
+			if value == "" {
+				return nil
+			}
+
 			if isKustomization {
 				stat, err := os.Stat(path.Join(value, "kustomization.yaml"))
 				if err == nil && !stat.IsDir() {
@@ -52,6 +56,10 @@ func (m *manager) AddKubectlDeployment(deploymentName string, isKustomization bo
 		return err
 	}
 
+	if manifests == "" {
+		return fmt.Errorf("adding kubectl deployment aborted")
+	}
+
 	splitted := strings.Split(manifests, ",")
 	splittedPointer := []string{}
 

pkg/devspace/configure/image.go

@@ -24,7 +24,7 @@ import (
 const dockerHubHostname = "hub.docker.com"
 
 // AddImage adds an image to the provided config
-func (m *manager) AddImage(imageName, image, projectNamespace, dockerfile string) error {
+func (m *manager) AddImage(imageName, image, projectNamespace, dockerfile string, languageHandler *generator.LanguageHandler) error {
 	var (
 		useDockerHub          = "Use " + dockerHubHostname
 		useGithubRegistry     = "Use GitHub image registry"
@@ -231,12 +231,13 @@ func (m *manager) addPullSecretConfig(dockerClient docker.Client, image string)
 
 	registryUsername := ""
 	registryPassword := ""
+	retry := false
 
 	m.log.WriteString(logrus.WarnLevel, "\n")
 
 	for {
 		m.log.Info("Checking registry authentication for " + registryHostnamePrintable + "...")
-		authConfig, err := dockerClient.Login(context.TODO(), registryHostname, registryUsername, registryPassword, true, false, false)
+		authConfig, err := dockerClient.Login(context.TODO(), registryHostname, registryUsername, registryPassword, true, retry, retry)
 		if err == nil && (authConfig.Username != "" || authConfig.Password != "") {
 			registryUsername = authConfig.Username
 
@@ -272,22 +273,9 @@ func (m *manager) addPullSecretConfig(dockerClient docker.Client, image string)
 		// Check if docker is running
 		_, runErr := command.Output(context.TODO(), "", "docker", "version")
 
-		retry := true
-
 		// If Docker is available, ask if we should retry registry login
-		if runErr == nil {
-			retryNo := "no"
-			retryAnswer, err := m.log.Question(&survey.QuestionOptions{
-				Question: "Do you want to retry logging into this registry?",
-				Options:  []string{"yes", retryNo},
-			})
-			if err != nil {
-				return "", err
-			}
-
-			if retryAnswer == retryNo {
-				retry = false
-			}
+		if runErr == nil && registryUsername != "" {
+			retry = true
 		}
 
 		if !retry {

pkg/devspace/generator/language.go

@@ -152,15 +152,24 @@ func (cg *LanguageHandler) GetLanguage() (string, error) {
 	if len(supportedLanguages) == 0 {
 		language = langFallback
 	} else {
+		otherOption := "other"
+		if language == langFallback {
+			language = otherOption
+		}
+
 		// Let the user select the language
 		language, err = cg.log.Question(&survey.QuestionOptions{
 			Question:     "Select the programming language of this project",
 			DefaultValue: language,
-			Options:      supportedLanguages,
+			Options:      append(supportedLanguages, otherOption),
 		})
 		if err != nil {
 			return "", err
 		}
+
+		if language == otherOption {
+			language = langFallback
+		}
 	}
 
 	language = regexp.MustCompile(`^.*\((.*)\)$`).ReplaceAllString(language, "$1")
@@ -335,7 +344,7 @@ func (cg *LanguageHandler) detectLanguage() (string, error) {
 
 	isSupported, language := cg.IsSupportedLanguage(detectedLanguage)
 	if !isSupported {
-		return "", fmt.Errorf("language %s not supported", detectedLanguage)
+		language = langFallback
 	}
 
 	cg.Language = language