mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-05-18 09:17:49 +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>
55 lines
1.3 KiB
Go
55 lines
1.3 KiB
Go
package buildflags
|
|
|
|
import (
|
|
"github.com/zclconf/go-cty/cty"
|
|
"github.com/zclconf/go-cty/cty/gocty"
|
|
)
|
|
|
|
type comparable[E any] interface {
|
|
Equal(other E) bool
|
|
}
|
|
|
|
func removeDupes[E comparable[E]](s []E) []E {
|
|
// Move backwards through the slice.
|
|
// For each element, any elements after the current element are unique.
|
|
// If we find our current element conflicts with an existing element,
|
|
// then we swap the offender with the end of the slice and chop it off.
|
|
|
|
// Start at the second to last element.
|
|
// The last element is always unique.
|
|
for i := len(s) - 2; i >= 0; i-- {
|
|
elem := s[i]
|
|
// Check for duplicates after our current element.
|
|
for j := i + 1; j < len(s); j++ {
|
|
if elem.Equal(s[j]) {
|
|
// Found a duplicate, exchange the
|
|
// duplicate with the last element.
|
|
s[j], s[len(s)-1] = s[len(s)-1], s[j]
|
|
s = s[:len(s)-1]
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return s
|
|
}
|
|
|
|
func getAndDelete(m map[string]cty.Value, attr string, gv interface{}) error {
|
|
if v, ok := m[attr]; ok {
|
|
delete(m, attr)
|
|
return gocty.FromCtyValue(v, gv)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func asMap(m map[string]cty.Value) map[string]string {
|
|
out := make(map[string]string, len(m))
|
|
for k, v := range m {
|
|
out[k] = v.AsString()
|
|
}
|
|
return out
|
|
}
|
|
|
|
func isEmpty(v cty.Value) bool {
|
|
return v.Type() == cty.String && v.AsString() == ""
|
|
}
|