fix: add init question to determine if a deployment is to be developed or deployed

Author: lizardruss

cmd/init.go

@@ -334,82 +334,99 @@ func (cmd *InitCmd) initDevspace(f factory.Factory, configLoader loader.ConfigLo
 		break
 	}
 
-	image := ""
-	for {
-		if !mustAddComponentChart {
-			manifests, err := cmd.render(f, config)
-			if err != nil {
-				return errors.Wrap(err, "error rendering deployment")
-			}
-
-			images, err := parseImages(manifests)
-			if err != nil {
-				return errors.Wrap(err, "error parsing images")
-			}
-
-			imageManual := "Manually enter the image I want to work on"
-			imageSkip := "Skip (do not add dev configuration for any images)"
-			imageAnswer := ""
+	developProject := "I want to develop this project and my current working dir contains the source code"
+	deployProject := "I just want to deploy this project"
+	defaultProjectAction := deployProject
+	if !configureManager.IsRemoteDeployment(imageName) {
+		defaultProjectAction = developProject
+	}
+	developOrDeployProject, err := cmd.log.Question(&survey.QuestionOptions{
+		Question:     "Do you want to develop this project with DevSpace or just deploy it?  [Use arrows to move, type to filter]",
+		Options:      []string{developProject, deployProject},
+		DefaultValue: defaultProjectAction,
+	})
+	if err != nil {
+		return err
+	}
 
-			if len(images) > 0 {
-				imageAnswer, err = cmd.log.Question(&survey.QuestionOptions{
-					Question:     "Which image do you want to develop with DevSpace?",
-					DefaultValue: images[0],
-					Options:      append(images, []string{imageManual, imageSkip}...),
-				})
+	image := ""
+	if developOrDeployProject == developProject {
+		for {
+			if !mustAddComponentChart {
+				manifests, err := cmd.render(f, config)
 				if err != nil {
-					return err
+					return errors.Wrap(err, "error rendering deployment")
 				}
-			} else {
-				imageAnswer, err = cmd.log.Question(&survey.QuestionOptions{
-					Question: "Couldn’t find any images in your manifests/helm charts. Do you want to skip this step?",
-					Options:  []string{imageManual, imageSkip},
-				})
+
+				images, err := parseImages(manifests)
 				if err != nil {
-					return err
+					return errors.Wrap(err, "error parsing images")
 				}
-			}
 
-			if imageAnswer == imageSkip {
-				break
-			} else if imageAnswer == imageManual {
-				imageQuestion := "What is the main container image of this project?"
+				imageManual := "Manually enter the image I want to work on"
+				imageSkip := "Skip (do not add dev configuration for any images)"
+				imageAnswer := ""
 
-				if selectedDeploymentOption == DeployOptionHelm {
-					imageQuestion = "What is the main container image of this project which is deployed by this Helm chart? (e.g. ecr.io/project/image)"
+				if len(images) > 0 {
+					imageAnswer, err = cmd.log.Question(&survey.QuestionOptions{
+						Question:     "Which image do you want to develop with DevSpace?",
+						DefaultValue: images[0],
+						Options:      append(images, []string{imageManual, imageSkip}...),
+					})
+					if err != nil {
+						return err
+					}
+				} else {
+					imageAnswer, err = cmd.log.Question(&survey.QuestionOptions{
+						Question: "Couldn’t find any images in your manifests/helm charts. Do you want to skip this step?",
+						Options:  []string{imageManual, imageSkip},
+					})
+					if err != nil {
+						return err
+					}
 				}
 
-				if selectedDeploymentOption == DeployOptionKubectl {
-					imageQuestion = "What is the main container image of this project which is deployed by these manifests? (e.g. ecr.io/project/image)"
-				}
+				if imageAnswer == imageSkip {
+					break
+				} else if imageAnswer == imageManual {
+					imageQuestion := "What is the main container image of this project?"
 
-				if selectedDeploymentOption == DeployOptionKustomize {
-					imageQuestion = "What is the main container image of this project which is deployed by this Kustomization? (e.g. ecr.io/project/image)"
-				}
+					if selectedDeploymentOption == DeployOptionHelm {
+						imageQuestion = "What is the main container image of this project which is deployed by this Helm chart? (e.g. ecr.io/project/image)"
+					}
+
+					if selectedDeploymentOption == DeployOptionKubectl {
+						imageQuestion = "What is the main container image of this project which is deployed by these manifests? (e.g. ecr.io/project/image)"
+					}
 
-				image, err = cmd.log.Question(&survey.QuestionOptions{
-					Question:          imageQuestion,
-					ValidationMessage: "Please enter a valid container image from a Kubernetes pod (e.g. myregistry.tld/project/image)",
-					ValidationFunc: func(name string) error {
-						_, _, err := dockerfile.GetStrippedDockerImageName(strings.ToLower(name))
+					if selectedDeploymentOption == DeployOptionKustomize {
+						imageQuestion = "What is the main container image of this project which is deployed by this Kustomization? (e.g. ecr.io/project/image)"
+					}
+
+					image, err = cmd.log.Question(&survey.QuestionOptions{
+						Question:          imageQuestion,
+						ValidationMessage: "Please enter a valid container image from a Kubernetes pod (e.g. myregistry.tld/project/image)",
+						ValidationFunc: func(name string) error {
+							_, _, err := dockerfile.GetStrippedDockerImageName(strings.ToLower(name))
+							return err
+						},
+					})
+					if err != nil {
 						return err
-					},
-				})
-				if err != nil {
-					return err
+					}
+				} else {
+					image = imageAnswer
 				}
-			} else {
-				image = imageAnswer
 			}
-		}
 
-		err = configureManager.AddImage(imageName, image, projectNamespace+"/"+projectName, cmd.Dockerfile)
-		if err != nil {
-			if err.Error() != "" {
-				cmd.log.Errorf("Error: %s", err.Error())
+			err = configureManager.AddImage(imageName, image, projectNamespace+"/"+projectName, cmd.Dockerfile)
+			if err != nil {
+				if err.Error() != "" {
+					cmd.log.Errorf("Error: %s", err.Error())
+				}
+			} else {
+				break
 			}
-		} else {
-			break
 		}
 	}
 

pkg/devspace/configure/deployment.go

@@ -81,6 +81,7 @@ func (m *manager) AddKubectlDeployment(deploymentName string, isKustomization bo
 	if isKustomization {
 		m.config.Deployments[deploymentName].Kubectl.Kustomize = ptr.Bool(isKustomization)
 	}
+	m.isRemote[deploymentName] = false
 
 	return nil
 }
@@ -147,6 +148,7 @@ func (m *manager) AddHelmDeployment(deploymentName string) error {
 			}
 
 			helmConfig.Chart.Name = localChartPathRel
+			m.isRemote[deploymentName] = false
 		} else if chartLocation == chartRepo || chartLocation == archiveURL {
 		ChartRepoLoop:
 			for {
@@ -249,6 +251,7 @@ func (m *manager) AddHelmDeployment(deploymentName string) error {
 							m.localCache.SetVar(passwordVar, password)
 						}
 
+						m.isRemote[deploymentName] = true
 						break ChartRepoLoop
 					}
 				}
@@ -305,6 +308,7 @@ func (m *manager) AddHelmDeployment(deploymentName string) error {
 					Events:  []string{"before:deploy"},
 				})
 
+				m.isRemote[deploymentName] = true
 				break
 			}
 		}
@@ -360,10 +364,15 @@ func (m *manager) AddComponentDeployment(deploymentName, image string, servicePo
 			Values: chartValues,
 		},
 	}
+	m.isRemote[deploymentName] = true
 
 	return nil
 }
 
