bake: move merge logic to an hcl package and add tests

Signed-off-by: CrazyMax <[email protected]>
docker · Dec 2, 2024 · ff00ac1 · ff00ac1
1 parent d6d713a
commit ff00ac1
Show file tree

Hide file tree

Showing 13 changed files with 691 additions and 5 deletions.
diff --git a/bake/bake.go b/bake/bake.go
@@ -16,6 +16,7 @@ import (
 
 	composecli "github.com/compose-spec/compose-go/v2/cli"
 	"github.com/docker/buildx/bake/hclparser"
+	hclalt "github.com/docker/buildx/bake/hclparser/hcl"
 	"github.com/docker/buildx/build"
 	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/util/buildflags"
@@ -343,7 +344,7 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, _ *hclpars
 
 	var pm hclparser.ParseMeta
 	if len(hclFiles) > 0 {
-		res, err := hclparser.Parse(hclparser.MergeFiles(hclFiles), hclparser.Opt{
+		res, err := hclparser.Parse(hclalt.MergeFiles(hclFiles), hclparser.Opt{
 			LookupVar:     os.LookupEnv,
 			Vars:          defaults,
 			ValidateLabel: validateTargetName,

diff --git a/bake/hclparser/LICENSE → bake/hclparser/hcl/LICENSE b/bake/hclparser/LICENSE → bake/hclparser/hcl/LICENSE
diff --git a/bake/hclparser/gohcl/decode.go → bake/hclparser/hcl/gohcl/decode.go b/bake/hclparser/gohcl/decode.go → bake/hclparser/hcl/gohcl/decode.go
diff --git a/bake/hclparser/gohcl/decode_test.go → bake/hclparser/hcl/gohcl/decode_test.go b/bake/hclparser/gohcl/decode_test.go → bake/hclparser/hcl/gohcl/decode_test.go
diff --git a/bake/hclparser/gohcl/doc.go → bake/hclparser/hcl/gohcl/doc.go b/bake/hclparser/gohcl/doc.go → bake/hclparser/hcl/gohcl/doc.go
diff --git a/bake/hclparser/gohcl/encode.go → bake/hclparser/hcl/gohcl/encode.go b/bake/hclparser/gohcl/encode.go → bake/hclparser/hcl/gohcl/encode.go
diff --git a/bake/hclparser/gohcl/encode_test.go → bake/hclparser/hcl/gohcl/encode_test.go b/bake/hclparser/gohcl/encode_test.go → bake/hclparser/hcl/gohcl/encode_test.go
diff --git a/bake/hclparser/gohcl/schema.go → bake/hclparser/hcl/gohcl/schema.go b/bake/hclparser/gohcl/schema.go → bake/hclparser/hcl/gohcl/schema.go
diff --git a/bake/hclparser/gohcl/schema_test.go → bake/hclparser/hcl/gohcl/schema_test.go b/bake/hclparser/gohcl/schema_test.go → bake/hclparser/hcl/gohcl/schema_test.go
diff --git a/bake/hclparser/gohcl/types.go → bake/hclparser/hcl/gohcl/types.go b/bake/hclparser/gohcl/types.go → bake/hclparser/hcl/gohcl/types.go
diff --git a/bake/hclparser/merged.go → bake/hclparser/hcl/merged.go b/bake/hclparser/merged.go → bake/hclparser/hcl/merged.go
@@ -1,9 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-// Forked from https://github.com/hashicorp/hcl/blob/4679383728fe331fc8a6b46036a27b8f818d9bc0/merged.go
-
-package hclparser
+package hcl
 
 import (
 	"fmt"