From 0e4d7aa7a9ee516ea61dde0bfaee811547fc4119 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 28 Sep 2021 23:20:17 -0700
Subject: [PATCH] bake: add test for merging overrides

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 bake/bake_test.go | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/bake/bake_test.go b/bake/bake_test.go
index ebce5dd2..caf43cf4 100644
--- a/bake/bake_test.go
+++ b/bake/bake_test.go
@@ -274,7 +274,7 @@ services:
 
 func TestHCLCwdPrefix(t *testing.T) {
 	fp := File{
-		Name: "docker-bake.hc",
+		Name: "docker-bake.hcl",
 		Data: []byte(
 			`target "app" {
 				context = "cwd://foo"
@@ -295,3 +295,32 @@ func TestHCLCwdPrefix(t *testing.T) {
 	require.Equal(t, "test", *m["app"].Dockerfile)
 	require.Equal(t, "foo", *m["app"].Context)
 }
+
+func TestOverrideMerge(t *testing.T) {
+	fp := File{
+		Name: "docker-bake.hcl",
+		Data: []byte(
+			`target "app" {
+				platforms = ["linux/amd64"]
+				output = ["foo"]
+			}`),
+	}
+	ctx := context.TODO()
+	m, _, err := ReadTargets(ctx, []File{fp}, []string{"app"}, []string{
+		"app.platform=linux/arm",
+		"app.platform=linux/ppc64le",
+		"app.output=type=registry",
+	}, nil)
+	require.NoError(t, err)
+
+	require.Equal(t, 1, len(m))
+	_, ok := m["app"]
+	require.True(t, ok)
+
+	_, err = TargetsToBuildOpt(m, &Input{})
+	require.NoError(t, err)
+
+	require.Equal(t, []string{"linux/arm", "linux/ppc64le"}, m["app"].Platforms)
+	require.Equal(t, 1, len(m["app"].Outputs))
+	require.Equal(t, "type=registry", m["app"].Outputs[0])
+}