expanded docker-compose parameters on init

Expand parameters with pre-existing parameters.FromFlatten() before marshaling to yaml when initializing from compose file in initFromComposeFile().

Signed-off-by: Nick Adcock <[email protected]>

Author: zappy-shu

internal/packager/init.go

@@ -17,6 +17,7 @@ import (
 	"github.com/docker/app/loader"
 	"github.com/docker/app/types"
 	"github.com/docker/app/types/metadata"
+	"github.com/docker/app/types/parameters"
 	composeloader "github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/schema"
 	"github.com/docker/cli/opts"
@@ -136,13 +137,13 @@ func initFromComposeFile(name string, composeFile string) error {
 	if err := checkComposeFileVersion(cfgMap); err != nil {
 		return err
 	}
-	parameters := make(map[string]string)
+	params := make(map[string]string)
 	envs, err := opts.ParseEnvFile(filepath.Join(filepath.Dir(composeFile), ".env"))
 	if err == nil {
 		for _, v := range envs {
 			kv := strings.SplitN(v, "=", 2)
 			if len(kv) == 2 {
-				parameters[kv[0]] = kv[1]
+				params[kv[0]] = kv[1]
 			}
 		}
 	}
@@ -152,16 +153,21 @@ func initFromComposeFile(name string, composeFile string) error {
 	}
 	needsFilling := false
 	for k, v := range vars {
-		if _, ok := parameters[k]; !ok {
+		if _, ok := params[k]; !ok {
 			if v != "" {
-				parameters[k] = v
+				params[k] = v
 			} else {
-				parameters[k] = "FILL ME"
+				params[k] = "FILL ME"
 				needsFilling = true
 			}
 		}
 	}
-	parametersYAML, err := yaml.Marshal(parameters)
+
+	expandedParams, err := parameters.FromFlatten(params)
+	if err != nil {
+		return errors.Wrap(err, "failed to expand parameters")
+	}
+	parametersYAML, err := yaml.Marshal(expandedParams)
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal parameters")
 	}

internal/packager/init_test.go

@@ -44,6 +44,48 @@ services:
 	assert.Assert(t, fs.Equal(dir.Join(appName), manifest))
 }
 
+func TestInitFromComposeFileWithFlattenedParams(t *testing.T) {
+	composeData := `
+version: '3.0'
+services:
+  service1:
+    image: image1
+    ports:
+      - ${ports.service1:-9001}
+
+  service2:
+    image: image2
+    ports:
+      - ${ports.service2:-9002}
+`
+	inputDir := fs.NewDir(t, "app_input_",
+		fs.WithFile(internal.ComposeFileName, composeData),
+	)
+	defer inputDir.Remove()
+
+	appName := "my.dockerapp"
+	dir := fs.NewDir(t, "app_",
+		fs.WithDir(appName),
+	)
+	defer dir.Remove()
+
+	err := initFromComposeFile(dir.Join(appName), inputDir.Join(internal.ComposeFileName))
+	assert.NilError(t, err)
+
+	const expectedParameters = `ports:
+  service1: 9001
+  service2: 9002
+`
+	manifest := fs.Expected(
+		t,
+		fs.WithMode(0755),
+		fs.WithFile(internal.ComposeFileName, composeData, fs.WithMode(0644)),
+		fs.WithFile(internal.ParametersFileName, expectedParameters, fs.WithMode(0644)),
+	)
+
+	assert.Assert(t, fs.Equal(dir.Join(appName), manifest))
+}
+
 func TestInitFromInvalidComposeFile(t *testing.T) {
 	err := initFromComposeFile("my.dockerapp", "doesnotexist")
 	assert.ErrorContains(t, err, "failed to read")