adds name to test fixture docker-compose files

Author: zerbitx

cmd/init.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-
+	
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
-
+	
 	"github.com/loft-sh/devspace/cmd"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/e2e/framework"
@@ -25,55 +25,55 @@ var _ = DevSpaceDescribe("init", func() {
 	if err != nil {
 		panic(err)
 	}
-
+	
 	// create a new factory
 	var (
 		f          *framework.DefaultFactory
 		kubeClient *kube.KubeHelper
 	)
-
+	
 	ginkgo.BeforeEach(func() {
 		f = framework.NewDefaultFactory()
-
+		
 		kubeClient, err = kube.NewKubeHelper()
 		framework.ExpectNoError(err)
 	})
-
+	
 	ginkgo.It("should create devspace.yml without registry details", func() {
 		tempDir, err := framework.CopyToTempDir("tests/init/testdata/new")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		// set the question answer func here
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			if strings.Contains(params.Question, "How do you want to deploy this project?") {
 				return cmd.DeployOptionHelm, nil
 			}
-
+			
 			if strings.Contains(params.Question, "If you were to push any images, which container registry would you want to push to?") {
 				return "Skip Registry", nil
 			}
-
+			
 			if strings.Contains(params.Question, "How should DevSpace build the container image for this project?") {
 				return "Skip / I don't know", nil
 			}
-
+			
 			return params.DefaultValue, nil
 		})
-
+		
 		initCmd := &cmd.InitCmd{GlobalFlags: &flags.GlobalFlags{}}
 		err = initCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		config, _, err := framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "devspace.yaml"))
 		framework.ExpectNoError(err)
-
+		
 		framework.ExpectEqual(len(config.Variables()), len(variable.AlwaysResolvePredefinedVars))
-
+		
 		ns, err := kubeClient.CreateNamespace("init")
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
-
+		
 		done := make(chan error)
 		go func() {
 			devCmd := &cmd.RunPipelineCmd{
@@ -85,46 +85,46 @@ var _ = DevSpaceDescribe("init", func() {
 			}
 			done <- devCmd.RunDefault(f)
 		}()
-
+		
 		err = <-done
 		framework.ExpectNoError(err)
 	})
-
+	
 	ginkgo.It("should create devspace.yml without registry details and manifests deploy", func() {
 		tempDir, err := framework.CopyToTempDir("tests/init/testdata/new")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		// set the question answer func here
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			if strings.Contains(params.Question, "Which registry would you want to use to push images to?") {
 				return "Skip Registry", nil
 			}
-
+			
 			if strings.Contains(params.Question, "How do you want to deploy this project?") {
 				return cmd.DeployOptionKubectl, nil
 			}
-
+			
 			if strings.Contains(params.Question, "Please enter the paths to your Kubernetes manifests") {
 				return "manifests/**", nil
 			}
-
+			
 			return params.DefaultValue, nil
 		})
-
+		
 		initCmd := &cmd.InitCmd{GlobalFlags: &flags.GlobalFlags{}}
 		err = initCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		config, _, err := framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "devspace.yaml"))
 		framework.ExpectNoError(err)
-
+		
 		framework.ExpectEqual(len(config.Variables()), len(variable.AlwaysResolvePredefinedVars))
-
+		
 		ns, err := kubeClient.CreateNamespace("init")
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
-
+		
 		devCmd := &cmd.RunPipelineCmd{
 			GlobalFlags: &flags.GlobalFlags{
 				NoWarn:    true,
@@ -136,42 +136,42 @@ var _ = DevSpaceDescribe("init", func() {
 		err = devCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 	})
-
+	
 	ginkgo.It("should create devspace.yml without registry details and kustomize deploy", func() {
 		tempDir, err := framework.CopyToTempDir("tests/init/testdata/new")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		// set the question answer func here
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			if strings.Contains(params.Question, "Which registry would you want to use to push images to?") {
 				return "Skip Registry", nil
 			}
-
+			
 			if strings.Contains(params.Question, "How do you want to deploy this project?") {
 				return cmd.DeployOptionKustomize, nil
 			}
-
+			
 			if strings.Contains(params.Question, "Please enter path to your Kustomization folder") {
 				return "./kustomization", nil
 			}
-
+			
 			return params.DefaultValue, nil
 		})
-
+		
 		initCmd := &cmd.InitCmd{GlobalFlags: &flags.GlobalFlags{}}
 		err = initCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		config, _, err := framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "devspace.yaml"))
 		framework.ExpectNoError(err)
