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>
119 lines
2.0 KiB
Go
119 lines
2.0 KiB
Go
package buildflags
|
|
|
|
import (
|
|
"cmp"
|
|
"slices"
|
|
"strings"
|
|
|
|
controllerapi "github.com/docker/buildx/controller/pb"
|
|
"github.com/moby/buildkit/util/gitutil"
|
|
)
|
|
|
|
type SSHKeys []*SSH
|
|
|
|
func (s SSHKeys) Merge(other SSHKeys) SSHKeys {
|
|
if other == nil {
|
|
s.Normalize()
|
|
return s
|
|
} else if s == nil {
|
|
other.Normalize()
|
|
return other
|
|
}
|
|
|
|
return append(s, other...).Normalize()
|
|
}
|
|
|
|
func (s SSHKeys) Normalize() SSHKeys {
|
|
if len(s) == 0 {
|
|
return nil
|
|
}
|
|
return removeDupes(s)
|
|
}
|
|
|
|
func (s SSHKeys) ToPB() []*controllerapi.SSH {
|
|
if len(s) == 0 {
|
|
return nil
|
|
}
|
|
|
|
entries := make([]*controllerapi.SSH, len(s))
|
|
for i, entry := range s {
|
|
entries[i] = entry.ToPB()
|
|
}
|
|
return entries
|
|
}
|
|
|
|
type SSH struct {
|
|
ID string `json:"id,omitempty" cty:"id"`
|
|
Paths []string `json:"paths,omitempty" cty:"paths"`
|
|
}
|
|
|
|
func (s *SSH) Equal(other *SSH) bool {
|
|
return s.Less(other) == 0
|
|
}
|
|
|
|
func (s *SSH) Less(other *SSH) int {
|
|
if s.ID != other.ID {
|
|
return cmp.Compare(s.ID, other.ID)
|
|
}
|
|
return slices.Compare(s.Paths, other.Paths)
|
|
}
|
|
|
|
func (s *SSH) String() string {
|
|
if len(s.Paths) == 0 {
|
|
return s.ID
|
|
}
|
|
|
|
var b csvBuilder
|
|
paths := strings.Join(s.Paths, ",")
|
|
b.Write(s.ID, paths)
|
|
return b.String()
|
|
}
|
|
|
|
func (s *SSH) ToPB() *controllerapi.SSH {
|
|
return &controllerapi.SSH{
|
|
ID: s.ID,
|
|
Paths: s.Paths,
|
|
}
|
|
}
|
|
|
|
func (s *SSH) UnmarshalText(text []byte) error {
|
|
parts := strings.SplitN(string(text), "=", 2)
|
|
|
|
s.ID = parts[0]
|
|
if len(parts) > 1 {
|
|
s.Paths = strings.Split(parts[1], ",")
|
|
} else {
|
|
s.Paths = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func ParseSSHSpecs(sl []string) ([]*controllerapi.SSH, error) {
|
|
var outs []*controllerapi.SSH
|
|
if len(sl) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
for _, s := range sl {
|
|
if s == "" {
|
|
continue
|
|
}
|
|
|
|
var out SSH
|
|
if err := out.UnmarshalText([]byte(s)); err != nil {
|
|
return nil, err
|
|
}
|
|
outs = append(outs, out.ToPB())
|
|
}
|
|
return outs, nil
|
|
}
|
|
|
|
// IsGitSSH returns true if the given repo URL is accessed over ssh
|
|
func IsGitSSH(repo string) bool {
|
|
url, err := gitutil.ParseURL(repo)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return url.Scheme == gitutil.SSHProtocol
|
|
}
|