feat: add hooks output runtime variable

Author: FabianKramm

e2e/kube/kube.go

@@ -3,12 +3,12 @@ package kube
 import (
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
 	"strings"
 	"time"
 
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/services/targetselector"
-	"github.com/loft-sh/devspace/pkg/util/imageselector"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/randutil"
 	corev1 "k8s.io/api/core/v1"

pkg/devspace/config/loader/loader_test.go

@@ -1291,13 +1291,12 @@ deployments:
 - name: deployment
   helm:
     componentChart: true
-    values:
-      containers:
-      - image: nginx
+    valuesFiles:
+      - test.yaml
 profiles:
 - name: testprofile
   patches:
-  - path: deployments..image
+  - path: deployments..valuesFiles[0]
     op: replace
     value: $(echo ubuntu)
 `,
@@ -1314,12 +1313,8 @@ profiles:
 						Name: "deployment",
 						Helm: &latest.HelmConfig{
 							ComponentChart: ptr.Bool(true),
-							Values: map[interface{}]interface{}{
-								"containers": []interface{}{
-									map[interface{}]interface{}{
-										"image": "ubuntu",
-									},
-								},
+							ValuesFiles: []string{
+								"ubuntu",
 							},
 						},
 					},
@@ -1420,7 +1415,7 @@ profiles:
 							Values: map[interface{}]interface{}{
 								"containers": []interface{}{
 									map[interface{}]interface{}{
-										"image": "ubuntu",
+										"image": "${IMAGE_B}",
 									},
 								},
 							},
@@ -1440,18 +1435,17 @@ deployments:
 - name: deployment
   helm:
     componentChart: true
-    values:
-      containers:
-      - image: nginx
+    valuesFiles:
+      - test.yaml
 profiles:
 - name: A
   patches:
-  - path: deployments..image
+  - path: deployments..valuesFiles[0]
     op: replace
     value: $(echo ${IMAGE_A})
 - name: B
   patches:
-  - path: deployments..image
+  - path: deployments..valuesFiles[0]
     op: replace
     value: $(echo ${IMAGE_B})
 `,
@@ -1466,12 +1460,8 @@ profiles:
 						Name: "deployment",
 						Helm: &latest.HelmConfig{
 							ComponentChart: ptr.Bool(true),
-							Values: map[interface{}]interface{}{
-								"containers": []interface{}{
-									map[interface{}]interface{}{
-										"image": "ubuntu",
-									},
-								},
+							ValuesFiles: []string{
+								"ubuntu",
 							},
 						},
 					},
@@ -2052,7 +2042,7 @@ profiles:
 - name: A
   activation:
   - vars:
-      USE_A: true
+      USE_A: "true"
   patches:
   - path: deployments..image
     op: replace
@@ -2104,7 +2094,7 @@ profiles:
 - name: A
   activation:
   - vars:
-      USE_A: true
+      USE_A: "true"
   patches:
   - path: deployments..image
     op: replace

pkg/devspace/config/loader/parser.go

@@ -97,7 +97,14 @@ func (p *profilesParser) Parse(originalRawConfig map[interface{}]interface{}, ra
 func fillVariablesAndParse(resolver variable.Resolver, preparedConfig map[interface{}]interface{}, log log.Logger) (*latest.Config, error) {
 	// fill in variables and expressions (leave out
 	preparedConfigInterface, err := resolver.FillVariablesExclude(preparedConfig, []string{
-		//"/deployments/*/helm/values",
+		"/deployments/*/helm/values/**",
+		"/hooks/*/command",
+		"/hooks/*/args/*",
+		"/hooks/*/container/imageSelector",
+		"/dev/ports/*/imageSelector",
+		"/dev/sync/*/imageSelector",
+		"/dev/logs/*/selectors/*/imageSelector",
+		"/dev/terminal/imageSelector",
 	})
 	if err != nil {
 		return nil, err

pkg/devspace/config/loader/variable/expression/expression.go

@@ -46,10 +46,20 @@ func ResolveAllExpressions(preparedConfig interface{}, dir string, exclude []*re
 			return nil, err
 		}
 
+		return t, nil
+	case []interface{}:
+		for i := range t {
+			var err error
+			t[i], err = ResolveAllExpressions(t[i], dir, exclude)
+			if err != nil {
+				return nil, err
+			}
+		}
+		
 		return t, nil
 	}
 
-	return nil, fmt.Errorf("unrecognized haystack type: %#v", preparedConfig)
+	return preparedConfig, nil
 }
 
 func ResolveExpressions(value, dir string) (interface{}, error) {

pkg/devspace/config/loader/variable/resolver.go

@@ -58,9 +58,19 @@ func (r *resolver) fillVariables(haystack interface{}, exclude []*regexp.Regexp)
 			return r.replaceString(value)
 		})
 		return t, err
+	case []interface{}:
+		for i := range t {
+			var err error
+			t[i], err = r.fillVariables(t[i], exclude)
+			if err != nil {
+				return nil, err
+			}
+		}
+		
+		return t, nil
 	}
 
