tests: add git dependency e2e test

Author: FabianKramm

e2e/framework/helper.go

@@ -70,7 +70,7 @@ func ExpectRemoteFileContents(imageSelector string, namespace string, filePath s
 			return false, nil
 		}
 
-		return out == contents, nil
+		return strings.TrimSpace(out) == strings.TrimSpace(contents), nil
 	})
 	ExpectNoErrorWithOffset(1, err)
 }

e2e/tests/dependencies/dependencies.go

@@ -2,7 +2,10 @@ package dependencies
 
 import (
 	"context"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
+	dependencyutil "github.com/loft-sh/devspace/pkg/devspace/dependency/util"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
+	"io/ioutil"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"os"
@@ -38,6 +41,67 @@ var _ = DevSpaceDescribe("dependencies", func() {
 		kubeClient, err = kube.NewKubeHelper()
 	})
 
+	ginkgo.It("should deploy git dependency", func() {
+		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/git")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("dependencies")
+		framework.ExpectNoError(err)
+		defer func() {
+			err := kubeClient.DeleteNamespace(ns)
+			framework.ExpectNoError(err)
+		}()
+
+		// create a new dev command and start it
+		done := make(chan error)
+		cancelCtx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+		go func() {
+			devCmd := &cmd.DevCmd{
+				GlobalFlags: &flags.GlobalFlags{
+					NoWarn:    true,
+					Namespace: ns,
+				},
+				Ctx: cancelCtx,
+			}
+			err := devCmd.Run(f)
+			if err != nil {
+				f.GetLog().Errorf("error: %v", err)
+			}
+			done <- err
+		}()
+
+		// make sure the dependencies are correctly deployed
+		id, err := dependencyutil.GetDependencyID(&latest.SourceConfig{
+			Git: "https://github.com/loft-sh/e2e-test-dependency.git",
+		})
+		framework.ExpectNoError(err)
+
+		// calculate dependency path
+		dependencyPath := filepath.Join(dependencyutil.DependencyFolderPath, id)
+
+		// wait until file is there
+		framework.ExpectLocalFileContents("imports.txt", "Test-dep-test\n")
+		framework.ExpectLocalFileContents(filepath.Join(dependencyPath, "dependency-dev.txt"), "Hello I am dependency\n")
+		framework.ExpectLocalFileContents(filepath.Join(dependencyPath, "dependency-deploy.txt"), "Hello I am dependency-deploy\n")
+		framework.ExpectLocalFileContents("dependency.txt", "Hello again I am dependency-deploy\n")
+
+		// expect remote file
+		framework.ExpectRemoteFileContents("alpine", ns, "/app/test.txt", "dependency123")
+
+		// now check if sync is still working
+		err = ioutil.WriteFile(filepath.Join(dependencyPath, "test123.txt"), []byte("test123"), 0777)
+		framework.ExpectNoError(err)
+
+		// now check if file gets synced
+		framework.ExpectRemoteFileContents("alpine", ns, "/app/test123.txt", "test123")
+
+		cancel()
+		err = <-done
+		framework.ExpectNoError(err)
+	})
+
 	ginkgo.It("should skip equal dependencies", func() {
 		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/overlapping")
 		framework.ExpectNoError(err)

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

@@ -0,0 +1,21 @@
+version: v2beta1
+name: dep-test
+
+imports:
+  - git: https://github.com/loft-sh/e2e-test-dependency.git
+    branch: imports
+
+dependencies:
+  dependency:
+    git: https://github.com/loft-sh/e2e-test-dependency.git
+    pipeline: dev
+  dependency-deploy:
+    git: https://github.com/loft-sh/e2e-test-dependency.git
+
+pipelines:
+  dev:
+    steps:
+    - run: |-
+        run_dependency_pipelines dependency
+        run_dependency_pipelines dependency-deploy > dependency.txt
+        run_command dep-test > imports.txt

pkg/devspace/dependency/util/util.go

@@ -35,7 +35,7 @@ func init() {
 }
 
 func DownloadDependency(ctx context.Context, workingDirectory string, source *latest.SourceConfig, log log.Logger) (configPath string, err error) {
-	ID, err := getDependencyID(source)
+	ID, err := GetDependencyID(source)
 	if err != nil {
 		return "", err
 	}
@@ -46,7 +46,7 @@ func DownloadDependency(ctx context.Context, workingDirectory string, source *la
 		gitPath := strings.TrimSpace(source.Git)
 
 		_ = os.MkdirAll(DependencyFolderPath, 0755)
-		localPath = filepath.Join(DependencyFolderPath, encoding.Convert(ID))
+		localPath = filepath.Join(DependencyFolderPath, ID)
 
 		// Check if dependency exists
 		_, statErr := os.Stat(localPath)
@@ -84,7 +84,7 @@ func DownloadDependency(ctx context.Context, workingDirectory string, source *la
 		}
 	} else if source.Path != "" {
 		if isURL(source.Path) {
-			localPath = filepath.Join(DependencyFolderPath, encoding.Convert(ID))
+			localPath = filepath.Join(DependencyFolderPath, ID)
 			_ = os.MkdirAll(localPath, 0755)
 
 			// Check if dependency exists
@@ -157,7 +157,7 @@ func getDependencyConfigPath(dependencyPath string, source *latest.SourceConfig)
 	return configPath, nil
 }
 
-func getDependencyID(source *latest.SourceConfig) (string, error) {
+func GetDependencyID(source *latest.SourceConfig) (string, error) {
 	// check if source is there
 	if source == nil {
 		return "", fmt.Errorf("source is missing")
@@ -174,7 +174,7 @@ func getDependencyID(source *latest.SourceConfig) (string, error) {
 			id += "@revision:" + source.Revision
 		}
 
-		return id, nil
+		return encoding.Convert(id), nil
 	} else if source.Path != "" {
 		return source.Path, nil
 	}