-
+		
 		framework.ExpectEqual(len(config.Variables()), len(variable.AlwaysResolvePredefinedVars))
-
+		
 		ns, err := kubeClient.CreateNamespace("init")
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
-
+		
 		done := make(chan error)
 		go func() {
 			devCmd := &cmd.RunPipelineCmd{
@@ -183,50 +183,50 @@ var _ = DevSpaceDescribe("init", func() {
 			}
 			done <- devCmd.RunDefault(f)
 		}()
-
+		
 		err = <-done
 		framework.ExpectNoError(err)
 	})
-
+	
 	ginkgo.It("should create devspace.yml without registry details and local helm chart deploy", func() {
 		tempDir, err := framework.CopyToTempDir("tests/init/testdata/new")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		// set the question answer func here
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			if strings.Contains(params.Question, "Which registry would you want to use to push images to?") {
 				return "Skip Registry", nil
 			}
-
+			
 			if strings.Contains(params.Question, "How do you want to deploy this project?") {
 				return cmd.DeployOptionHelm, nil
 			}
-
+			
 			if strings.Contains(params.Question, "Which Helm chart do you want to use?") {
 				return `Use a local Helm chart (e.g. ./helm/chart/)`, nil
 			}
-
+			
 			if strings.Contains(params.Question, "Please enter the relative path to your local Helm chart") {
 				return "./chart", nil
 			}
-
+			
 			return params.DefaultValue, nil
 		})
-
+		
 		initCmd := &cmd.InitCmd{GlobalFlags: &flags.GlobalFlags{}}
 		err = initCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		config, _, err := framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "devspace.yaml"))
 		framework.ExpectNoError(err)
-
+		
 		framework.ExpectEqual(len(config.Variables()), len(variable.AlwaysResolvePredefinedVars))
-
+		
 		ns, err := kubeClient.CreateNamespace("init")
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
-
+		
 		done := make(chan error)
 		go func() {
 			devCmd := &cmd.RunPipelineCmd{
@@ -238,42 +238,42 @@ var _ = DevSpaceDescribe("init", func() {
 			}
 			done <- devCmd.RunDefault(f)
 		}()
-
+		
 		err = <-done
 		framework.ExpectNoError(err)
 	})
-
+	
 	ginkgo.It("should create devspace.yml from docker-compose.yaml", func() {
 		tempDir, err := framework.CopyToTempDir("tests/init/testdata/docker-compose")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		ns, err := kubeClient.CreateNamespace("init")
 		framework.ExpectNoError(err)
 		defer func() {
 			err := kubeClient.DeleteNamespace(ns)
 			framework.ExpectNoError(err)
 		}()
-
+		
 		// Answer all questions with the default
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			return params.DefaultValue, nil
 		})
-
+		
 		initCmd := &cmd.InitCmd{
 			Reconfigure: true,
 		}
 		err = initCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		// Created a devspace.yaml
 		_, _, err = framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "devspace.yaml"))
 		framework.ExpectNoError(err)
-
+		
 		// Created a .gitignore
 		_, err = os.Stat(filepath.Join(tempDir, ".gitignore"))
 		framework.ExpectNoError(err)
-
+		
 		// Print the config to verify the expected deployment
 		var configBuffer bytes.Buffer
 		printCmd := &cmd.PrintCmd{
@@ -283,18 +283,18 @@ var _ = DevSpaceDescribe("init", func() {
 			},
 			Out: &configBuffer,
 		}
-
+		
 		err = printCmd.Run(f)
 		framework.ExpectNoError(err)
-
+		
 		generatedConfig := &latest.Config{}
 		err = yaml.Unmarshal(configBuffer.Bytes(), generatedConfig)
 		framework.ExpectNoError(err)
-
+		
 		// validate config
 		framework.ExpectEqual(len(generatedConfig.Deployments), 1)
 		framework.ExpectHaveKey(generatedConfig.Deployments, "db")
-
+		
 		// ensure valid configuration by deploying the application
 		deployCmd := &cmd.RunPipelineCmd{
 			GlobalFlags: &flags.GlobalFlags{
@@ -306,7 +306,7 @@ var _ = DevSpaceDescribe("init", func() {
 			SkipPush: true,
 		}
 		err = deployCmd.RunDefault(f)
-
+		
 		framework.ExpectNoError(err)
 	})
 })

e2e/tests/init/init.go

@@ -1,3 +1,5 @@
+name: shiken
+
 version: "3.7"
 services:
   db: