Merge pull request #1853 from FabianKramm/master

fix: fixed runtime var issue in after:build hook

Author: FabianKramm

e2e/tests/build/build.go

@@ -66,15 +66,17 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
 		framework.ExpectNoError(err)
 
+		found := false
+	Outer:
 		for _, image := range imageList {
-			if image.RepoTags[0] == "my-docker-username/helloworld:latest" {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
+			for _, tag := range image.RepoTags {
+				if tag == "my-docker-username/helloworld:latest" {
+					found = true
+					break Outer
+				}
 			}
 		}
-		framework.ExpectNoError(err)
+		framework.ExpectEqual(found, true, "image not found in cache")
 	})
 
 	ginkgo.It("should build dockerfile with buildkit", func() {

e2e/tests/config/config.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/loft-sh/devspace/pkg/devspace/config/generated"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
 
 	"github.com/loft-sh/devspace/cmd"
@@ -15,6 +16,7 @@ import (
 
 	"github.com/loft-sh/devspace/cmd/use"
 	"github.com/loft-sh/devspace/e2e/framework"
+	"github.com/loft-sh/devspace/e2e/kube"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/util/survey"
 	"github.com/onsi/ginkgo"
@@ -29,32 +31,45 @@ var _ = DevSpaceDescribe("config", func() {
 
 	// create a new factory
 	var (
-		f *framework.DefaultFactory
+		f          *framework.DefaultFactory
+		kubeClient *kube.KubeHelper
 	)
 
 	ginkgo.BeforeEach(func() {
 		f = framework.NewDefaultFactory()
+
+		kubeClient, err = kube.NewKubeHelper()
+		framework.ExpectNoError(err)
 	})
 
 	ginkgo.It("should resolve runtime environment variables correctly", func() {
 		tempDir, err := framework.CopyToTempDir("tests/config/testdata/runtime-variables")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
 
-		configBuffer := &bytes.Buffer{}
-		printCmd := &cmd.PrintCmd{
+		ns, err := kubeClient.CreateNamespace("config")
+		framework.ExpectNoError(err)
+		defer func() {
+			err := kubeClient.DeleteNamespace(ns)
+			framework.ExpectNoError(err)
+		}()
+
+		printCmd := &cmd.DeployCmd{
 			GlobalFlags: &flags.GlobalFlags{
-				Namespace: "test-ns",
+				Namespace: ns,
 			},
-			Out:      configBuffer,
-			SkipInfo: true,
 		}
 
 		err = printCmd.Run(f)
 		framework.ExpectNoError(err)
 		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out.txt"), "test-testimage-latest-dep1")
 		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out2.txt"), "Done")
-		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out3.txt"), "test-ns-resolved-${NOT_RESOLVED}")
+		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out3.txt"), ns+"-resolved-${NOT_RESOLVED}")
+
+		// read the generated.yaml
+		config, err := generated.NewConfigLoader("").Load()
+		framework.ExpectNoError(err)
+		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out0.txt"), "my-docker-username/helloworld2:"+config.GetActive().GetImageCache("app-test").Tag)
 	})
 
 	ginkgo.It("should load multiple profiles in order via --profile", func() {

e2e/tests/config/testdata/runtime-variables/dep1.yaml

@@ -14,4 +14,4 @@ hooks:
   - name: test-123
     command: |-
       echo ${runtime.dependencies.dep2.images.app.image}
-    events: ["after:resolveDependencies"]
+    events: ["after:deployDependencies"]

e2e/tests/config/testdata/runtime-variables/devspace.yaml

@@ -12,24 +12,38 @@ dependencies:
     source:
       path: ./dep1.yaml
 images:
+  aap-test:
+    image: my-docker-username/helloworld3
+    build:
+      docker:
+        skipPush: true
+  app-test:
+    image: my-docker-username/helloworld2
+    build:
+      docker:
+        skipPush: true
   app:
     image: my-docker-username/helloworld
     tags:
       - latest
     build:
       disabled: true
 hooks:
+  - name: test-012
+    command: |-
+      echo -n ${runtime.images.app-test.image}:${runtime.images.app-test.tag} > out0.txt
+    events: ["after:build:app-test"]
   - name: test-123
     command: |-
       # This should print test-testimage-latest-dep1
       echo -n $(echo -n "${OTHER}-${runtime.dependencies.dep1.hooks.test-123.stdout}-${runtime.images.app.tag}-${runtime.dependencies.dep1.images.app.tag}") > out.txt
       echo -n "Done"
-    events: ["after:resolveDependencies"]
+    events: ["after:deployDependencies"]
   - name: test-124
     command: |-
       # This should print Done
       echo -n ${runtime.hooks.test-123.stdout} > out2.txt
-    events: ["after:resolveDependencies"]
+    events: ["after:deployDependencies"]
   - name: test-125
     command: $(cat command.txt)
-    events: ["after:resolveDependencies"]
+    events: ["after:deployDependencies"]

pkg/devspace/build/build.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
 	"github.com/loft-sh/devspace/pkg/util/scanner"
 
@@ -20,6 +21,8 @@ type imageNameAndTag struct {
 	imageConfigName string
 	imageName       string
 	imageTag        string
+	imageTags       []string
+	imageConfig     latest.ImageConfig
 }
 
 // Options describe how images should be build
@@ -246,22 +249,13 @@ func (c *controller) Build(options *Options, log logpkg.Logger) (map[string]stri
 					return
 				}
 
-				// Execute plugin hook
-				pluginErr := hook.ExecuteHooks(c.client, c.config, c.dependencies, map[string]interface{}{
-					"IMAGE_CONFIG_NAME": imageConfigName,
-					"IMAGE_NAME":        imageName,
-					"IMAGE_CONFIG":      cImageConf,
-					"IMAGE_TAGS":        imageTags,
-				}, log, hook.EventsForSingle("after:build", imageConfigName).With("build.afterBuild")...)
-				if pluginErr != nil {
-					errChan <- pluginErr
-				}
-
 				// Send the response
 				cacheChan <- imageNameAndTag{
 					imageConfigName: imageConfigName,
 					imageName:       imageName,
 					imageTag:        imageTags[0],
+					imageTags:       imageTags,
+					imageConfig:     cImageConf,
 				}
 			}()
 		}
@@ -306,6 +300,17 @@ func (c *controller) waitForBuild(errChan <-chan error, cacheChan <-chan imageNa
 
 		// Track built images
 		builtImages[done.imageName] = done.imageTag
+
+		// Execute plugin hook
+		pluginErr := hook.ExecuteHooks(c.client, c.config, c.dependencies, map[string]interface{}{
+			"IMAGE_CONFIG_NAME": done.imageConfigName,
+			"IMAGE_NAME":        done.imageName,
+			"IMAGE_CONFIG":      done.imageConfig,
+			"IMAGE_TAGS":        done.imageTags,
+		}, log, hook.EventsForSingle("after:build", done.imageConfigName).With("build.afterBuild")...)
+		if pluginErr != nil {
+			return pluginErr
+		}
 	}
 
 	return nil