Merge pull request #2161 from tukobadnyanoba/fix-clone-dependency-issue

Fix for skip-dependency issue while cloning the dependencies.

Author: FabianKramm

cmd/run_pipeline.go

@@ -343,7 +343,7 @@ func initialize(ctx context.Context, f factory.Factory, options *CommandOptions,
 	}
 
 	// resolve dependencies
-	dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{})
+	dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{SkipDependencies: options.DependencyOptions.Exclude})
 	if err != nil {
 		return nil, errors.Wrap(err, "deploy dependencies")
 	}

e2e/tests/build/build.go

@@ -78,6 +78,45 @@ var _ = DevSpaceDescribe("build", func() {
 		}
 		framework.ExpectEqual(found, true, "image not found in cache")
 	})
+	ginkgo.It("should build dockerfile with docker and skip-dependency", func() {
+		tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker-skip-dependency")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		// create build command
+		buildCmd := &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn: true,
+			},
+			SkipPush: true,
+			SkipDependency: []string{
+				"fake-dep",
+			},
+			Pipeline: "build",
+		}
+		err = buildCmd.RunDefault(f)
+		framework.ExpectNoError(err)
+
+		// create devspace docker client to access docker APIs
+		devspaceDockerClient, err := docker.NewClient(context.TODO(), log)
+		framework.ExpectNoError(err)
+
+		dockerClient := devspaceDockerClient.DockerAPIClient()
+		imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+		framework.ExpectNoError(err)
+
+		found := false
+	Outer:
+		for _, image := range imageList {
+			for _, tag := range image.RepoTags {
+				if tag == "my-docker-username/helloworld:latest" {
+					found = true
+					break Outer
+				}
+			}
+		}
+		framework.ExpectEqual(found, true, "image not found in cache")
+	})
 
 	ginkgo.It("should build dockerfile with docker and load in kind cluster", func() {
 		tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker")

e2e/tests/build/testdata/docker-skip-dependency/Dockerfile

@@ -0,0 +1,2 @@
+FROM alpine
+CMD ["/bin/echo", "'Hello world!'"]

e2e/tests/build/testdata/docker-skip-dependency/devspace.yaml

@@ -0,0 +1,10 @@
+version: v2beta1
+images:
+  app:
+    image: my-docker-username/helloworld
+    tags:
+    - latest
+dependencies:
+  fake-dep:
+    git: git@github.com:example/this-does-not-exist.git
+    branch: main

go.sum

@@ -43,7 +43,7 @@ type ResolveOptions struct {
 }
 
 func (m *manager) ResolveAll(ctx devspacecontext.Context, options ResolveOptions) ([]types.Dependency, error) {
-	dependencies, err := m.handleDependencies(ctx, options.SkipDependencies, options.Dependencies, "Resolve", func(ctx devspacecontext.Context, dependency *Dependency) error {
+	dependencies, err := m.handleDependencies(ctx, options, "Resolve", func(ctx devspacecontext.Context, dependency *Dependency) error {
 		return nil
 	})
 	if err != nil {
@@ -62,7 +62,7 @@ type BuildOptions struct {
 	Verbose          bool
 }
 
-func (m *manager) handleDependencies(ctx devspacecontext.Context, skipDependencies, filterDependencies []string, actionName string, action func(ctx devspacecontext.Context, dependency *Dependency) error) ([]types.Dependency, error) {
+func (m *manager) handleDependencies(ctx devspacecontext.Context, options ResolveOptions, actionName string, action func(ctx devspacecontext.Context, dependency *Dependency) error) ([]types.Dependency, error) {
 	if ctx.Config() == nil || ctx.Config().Config() == nil || len(ctx.Config().Config().Dependencies) == 0 {
 		return nil, nil
 	}
@@ -73,12 +73,12 @@ func (m *manager) handleDependencies(ctx devspacecontext.Context, skipDependenci
 	}
 
 	// Resolve all dependencies
-	dependencies, err := m.resolver.Resolve(ctx)
+	dependencies, err := m.resolver.Resolve(ctx, options)
 	if err != nil {
 		return nil, errors.Wrap(err, "resolve dependencies")
 	}
 
-	executedDependencies, err := m.executeDependenciesRecursive(ctx, "", dependencies, skipDependencies, filterDependencies, actionName, action, map[string]bool{})
+	executedDependencies, err := m.executeDependenciesRecursive(ctx, "", dependencies, options, actionName, action, map[string]bool{})
 	if err != nil {
 		hooksErr := hook.ExecuteHooks(ctx, map[string]interface{}{
 			"error": err,
@@ -98,15 +98,7 @@ func (m *manager) handleDependencies(ctx devspacecontext.Context, skipDependenci
 	return executedDependencies, nil
 }
 
-func (m *manager) executeDependenciesRecursive(
-	ctx devspacecontext.Context,
-	base string,
-	dependencies []types.Dependency,
-	skipDependencies, filterDependencies []string,
-	actionName string,
-	action func(ctx devspacecontext.Context, dependency *Dependency) error,
-	executedDependenciesIDs map[string]bool,
-) ([]types.Dependency, error) {
+func (m *manager) executeDependenciesRecursive(ctx devspacecontext.Context, base string, dependencies []types.Dependency, options ResolveOptions, actionName string, action func(ctx devspacecontext.Context, dependency *Dependency) error, executedDependenciesIDs map[string]bool) ([]types.Dependency, error) {
 	// Execute all dependencies
 	i := 0
 	executedDependencies := []types.Dependency{}
@@ -142,7 +134,7 @@ func (m *manager) executeDependenciesRecursive(
 				return nil, hooksErr
 			}
 
-			_, err := m.executeDependenciesRecursive(dependencyCtx, dependencyName, dependency.Children(), skipDependencies, filterDependencies, actionName, action, executedDependenciesIDs)
+			_, err := m.executeDependenciesRecursive(dependencyCtx, dependencyName, dependency.Children(), options, actionName, action, executedDependenciesIDs)
 			if err != nil {
 				hooksErr := hook.ExecuteHooks(dependencyCtx, map[string]interface{}{
 					"error": err,
@@ -161,9 +153,9 @@ func (m *manager) executeDependenciesRecursive(
 		}
 
 		// Check if we should act on this dependency
-		if !foundDependency(dependencyName, filterDependencies) {
+		if !foundDependency(dependencyName, options.Dependencies) {
 			continue
-		} else if skipDependency(dependencyName, skipDependencies) {
+		} else if skipDependency(dependencyName, options.SkipDependencies) {
 			ctx.Log().Infof("Skip dependency %s", dependencyName)
 			continue
 		}

pkg/devspace/dependency/manager.go

@@ -23,7 +23,7 @@ import (
 
 // ResolverInterface defines the resolver interface that takes dependency configs and resolves them
 type ResolverInterface interface {
-	Resolve(ctx devspacecontext.Context) ([]types.Dependency, error)
+	Resolve(ctx devspacecontext.Context, options ResolveOptions) ([]types.Dependency, error)
 	WithParser(parser loader.Parser) ResolverInterface
 }
 
@@ -61,14 +61,14 @@ func NewResolver(ctx devspacecontext.Context, configOptions *loader.ConfigOption
 }
 
 // Resolve implements interface
-func (r *resolver) Resolve(ctx devspacecontext.Context) ([]types.Dependency, error) {
+func (r *resolver) Resolve(ctx devspacecontext.Context, options ResolveOptions) ([]types.Dependency, error) {
 	currentWorkingDirectory, err := os.Getwd()
 	if err != nil {
 		return nil, errors.Wrap(err, "get current working directory")
 	}
 
 	// r.DependencyGraph.Root.ID == name here
-	err = r.resolveRecursive(ctx, currentWorkingDirectory, r.DependencyGraph.Root.ID, nil, transformMap(r.BaseConfig.Dependencies))
+	err = r.resolveRecursive(ctx, currentWorkingDirectory, r.DependencyGraph.Root.ID, nil, transformMap(r.BaseConfig.Dependencies), options)
 	if err != nil {
 		if _, ok := err.(*graph.CyclicError); ok {
 			return nil, err
@@ -102,11 +102,23 @@ func (r *resolver) WithParser(parser loader.Parser) ResolverInterface {
 	return &n
 }
 
-func (r *resolver) resolveRecursive(ctx devspacecontext.Context, basePath, parentConfigName string, currentDependency *Dependency, dependencies []*latest.DependencyConfig) error {
+func contains(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *resolver) resolveRecursive(ctx devspacecontext.Context, basePath, parentConfigName string, currentDependency *Dependency, dependencies []*latest.DependencyConfig, options ResolveOptions) error {
 	if currentDependency != nil {
 		currentDependency.children = []types.Dependency{}
 	}
 	for _, dependencyConfig := range dependencies {
+		if contains(options.SkipDependencies, dependencyConfig.Name) {
+			continue
+		}
 		dependencyConfigPath, err := util.DownloadDependency(ctx.Context(), basePath, dependencyConfig.Source, ctx.Log())
 		if err != nil {
 			return err
@@ -143,7 +155,7 @@ func (r *resolver) resolveRecursive(ctx devspacecontext.Context, basePath, paren
 
 			// load dependencies from dependency
 			if !dependencyConfig.IgnoreDependencies && child.localConfig.Config().Dependencies != nil && len(child.localConfig.Config().Dependencies) > 0 {
-				err = r.resolveRecursive(ctx, child.absolutePath, dependencyConfig.Name, child, transformMap(child.localConfig.Config().Dependencies))
+				err = r.resolveRecursive(ctx, child.absolutePath, dependencyConfig.Name, child, transformMap(child.localConfig.Config().Dependencies), options)
 				if err != nil {
 					return err
 				}

pkg/devspace/dependency/resolver.go

@@ -217,7 +217,7 @@ func TestResolver(t *testing.T) {
 		testResolver := NewResolver(devCtx, &loader.ConfigOptions{})
 		assert.NilError(t, err, "Error creating a resolver in testCase %s", testCase.name)
 
-		dependencies, err := testResolver.Resolve(devCtx)
+		dependencies, err := testResolver.Resolve(devCtx, ResolveOptions{})
 		if testCase.expectedErr == "" {
 			assert.NilError(t, err, "Unexpected error in testCase %s", testCase.name)
 		} else {