Merge branch 'master' into v6-docs

Author: LukasGentele

README.md

@@ -1060,7 +1060,7 @@ This project is mainly written in Golang. If you want to contribute code:
 5. Build the project, e.g. via `go build -o devspace[.exe]`
 6. Evaluate and test your changes `./devspace [SOME_COMMAND]`
 
-See [Contributing Guideslines](CONTRIBUTING.md) for more information.
+See [Contributing Guidelines](CONTRIBUTING.md) for more information.
 
 <br>
 

cmd/init.go

@@ -443,14 +443,15 @@ echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
 
 	// Add pipeline: dev
 	config.Pipelines["dev"] = &latest.Pipeline{
-		Run: `run_dependency_pipelines --all    # 1. Deploy any projects this project needs (see "dependencies")
-create_deployments --all          # 2. Deploy Helm charts and manifests specfied as "deployments"
+		Run: `
+run_dependencies --all     # 1. Deploy any projects this project needs (see "dependencies")
+create_deployments --all   # 2. Deploy Helm charts and manifests specfied as "deployments"
 start_dev ` + imageName + `                     # 3. Start dev mode "` + imageName + `" (see "dev" section)`,
 	}
 
 	// Add pipeline: dev
 	config.Pipelines["deploy"] = &latest.Pipeline{
-		Run: `run_dependency_pipelines --all                    # 1. Deploy any projects this project needs (see "dependencies")
+		Run: `run_dependencies --all                    # 1. Deploy any projects this project needs (see "dependencies")
 build_images --all -t $(git describe --always)    # 2. Build, tag (git commit hash) and push all images (see "images")
 create_deployments --all                          # 3. Deploy Helm charts and manifests specfied as "deployments"`,
 	}

e2e/e2e_suite_test.go

@@ -19,6 +19,7 @@ import (
 	_ "github.com/loft-sh/devspace/e2e/tests/imports"
 	_ "github.com/loft-sh/devspace/e2e/tests/init"
 	_ "github.com/loft-sh/devspace/e2e/tests/pipelines"
+	_ "github.com/loft-sh/devspace/e2e/tests/portforward"
 	_ "github.com/loft-sh/devspace/e2e/tests/proxycommands"
 	_ "github.com/loft-sh/devspace/e2e/tests/pullsecret"
 	_ "github.com/loft-sh/devspace/e2e/tests/render"

e2e/framework/helper.go

@@ -2,15 +2,15 @@ package framework
 
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-	"time"
-
+	"github.com/go-resty/resty/v2"
 	"github.com/loft-sh/devspace/e2e/kube"
 	"github.com/onsi/gomega"
 	"github.com/pkg/errors"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"os"
+	"strings"
+	"time"
 )
 
 // ExpectEqual expects the specified two are the same, otherwise an exception raises
@@ -28,7 +28,7 @@ func ExpectError(err error, explain ...interface{}) {
 	gomega.ExpectWithOffset(1, err).To(gomega.HaveOccurred(), explain...)
 }
 
-// ExpectMatchError expects an error happens and has a message matching the given string, otherwise an exception raises
+// ExpectErrorMatch ExpectMatchError expects an error happens and has a message matching the given string, otherwise an exception raises
 func ExpectErrorMatch(err error, msg string, explain ...interface{}) {
 	gomega.ExpectWithOffset(1, err).To(gomega.HaveOccurred(), explain...)
 	gomega.ExpectWithOffset(1, err, explain...).To(gomega.MatchError(msg), explain...)
@@ -75,6 +75,30 @@ func ExpectRemoteFileContents(imageSelector string, namespace string, filePath s
 	ExpectNoErrorWithOffset(1, err)
 }
 
+func ExpectLocalCurlContents(urlString string, contents string) {
+	client := resty.New()
+	err := wait.PollImmediate(time.Second, time.Minute*2, func() (done bool, err error) {
+		resp, _ := client.R().
+			EnableTrace().
+			Get(urlString)
+		return strings.TrimSpace(string(resp.Body())) == strings.TrimSpace(contents), nil
+	})
+	ExpectNoErrorWithOffset(1, err)
+}
+
+func ExpectRemoteCurlContents(imageSelector string, namespace string, urlString string, contents string) {
+	kubeClient, err := kube.NewKubeHelper()
+	ExpectNoErrorWithOffset(1, err)
+	err = wait.PollImmediate(time.Second, time.Minute*2, func() (done bool, err error) {
+		out, err := kubeClient.ExecByImageSelector(imageSelector, namespace, []string{"curl", urlString})
+		if err != nil {
+			return false, nil
+		}
+		return strings.TrimSpace(out) == strings.TrimSpace(contents), nil
+	})
+	ExpectNoErrorWithOffset(1, err)
+}
+
 func ExpectRemoteFileNotFound(imageSelector string, namespace string, filePath string) {
 	kubeClient, err := kube.NewKubeHelper()
 	ExpectNoErrorWithOffset(1, err)

e2e/tests/dependencies/testdata/git/devspace.yaml

@@ -15,6 +15,6 @@ dependencies:
 pipelines:
   dev:
     run: |-
-      run_dependency_pipelines dependency
-      run_dependency_pipelines dependency-deploy > dependency.txt
+      run_dependencies dependency
+      run_dependencies dependency-deploy > dependency.txt
       dep-test > imports.txt

e2e/tests/dependencies/testdata/wait/dep1.yaml

@@ -7,7 +7,7 @@ dependencies:
 
 pipelines:
   deploy: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     # We use dep2 here because we don't know if dep1 or dep2 finishs first
     echo "dep2" >> out.txt
 

e2e/tests/dependencies/testdata/wait/dep2.yaml

@@ -7,6 +7,6 @@ dependencies:
 
 pipelines:
   deploy: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     echo "dep2" >> out.txt
 

e2e/tests/dependencies/testdata/wait/devspace.yaml

@@ -9,6 +9,6 @@ dependencies:
 
 pipelines:
   dev: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     echo "wait" >> out.txt
 

e2e/tests/imports/imports.go

@@ -70,6 +70,7 @@ var _ = DevSpaceDescribe("imports", func() {
 		framework.ExpectLocalFileContentsWithoutSpaces("import4.txt", "import4")
 		framework.ExpectLocalFileContentsWithoutSpaces("import5.txt", "import5")
 		framework.ExpectLocalFileContentsWithoutSpaces("vars.txt", ns+"-"+ns+"-base-import1-import2-import3")
+		framework.ExpectLocalFileContentsWithoutSpaces("top.txt", "top")
 
 		// make sure temp folder is erased
 		_, err = os.Stat(strings.TrimSpace(string(out)))

e2e/tests/imports/testdata/local/devspace.yaml

@@ -10,6 +10,7 @@ imports:
 
 vars:
   BASE: base
+  TOP: top
 
 dependencies:
   import1:
@@ -21,8 +22,9 @@ pipelines:
     run: |-
       echo ${devspace.name} > name.txt
       echo ${DEVSPACE_TMPDIR} > temp.txt
+      echo ${TOP} > top.txt
       
-      run_dependency_pipelines --all > dependency.txt
+      run_dependencies --all > dependency.txt
       
       run_pipelines import1 > import1.txt
       run_pipelines import2 > import2.txt