mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-05-18 00:47:48 +08:00
5dd4ae0335
This changes how the composable attributes are implemented and provides various fixes to the first iteration. Cache-from and cache-to now no longer print sensitive values that are automatically added. These automatically added attributes are added when the protobuf is created rather than at the time of parsing so they will no longer be printed. If they are part of the original configuration file, they will still be printed. Empty strings will now be skipped. This was the original behavior and composable attributes removed this functionality accidentally. This functionality is now restored. This also expands the available syntax that works with each of the composable attributes. It is now possible to interleave the csv syntax with the object syntax without any problems. The canonical form is still the object syntax and variables are resolved according to that syntax. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
80 lines
1.6 KiB
Go
80 lines
1.6 KiB
Go
package buildflags
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
controllerapi "github.com/docker/buildx/controller/pb"
|
|
"github.com/pkg/errors"
|
|
"github.com/tonistiigi/go-csvvalue"
|
|
)
|
|
|
|
func CanonicalizeAttest(attestType string, in string) string {
|
|
if in == "" {
|
|
return ""
|
|
}
|
|
if b, err := strconv.ParseBool(in); err == nil {
|
|
return fmt.Sprintf("type=%s,disabled=%t", attestType, !b)
|
|
}
|
|
return fmt.Sprintf("type=%s,%s", attestType, in)
|
|
}
|
|
|
|
func ParseAttests(in []string) ([]*controllerapi.Attest, error) {
|
|
var out []*controllerapi.Attest
|
|
found := map[string]struct{}{}
|
|
for _, in := range in {
|
|
in := in
|
|
attest, err := ParseAttest(in)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if _, ok := found[attest.Type]; ok {
|
|
return nil, errors.Errorf("duplicate attestation field %s", attest.Type)
|
|
}
|
|
found[attest.Type] = struct{}{}
|
|
|
|
out = append(out, attest)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func ParseAttest(in string) (*controllerapi.Attest, error) {
|
|
if in == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
fields, err := csvvalue.Fields(in, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
attest := controllerapi.Attest{
|
|
Attrs: in,
|
|
}
|
|
for _, field := range fields {
|
|
key, value, ok := strings.Cut(field, "=")
|
|
if !ok {
|
|
return nil, errors.Errorf("invalid value %s", field)
|
|
}
|
|
key = strings.TrimSpace(strings.ToLower(key))
|
|
|
|
switch key {
|
|
case "type":
|
|
attest.Type = value
|
|
case "disabled":
|
|
disabled, err := strconv.ParseBool(value)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "invalid value %s", field)
|
|
}
|
|
attest.Disabled = disabled
|
|
}
|
|
}
|
|
if attest.Type == "" {
|
|
return nil, errors.Errorf("attestation type not specified")
|
|
}
|
|
|
|
return &attest, nil
|
|
}
|