Merge pull request #2143 from FabianKramm/print-feat

feat: allow profiles & hooks in imports

Author: FabianKramm

e2e/tests/imports/imports.go

@@ -48,6 +48,7 @@ var _ = DevSpaceDescribe("imports", func() {
 			GlobalFlags: &flags.GlobalFlags{
 				NoWarn:    true,
 				Namespace: ns,
+				Profiles:  []string{"my-profile"},
 			},
 			Pipeline: "deploy",
 		}
@@ -69,6 +70,7 @@ var _ = DevSpaceDescribe("imports", func() {
 		framework.ExpectLocalFileContentsWithoutSpaces("import3.txt", "import3")
 		framework.ExpectLocalFileContentsWithoutSpaces("import4.txt", "import4")
 		framework.ExpectLocalFileContentsWithoutSpaces("import5.txt", "import5")
+		framework.ExpectLocalFileContentsWithoutSpaces("profile_import.txt", "PROFILE_TEST")
 		framework.ExpectLocalFileContentsWithoutSpaces("vars.txt", ns+"-"+ns+"-base-import1-import2-import3")
 		framework.ExpectLocalFileContentsWithoutSpaces("top.txt", "top")
 

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

@@ -3,6 +3,7 @@ name: base
 
 imports:
   - path: import1.yaml
+  - path: profile_import.yaml
   - enabled: $(is_equal ${BASE} "base")
     path: import2.yaml
   - enabled: $(is_equal ${IMPORT1} "import1")
@@ -33,4 +34,5 @@ pipelines:
       run_pipelines import4 > import4.txt
       run_pipelines import5 > import5.txt
 
+      echo ${PROFILE_TEST} > profile_import.txt 
       echo ${DEVSPACE_NAMESPACE}-${devspace.namespace}-${BASE}-${IMPORT1}-${IMPORT2}-${IMPORT3} > vars.txt

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

@@ -0,0 +1,8 @@
+version: v2beta1
+name: profile-import
+
+profiles:
+  - name: my-profile
+    merge:
+      vars:
+        PROFILE_TEST: "PROFILE_TEST"

pkg/devspace/config/loader/imports.go

@@ -25,6 +25,8 @@ var ImportSections = []string{
 	"functions",
 	"pullSecrets",
 	"dependencies",
+	"profiles",
+	"hooks",
 }
 
 func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath string, rawData map[string]interface{}, log log.Logger) (map[string]interface{}, error) {
@@ -94,6 +96,19 @@ func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath st
 		for _, section := range ImportSections {
 			sectionMap, ok := importData[section].(map[string]interface{})
 			if !ok {
+				// no map, is it a slice?
+				sectionSlice, ok := importData[section].([]interface{})
+				if !ok {
+					continue
+				}
+
+				// make sure the section exists
+				if mergedMap[section] == nil {
+					mergedMap[section] = []interface{}{}
+				}
+				for _, value := range sectionSlice {
+					mergedMap[section] = append(mergedMap[section].([]interface{}), value)
+				}
 				continue
 			}
 

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

@@ -1,6 +1,7 @@
 package kubectl
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -179,9 +180,11 @@ func (d *DeployConfig) Deploy(ctx devspacecontext.Context, _ bool) (bool, error)
 		if shouldRedeploy || forceDeploy {
 			args := d.getCmdArgs("apply", "--force")
 			args = append(args, d.DeploymentConfig.Kubectl.ApplyArgs...)
-			err = command.Command(ctx.Context(), ctx.WorkingDir(), writer, writer, strings.NewReader(replacedManifest), d.CmdPath, args...)
+
+			stdErrBuffer := &bytes.Buffer{}
+			err = command.Command(ctx.Context(), ctx.WorkingDir(), writer, io.MultiWriter(writer, stdErrBuffer), strings.NewReader(replacedManifest), d.CmdPath, args...)
 			if err != nil {
-				return false, errors.Errorf("%v\nPlease make sure the command `kubectl apply` does work locally with manifest `%s`", err, manifest)
+				return false, errors.Errorf("%v %v\nPlease make sure the command `kubectl apply` does work locally with manifest `%s`", stdErrBuffer.String(), err, manifest)
 			}
 
 			wasDeployed = true