Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+691 −5
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bake/bake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
0 bake/hclparser/LICENSE → bake/hclparser/hcl/LICENSE
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/decode.go → bake/hclparser/hcl/gohcl/decode.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/decode_test.go → bake/hclparser/hcl/gohcl/decode_test.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/doc.go → bake/hclparser/hcl/gohcl/doc.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/encode.go → bake/hclparser/hcl/gohcl/encode.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/encode_test.go → bake/hclparser/hcl/gohcl/encode_test.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/schema.go → bake/hclparser/hcl/gohcl/schema.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/schema_test.go → bake/hclparser/hcl/gohcl/schema_test.go
View file
Open in desktop
File renamed without changes.
0 bake/hclparser/gohcl/types.go → bake/hclparser/hcl/gohcl/types.go
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions bake/hclparser/merged.go → bake/hclparser/hcl/merged.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading