Merge pull request #597 from ulyssessouza/nsfod_envfile

Fix 'env_file' retrieval by using app.Path as WorkingDir in the render action

Author: jcsirot

e2e/envfile_test.go

@@ -0,0 +1,26 @@
+package e2e
+
+import (
+	"path/filepath"
+	"testing"
+
+	"gotest.tools/icmd"
+)
+
+func TestRenderWithEnvFile(t *testing.T) {
+	cmd, cleanup := dockerCli.createTestCmd()
+	defer cleanup()
+	appPath := filepath.Join("testdata", "envfile", "envfile.dockerapp")
+
+	cmd.Command = dockerCli.Command("app", "render", appPath)
+	icmd.RunCmd(cmd).Assert(t, icmd.Expected{Out: `version: "3.7"
+services:
+  db:
+    environment:
+      COMPANY: mycompany
+      SOME_FILE: /some/file
+      USER: myuser
+    env_file:
+    - myvars.env
+    image: busybox:1.30.1`})
+}

e2e/testdata/envfile/envfile.dockerapp/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.7"
+
+services:
+  db:
+    image: busybox:1.30.1
+    env_file:
+      - myvars.env
+    environment:
+      - SOME_FILE=/some/file

e2e/testdata/envfile/envfile.dockerapp/metadata.yml

@@ -0,0 +1,10 @@
+# Version of the application
+version: 0.1.0
+# Name of the application
+name: envfile
+# A short description of the application
+description: 
+# List of application maintainers with name and email for each
+maintainers:
+  - name: dev
+    email: [email protected]

e2e/testdata/envfile/envfile.dockerapp/myvars.env

@@ -0,0 +1,2 @@
+USER=myuser
+COMPANY=mycompany

e2e/testdata/envfile/envfile.dockerapp/parameters.yml

@@ -0,0 +1 @@
+{}

render/render.go

@@ -41,12 +41,12 @@ func Render(app *types.App, env map[string]string, imageMap map[string]bundle.Im
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to load composefiles")
 	}
-	return render(configFiles, allParameters.Flatten(), imageMap)
+	return render(app.Path, configFiles, allParameters.Flatten(), imageMap)
 }
 
-func render(configFiles []composetypes.ConfigFile, finalEnv map[string]string, imageMap map[string]bundle.Image) (*composetypes.Config, error) {
+func render(appPath string, configFiles []composetypes.ConfigFile, finalEnv map[string]string, imageMap map[string]bundle.Image) (*composetypes.Config, error) {
 	rendered, err := loader.Load(composetypes.ConfigDetails{
-		WorkingDir:  ".",
+		WorkingDir:  appPath,
 		ConfigFiles: configFiles,
 		Environment: finalEnv,
 	}, func(opts *loader.Options) {

render/render_test.go

@@ -34,7 +34,7 @@ func TestRenderMissingValue(t *testing.T) {
 	finalEnv := map[string]string{
 		"imageName": "foo",
 	}
-	_, err := render(configFiles, finalEnv, nil)
+	_, err := render("foo.dockerapp", configFiles, finalEnv, nil)
 	assert.Check(t, err != nil)
 	assert.Check(t, is.ErrorContains(err, "required variable"))
 }
@@ -57,7 +57,7 @@ func TestRender(t *testing.T) {
 		"version": "latest",
 		"foo.bar": "baz",
 	}
-	c, err := render(configFiles, finalEnv, nil)
+	c, err := render("foo.dockerapp", configFiles, finalEnv, nil)
 	assert.NilError(t, err)
 	assert.Check(t, is.Len(c.Services, 1))
 	assert.Check(t, is.Equal(c.Services[0].Image, "busybox:latest"))
@@ -80,7 +80,7 @@ func TestRenderEnabledFalse(t *testing.T) {
 				},
 			},
 		}
-		c, err := render(configs, map[string]string{
+		c, err := render("foo.dockerapp", configs, map[string]string{
 			"myapp.debug": "true",
 		}, nil)
 		assert.NilError(t, err)
@@ -226,7 +226,7 @@ func TestServiceImageOverride(t *testing.T) {
 			},
 		},
 	}
-	c, err := render(configFiles, nil, map[string]bundle.Image{
+	c, err := render("foo.dockerapp", configFiles, nil, map[string]bundle.Image{
 		"foo": {BaseImage: bundle.BaseImage{Image: "test"}},
 	})
 	assert.NilError(t, err)