mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-05-18 00:47:48 +08:00

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>
141 lines
2.6 KiB
Go
141 lines
2.6 KiB
Go
package buildflags
|
|
|
|
import (
|
|
"strings"
|
|
|
|
controllerapi "github.com/docker/buildx/controller/pb"
|
|
"github.com/pkg/errors"
|
|
"github.com/tonistiigi/go-csvvalue"
|
|
)
|
|
|
|
type Secrets []*Secret
|
|
|
|
func (s Secrets) Merge(other Secrets) Secrets {
|
|
if other == nil {
|
|
s.Normalize()
|
|
return s
|
|
} else if s == nil {
|
|
other.Normalize()
|
|
return other
|
|
}
|
|
|
|
return append(s, other...).Normalize()
|
|
}
|
|
|
|
func (s Secrets) Normalize() Secrets {
|
|
if len(s) == 0 {
|
|
return nil
|
|
}
|
|
return removeDupes(s)
|
|
}
|
|
|
|
func (s Secrets) ToPB() []*controllerapi.Secret {
|
|
if len(s) == 0 {
|
|
return nil
|
|
}
|
|
|
|
entries := make([]*controllerapi.Secret, len(s))
|
|
for i, entry := range s {
|
|
entries[i] = entry.ToPB()
|
|
}
|
|
return entries
|
|
}
|
|
|
|
type Secret struct {
|
|
ID string `json:"id,omitempty"`
|
|
FilePath string `json:"src,omitempty"`
|
|
Env string `json:"env,omitempty"`
|
|
}
|
|
|
|
func (s *Secret) Equal(other *Secret) bool {
|
|
return s.ID == other.ID && s.FilePath == other.FilePath && s.Env == other.Env
|
|
}
|
|
|
|
func (s *Secret) String() string {
|
|
var b csvBuilder
|
|
if s.ID != "" {
|
|
b.Write("id", s.ID)
|
|
}
|
|
if s.FilePath != "" {
|
|
b.Write("src", s.FilePath)
|
|
}
|
|
if s.Env != "" {
|
|
b.Write("env", s.Env)
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
func (s *Secret) ToPB() *controllerapi.Secret {
|
|
return &controllerapi.Secret{
|
|
ID: s.ID,
|
|
FilePath: s.FilePath,
|
|
Env: s.Env,
|
|
}
|
|
}
|
|
|
|
func (s *Secret) UnmarshalText(text []byte) error {
|
|
value := string(text)
|
|
fields, err := csvvalue.Fields(value, nil)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to parse csv secret")
|
|
}
|
|
|
|
*s = Secret{}
|
|
|
|
var typ string
|
|
for _, field := range fields {
|
|
parts := strings.SplitN(field, "=", 2)
|
|
key := strings.ToLower(parts[0])
|
|
|
|
if len(parts) != 2 {
|
|
return errors.Errorf("invalid field '%s' must be a key=value pair", field)
|
|
}
|
|
|
|
value := parts[1]
|
|
switch key {
|
|
case "type":
|
|
if value != "file" && value != "env" {
|
|
return errors.Errorf("unsupported secret type %q", value)
|
|
}
|
|
typ = value
|
|
case "id":
|
|
s.ID = value
|
|
case "source", "src":
|
|
s.FilePath = value
|
|
case "env":
|
|
s.Env = value
|
|
default:
|
|
return errors.Errorf("unexpected key '%s' in '%s'", key, field)
|
|
}
|
|
}
|
|
if typ == "env" && s.Env == "" {
|
|
s.Env = s.FilePath
|
|
s.FilePath = ""
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func ParseSecretSpecs(sl []string) ([]*controllerapi.Secret, error) {
|
|
fs := make([]*controllerapi.Secret, 0, len(sl))
|
|
for _, v := range sl {
|
|
if v == "" {
|
|
continue
|
|
}
|
|
|
|
s, err := parseSecret(v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fs = append(fs, s)
|
|
}
|
|
return fs, nil
|
|
}
|
|
|
|
func parseSecret(value string) (*controllerapi.Secret, error) {
|
|
var s Secret
|
|
if err := s.UnmarshalText([]byte(value)); err != nil {
|
|
return nil, err
|
|
}
|
|
return s.ToPB(), nil
|
|
}
|