From 65aea3028fdd66c70cef91ed96c060e03c393381 Mon Sep 17 00:00:00 2001 From: Roberto Villarreal Date: Fri, 9 May 2025 18:29:14 -0600 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Roberto Villarreal --- bake/hclparser/hclparser.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bake/hclparser/hclparser.go b/bake/hclparser/hclparser.go index 5dbd0bc78..16ffc4546 100644 --- a/bake/hclparser/hclparser.go +++ b/bake/hclparser/hclparser.go @@ -373,6 +373,8 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) { func (p *parser) valueHasOverride(name string, favorJSON bool) (string, bool, bool) { jsonEnv := false envv, hasEnv := p.opt.LookupVar(name) + // If no plain override exists (!hasEnv) or JSON overrides are explicitly favored (favorJSON), + // check for a JSON-specific override with the "_JSON" suffix. if !hasEnv || favorJSON { jsonVarName := name + jsonEnvOverrideSuffix _, builtin := p.opt.Vars[jsonVarName] @@ -1086,7 +1088,7 @@ func valueFromCSV(name, value string, target cty.Type) (cty.Value, error) { for _, f := range fields { kvSlice, err = p.Fields(f, kvSlice) if err != nil { - return cty.NilVal, errors.Wrapf(err, "failed to parse %s as k/v", f) + return cty.NilVal, errors.Wrapf(err, "failed to parse %s as k/v for variable %s", f, name) } if len(kvSlice) != 2 { return cty.NilVal, errors.Errorf("expected one k/v pair but got %d pieces from %s", len(kvSlice), f)