+func (m *manager) IsRemoteDeployment(deploymentName string) bool {
+	return m.isRemote[deploymentName]
+}
+
 func chartRepoURL(url string) string {
 	repoURL := url
 	if !(strings.HasPrefix(url, "https://") || strings.HasPrefix(url, "http://")) {

pkg/devspace/configure/manager.go

@@ -2,6 +2,7 @@ package configure
 
 import (
 	"context"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/docker"
@@ -15,6 +16,7 @@ type Manager interface {
 	AddHelmDeployment(deploymentName string) error
 	AddComponentDeployment(deploymentName, image string, servicePort int) error
 	AddImage(imageName, image, projectNamespace, dockerfile string) error
+	IsRemoteDeployment(imageName string) bool
 }
 
 // Factory defines the factory methods needed by the configure manager to create new configuration
@@ -28,6 +30,7 @@ type manager struct {
 	config     *latest.Config
 	localCache localcache.Cache
 	factory    Factory
+	isRemote   map[string]bool
 }
 
 // NewManager creates a new instance of the interface Manager
@@ -37,5 +40,6 @@ func NewManager(factory Factory, config *latest.Config, localCache localcache.Ca
 		factory:    factory,
 		config:     config,
 		localCache: localCache,
+		isRemote:   map[string]bool{},
 	}
 }