-	return nil, fmt.Errorf("unrecognized haystack type: %#v", haystack)
+	return haystack, nil
 }
 
 func (r *resolver) ResolvedVariables() map[string]interface{} {
@@ -117,6 +127,7 @@ func (r *resolver) FillVariablesExclude(haystack interface{}, excludedPaths []st
 	paths := []*regexp.Regexp{}
 	for _, path := range excludedPaths {
 		path = strings.Replace(path, "*", "[^/]+", -1)
+		path = strings.Replace(path, "**", ".+", -1)
 		path = "^" + path
 		expr, err := regexp.Compile(path)
 		if err != nil {

pkg/devspace/config/loader/variable/runtime/runtime_resolver.go

@@ -133,5 +133,5 @@ func (r *runtimeResolver) fillRuntimeVariable(name string, config config.Config,
 		return NewRuntimeVariable(name, config, dependencies, builtImages).Load()
 	}
 
-	return false, nil, fmt.Errorf("cannot resolve variable %s as it is not a runtime variable and apparently wasn't resolved earlier")
+	return false, nil, fmt.Errorf("cannot resolve variable %s as it is not a runtime variable and apparently wasn't resolved earlier", name)
 }

pkg/devspace/deploy/deployer/kubectl/walk/walk_test.go

@@ -30,7 +30,7 @@ test2:
 	match := MatchFn(func(key, value string) bool {
 		return key == "image" && value != "dontreplaceme"
 	})
-	replace := ReplaceFn(func(value string) (interface{}, error) {
+	replace := ReplaceFn(func(_, value string) (interface{}, error) {
 		if value == "appendtag" {
 			return "appendtag:test", nil
 		}

pkg/devspace/hook/local_command.go

@@ -1,6 +1,7 @@
 package hook
 
 import (
+	"bytes"
 	"encoding/json"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	"io"
@@ -55,12 +56,21 @@ func (l *localCommandHook) Execute(hook *latest.HookConfig, client kubectl.Clien
 	}
 
 	// if args are nil we execute the command in a shell
+	stdout := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+	defer func() {
+		if hook.Name != "" {
+			config.SetRuntimeVariable("hooks."+hook.Name+".stdout", stdout.String())
+			config.SetRuntimeVariable("hooks."+hook.Name+".stderr", stderr.String())
+		}
+	}()
+
 	if hook.Args == nil {
-		return shell.ExecuteShellCommand(hookCommand, nil, dir, l.Stdout, l.Stderr, extraEnv)
+		return shell.ExecuteShellCommand(hookCommand, nil, dir, io.MultiWriter(l.Stdout, stdout), io.MultiWriter(l.Stderr, stderr), extraEnv)
 	}
 
 	// else we execute it directly
-	return command.ExecuteCommandWithEnv(hookCommand, hookArgs, dir, l.Stdout, l.Stderr, extraEnv)
+	return command.ExecuteCommandWithEnv(hookCommand, hookArgs, dir, io.MultiWriter(l.Stdout, stdout), io.MultiWriter(l.Stderr, stderr), extraEnv)
 }
 
 func ResolveCommand(command string, args []string, config config.Config, dependencies []types.Dependency) (string, []string, error) {

pkg/devspace/hook/remote_command.go

@@ -57,13 +57,23 @@ func (r *remoteCommandHook) ExecuteRemotely(hook *latest.HookConfig, podContaine
 		}
 	}
 
+	// if args are nil we execute the command in a shell
+	stdout := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+	defer func() {
+		if hook.Name != "" {
+			config.SetRuntimeVariable("hooks."+hook.Name+".stdout", stdout.String())
+			config.SetRuntimeVariable("hooks."+hook.Name+".stderr", stderr.String())
+		}
+	}()
+
 	log.Infof("Execute hook '%s' in container '%s/%s/%s'", ansi.Color(hookName(hook), "white+b"), podContainer.Pod.Namespace, podContainer.Pod.Name, podContainer.Container.Name)
 	err = client.ExecStream(&kubectl.ExecStreamOptions{
 		Pod:       podContainer.Pod,
 		Container: podContainer.Container.Name,
 		Command:   cmd,
-		Stdout:    r.Stdout,
-		Stderr:    r.Stderr,
+		Stdout:    io.MultiWriter(r.Stdout, stdout),
+		Stderr:    io.MultiWriter(r.Stderr, stderr),
 	})
 	if err != nil {
 		return errors.Errorf("error in container '%s/%s/%s': %v", podContainer.Pod.Namespace, podContainer.Pod.Name, podContainer.Container.Name, err)