Merge pull request #1889 from lizardruss/master

devspace init + devspace dev fails

Author: FabianKramm

cmd/init.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -10,7 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
+	"github.com/loft-sh/devspace/cmd/flags"
+	"github.com/vmware-labs/yaml-jsonpath/pkg/yamlpath"
+	yaml "gopkg.in/yaml.v3"
 
 	"github.com/loft-sh/devspace/pkg/devspace/compose"
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
@@ -238,13 +241,24 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 		for {
 			image := ""
 			if imageQuestion != "" {
+				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")
+				}
+
+				if len(images) == 0 {
+					return fmt.Errorf("no images found for the selected deployments")
+				}
+
 				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 := imageselector.GetStrippedDockerImageName(strings.ToLower(name))
-						return err
-					},
+					Question:     imageQuestion,
+					DefaultValue: images[0],
+					Options:      images,
 				})
 				if err != nil {
 					return err
@@ -727,3 +741,57 @@ func (cmd *InitCmd) addProfileConfig(config *latest.Config, imageName string) er
 	}
 	return nil
 }
+
+func (cmd *InitCmd) render(f factory.Factory, config *latest.Config) (string, error) {
+	// Save temporary file to render it
+	renderPath := loader.ConfigPath("render.yaml")
+	configLoader := loader.NewConfigLoader(renderPath)
+
+	err := configLoader.Save(config)
+	defer os.Remove(renderPath)
+	if err != nil {
+		return "", err
+	}
+
+	// Use the render command to render it.
+	writer := &bytes.Buffer{}
+	renderCmd := &RenderCmd{
+		GlobalFlags: &flags.GlobalFlags{
+			Silent:     true,
+			ConfigPath: renderPath,
+		},
+		SkipPush:  true,
+		SkipBuild: true,
+		Writer:    writer,
+	}
+	err = renderCmd.Run(f)
+	if err != nil {
+		return "", err
+	}
+
+	return writer.String(), nil
+}
+
+func parseImages(manifests string) ([]string, error) {
+	images := []string{}
+
+	var doc yaml.Node
+	dec := yaml.NewDecoder(bytes.NewReader([]byte(manifests)))
+	for dec.Decode(&doc) == nil {
+		path, err := yamlpath.NewPath("..image")
+		if err != nil {
+			return nil, err
+		}
+
+		matches, err := path.Find(&doc)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, match := range matches {
+			images = append(images, match.Value)
+		}
+	}
+
+	return images, nil
+}

cmd/init_test.go

@@ -1,5 +1,12 @@
 package cmd
 
+import (
+	"testing"
+
+	"gotest.tools/assert"
+	"gotest.tools/assert/cmp"
+)
+
 /*import (
 	"io/ioutil"
 	"os"
@@ -303,3 +310,114 @@ func testInit(t *testing.T, testCase initTestCase) {
 	})
 	assert.NilError(t, err, "Error cleaning up in testCase %s", testCase.name)
 }*/
+
+type parseImagesTestCase struct {
+	name      string
+	manifests string
+	expected  []string
+}
+
+func TestParseImages(t *testing.T) {
+	testCases := []parseImagesTestCase{
+		{
+			name: `Single`,
+			manifests: `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "new"
+  labels:
+    "app.kubernetes.io/name": "devspace-app"
+    "app.kubernetes.io/component": "test"
+    "app.kubernetes.io/managed-by": "Helm"
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      "app.kubernetes.io/name": "devspace-app"
+      "app.kubernetes.io/component": "test"
+      "app.kubernetes.io/managed-by": "Helm"
+  template:
+    metadata:
+      labels:
+        "app.kubernetes.io/name": "devspace-app"
+        "app.kubernetes.io/component": "test"
+        "app.kubernetes.io/managed-by": "Helm"
+    spec:
+      containers:
+        - image: "username/app"
+          name: "container-0"
+`,
+			expected: []string{
+				"username/app",
+			},
+		},
+		{
+			name: `Multiple`,
+			manifests: `
+---
+# Source: my-app/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: php
+  labels:
+    release: "test-helm"
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+  selector:
+    release: "test-helm"
+---
+# Source: my-app/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-helm
+  labels:
+    release: "test-helm"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      release: "test-helm"
+  template:
+    metadata:
+      annotations:
+        revision: "1"
+      labels:
+        release: "test-helm"
+    spec:
+      containers:
+      - name: default
+        image: "php"
+`,
+			expected: []string{
+				"php",
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+		manifests := testCase.manifests
+
+		actual, err := parseImages(manifests)
+		assert.NilError(
+			t,
+			err,
+			"Unexpected error in test case %s",
+			testCase.name,
+		)
+
+		expected := testCase.expected
+		assert.Assert(
+			t,
+			cmp.DeepEqual(expected, actual),
+			"Unexpected values in test case %s",
+			testCase.name,
+		)
+	}
+}

e2e/framework/util.go

@@ -91,7 +91,7 @@ func CleanupTempDir(initialDir, tempDir string) {
 }
 
 func CopyToTempDir(relativePath string) (string, error) {
-	dir, err := ioutil.TempDir("", "")
+	dir, err := ioutil.TempDir("", "temp-*")
 	if err != nil {
 		return "", err
 	}