mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-11-04 10:03:42 +08:00
abc85c38f8
Update the buildflags cty code to handle unknown values. When hcl decodes a value with an invalid variable name, it appends a diagnostic for the error and then returns an unknown value so it can continue processing the file and finding more errors. The iteration code has now been changed to use a rangefunc from go 1.23 and it skips empty or unknown values. Empty values are valid when they are skipped and unknown values will have a diagnostic for itself. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
91 lines
1.9 KiB
Go
91 lines
1.9 KiB
Go
package buildflags
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/zclconf/go-cty/cty"
|
|
"github.com/zclconf/go-cty/cty/convert"
|
|
)
|
|
|
|
var secretType = sync.OnceValue(func() cty.Type {
|
|
return cty.ObjectWithOptionalAttrs(
|
|
map[string]cty.Type{
|
|
"id": cty.String,
|
|
"src": cty.String,
|
|
"env": cty.String,
|
|
},
|
|
[]string{"id", "src", "env"},
|
|
)
|
|
})
|
|
|
|
func (s *Secrets) FromCtyValue(in cty.Value, p cty.Path) error {
|
|
got := in.Type()
|
|
if got.IsTupleType() || got.IsListType() {
|
|
return s.fromCtyValue(in, p)
|
|
}
|
|
|
|
want := cty.List(secretType())
|
|
return p.NewErrorf("%s", convert.MismatchMessage(got, want))
|
|
}
|
|
|
|
func (s *Secrets) fromCtyValue(in cty.Value, p cty.Path) error {
|
|
*s = make([]*Secret, 0, in.LengthInt())
|
|
for value := range eachElement(in) {
|
|
entry := &Secret{}
|
|
if err := entry.FromCtyValue(value, p); err != nil {
|
|
return err
|
|
}
|
|
*s = append(*s, entry)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s Secrets) ToCtyValue() cty.Value {
|
|
if len(s) == 0 {
|
|
return cty.ListValEmpty(secretType())
|
|
}
|
|
|
|
vals := make([]cty.Value, len(s))
|
|
for i, entry := range s {
|
|
vals[i] = entry.ToCtyValue()
|
|
}
|
|
return cty.ListVal(vals)
|
|
}
|
|
|
|
func (e *Secret) FromCtyValue(in cty.Value, p cty.Path) error {
|
|
if in.Type() == cty.String {
|
|
if err := e.UnmarshalText([]byte(in.AsString())); err != nil {
|
|
return p.NewError(err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
conv, err := convert.Convert(in, secretType())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if id := conv.GetAttr("id"); !id.IsNull() && id.IsKnown() {
|
|
e.ID = id.AsString()
|
|
}
|
|
if src := conv.GetAttr("src"); !src.IsNull() && src.IsKnown() {
|
|
e.FilePath = src.AsString()
|
|
}
|
|
if env := conv.GetAttr("env"); !env.IsNull() && env.IsKnown() {
|
|
e.Env = env.AsString()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (e *Secret) ToCtyValue() cty.Value {
|
|
if e == nil {
|
|
return cty.NullVal(secretType())
|
|
}
|
|
|
|
return cty.ObjectVal(map[string]cty.Value{
|
|
"id": cty.StringVal(e.ID),
|
|
"src": cty.StringVal(e.FilePath),
|
|
"env": cty.StringVal(e.Env),
|
|
})
|
|
}
|