docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-30 23:28:04 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Modify parsing functions and config structs to accept hcl changes

Browse Source 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
This commit is contained in:
Patrick Van Stee
2020-04-15 21:00:18 -04:00
parent 87c4bf1df9
commit 4121ae50b5
131 changed files with 45185 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bake/bake_test.go
View File

@@ -19,7 +19,7 @@ func TestReadTargets(t *testing.T) {
fp := filepath.Join(tmpdir, "config.hcl")
err = ioutil.WriteFile(fp, []byte(`
target "webDEP" {
args {
args = {
VAR_INHERITED = "webDEP"
VAR_BOTH = "webDEP"
}
@@ -27,7 +27,7 @@ target "webDEP" {
target "webapp" {
dockerfile = "Dockerfile.webapp"
args {
args = {
VAR_BOTH = "webapp"
}
inherits = ["webDEP"]
@@ -108,7 +108,7 @@ target "webapp" {
t.Run("PatternOverride", func(t *testing.T) {
// same check for two cases
multiTargetCheck := func(t *testing.T, m map[string]Target, err error) {
multiTargetCheck := func(t *testing.T, m map[string]*Target, err error) {
require.NoError(t, err)
require.Equal(t, 2, len(m))
require.Equal(t, "foo", *m["webapp"].Dockerfile)
@@ -121,7 +121,7 @@ target "webapp" {
name string
targets []string
overrides []string
check func(*testing.T, map[string]Target, error)
check func(*testing.T, map[string]*Target, error)
}{
{
name: "multi target single pattern",
@@ -139,7 +139,7 @@ target "webapp" {
name: "single target",
targets: []string{"webapp"},
overrides: []string{"web*.dockerfile=foo"},
check: func(t *testing.T, m map[string]Target, err error) {
check: func(t *testing.T, m map[string]*Target, err error) {
require.NoError(t, err)
require.Equal(t, 1, len(m))
require.Equal(t, "foo", *m["webapp"].Dockerfile)
@@ -150,7 +150,7 @@ target "webapp" {
name: "nomatch",
targets: []string{"webapp"},
overrides: []string{"nomatch*.dockerfile=foo"},
check: func(t *testing.T, m map[string]Target, err error) {
check: func(t *testing.T, m map[string]*Target, err error) {
// NOTE: I am unsure whether failing to match should always error out
// instead of simply skipping that override.
// Let's enforce the error and we can relax it later if users complain.