publicWagsHome/buildx
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildflags: use disabled instead of enabled for attestations

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell
2023-03-28 11:33:10 +01:00
parent c513d34049
commit 3e60bbe30f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util/buildflags/attests.go
View File

@@ -14,7 +14,7 @@ func CanonicalizeAttest(attestType string, in string) string {
return "" return ""
} }
if b, err := strconv.ParseBool(in); err == nil { if b, err := strconv.ParseBool(in); err == nil {
return fmt.Sprintf("type=%s,enabled=%t", attestType, b) return fmt.Sprintf("type=%s,disabled=%t", attestType, !b)
} }
return fmt.Sprintf("type=%s,%s", attestType, in) return fmt.Sprintf("type=%s,%s", attestType, in)
} }
@@ -23,7 +23,7 @@ func ParseAttests(in []string) (map[string]*string, error) {
out := map[string]*string{} out := map[string]*string{}
for _, in := range in { for _, in := range in {
in := in in := in
attestType, enabled, err := parseAttest(in) attestType, disabled, err := parseAttest(in)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -32,10 +32,10 @@ func ParseAttests(in []string) (map[string]*string, error) {
if _, ok := out[k]; ok { if _, ok := out[k]; ok {
return nil, errors.Errorf("duplicate attestation field %s", attestType) return nil, errors.Errorf("duplicate attestation field %s", attestType)
} }
if enabled { if disabled {
out[k] = &in
} else {
out[k] = nil out[k] = nil
} else {
out[k] = &in
} }
} }
return out, nil return out, nil
@@ -53,7 +53,7 @@ func parseAttest(in string) (string, bool, error) {
} }
attestType := "" attestType := ""
enabled := true disabled := true
for _, field := range fields { for _, field := range fields {
key, value, ok := strings.Cut(field, "=") key, value, ok := strings.Cut(field, "=")
if !ok { if !ok {
@@ -64,8 +64,8 @@ func parseAttest(in string) (string, bool, error) {
switch key { switch key {
case "type": case "type":
attestType = value attestType = value
case "enabled": case "disabled":
enabled, err = strconv.ParseBool(value) disabled, err = strconv.ParseBool(value)
if err != nil { if err != nil {
return "", false, err return "", false, err
} }
@@ -75,5 +75,5 @@ func parseAttest(in string) (string, bool, error) {
return "", false, errors.Errorf("attestation type not specified") return "", false, errors.Errorf("attestation type not specified")
} }
return attestType, enabled, nil return attestType, disabled, nil
} }