e2e: add e2e test for this feat

Author: pratikjagrut

cmd/dev.go

@@ -603,12 +603,12 @@ func (cmd *DevCmd) startOutput(configInterface config.Config, dependencies []typ
 				return 0, pluginErr
 			}
 
-			// if config.Dev.Terminal is defined && config.Images is empty
+			// if config.Dev.Terminal is defined
 			// config.Dev.Terminal.ImageSelector is empty &&
 			// config.Dev.Terminal.LabelSelector is also empty &&
 			// config.Dev.Terminal.Command is defined then
 			// run the command locally instead on in container
-			if config.Images == nil && config.Dev.Terminal.ImageSelector == "" &&
+			if config.Dev.Terminal.ImageSelector == "" &&
 				config.Dev.Terminal.LabelSelector == nil &&
 				config.Dev.Terminal.Command != nil &&
 				len(config.Dev.Terminal.Command) > 0 {
@@ -624,6 +624,7 @@ func (cmd *DevCmd) startOutput(configInterface config.Config, dependencies []typ
 				}
 				// if command succeeds
 				cmd.log.Infof("Command '%s' returned: %s", command, stdout.String())
+				_, _ = cmd.Stdout.Write(stdout.Bytes()) // pass output to the devspace's stdout
 				return 0, nil
 			} else {
 				selectorOptions := targetselector.NewDefaultOptions().ApplyCmdParameter("", "", cmd.Namespace, "")
@@ -781,31 +782,33 @@ func (cmd *DevCmd) loadConfig(configOptions *loader.ConfigOptions) (config.Confi
 	// check if terminal is enabled
 	c := configInterface.Config()
 
-	if cmd.Terminal || (c.Dev.Terminal != nil && !c.Dev.Terminal.Disabled) {
+	if cmd.Terminal && c.Dev.Terminal == nil {
 		if c.Dev.Terminal == nil || (c.Dev.Terminal.ImageSelector == "" && len(c.Dev.Terminal.LabelSelector) == 0) {
+			if len(c.Images) == 0 {
+				return nil, errors.New("No image available in devspace config")
+			}
+
 			imageNames := make([]string, 0, len(c.Images))
 			for k := range c.Images {
 				imageNames = append(imageNames, k)
 			}
 
-			if len(imageNames) > 0 {
-				// if only one image exists, use it, otherwise show image picker
-				imageName := ""
-				if len(imageNames) == 1 {
-					imageName = imageNames[0]
-				} else {
-					imageName, err = cmd.log.Question(&survey.QuestionOptions{
-						Question: "Which image do you want to open a terminal to?",
-						Options:  imageNames,
-					})
-					if err != nil {
-						return nil, err
-					}
-				}
-				c.Dev.Terminal = &latest.Terminal{
-					ImageSelector: fmt.Sprintf("${runtime.images.%s.image}:${runtime.images.%s.tag}", imageName, imageName),
+			// if only one image exists, use it, otherwise show image picker
+			imageName := ""
+			if len(imageNames) == 1 {
+				imageName = imageNames[0]
+			} else {
+				imageName, err = cmd.log.Question(&survey.QuestionOptions{
+					Question: "Which image do you want to open a terminal to?",
+					Options:  imageNames,
+				})
+				if err != nil {
+					return nil, err
 				}
 			}
+			c.Dev.Terminal = &latest.Terminal{
+				ImageSelector: fmt.Sprintf("${runtime.images.%s.image}:${runtime.images.%s.tag}", imageName, imageName),
+			}
 
 		} else {
 			c.Dev.Terminal.Disabled = false

e2e/tests/terminal/terminal.go

@@ -133,6 +133,30 @@ var _ = DevSpaceDescribe("terminal", func() {
 		err = <-done
 		framework.ExpectNoError(err)
 	})
+
+	ginkgo.It("should run command locally", func() {
+		tempDir, err := framework.CopyToTempDir("tests/terminal/testdata/run_cmd_locally")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("terminal")
+		framework.ExpectNoError(err)
+		defer framework.ExpectDeleteNamespace(kubeClient, ns)
+
+		interrupt := make(chan error)
+		stdout := &Buffer{}
+		devCmd := &cmd.DevCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+			},
+			Interrupt: interrupt,
+			Stdout:    stdout,
+		}
+		err = devCmd.Run(f, nil)
+		framework.ExpectNoError(err)
+		framework.ExpectEqual("hello", strings.TrimSuffix(stdout.String(), "\n"))
+	})
 })
 
 // Buffer is a goroutine safe bytes.Buffer

e2e/tests/terminal/testdata/restart/devspace.yaml

@@ -1,4 +1,4 @@
-version: v1beta10
+version: v1beta11
 vars:
   - name: IMAGE
     value: john/devbackend
@@ -28,4 +28,4 @@ dev:
           path: spec.containers[0].workingDir
           value: "/workdir"
   terminal:
-    imageSelector: ${IMAGE}
+    imageSelector: ${IMAGE}

e2e/tests/terminal/testdata/run_cmd_locally/devspace.yaml

@@ -0,0 +1,31 @@
+version: v1beta11
+vars:
+  - name: IMAGE
+    value: john/devbackend
+deployments:
+  - name: test
+    helm:
+      componentChart: true
+      values:
+        containers:
+          - name: container-0
+            image: ${IMAGE}
+dev:
+  autoReload:
+    paths:
+      - ./devspace.yaml
+  replacePods:
+    - imageSelector: ${IMAGE}
+      replaceImage: ubuntu:18.04
+      patches:
+        - op: add
+          path: spec.containers[0].command
+          value: ["sleep"]
+        - op: add
+          path: spec.containers[0].args
+          value: ["9999999999"]
+        - op: add
+          path: spec.containers[0].workingDir
+          value: "/workdir"
+  terminal:
+    command: ["echo", "hello"]