Skip to content

Commit fefa881

Browse files
authored
Consistently use STDERR for output. (#647)
This is basically these commands: ```shell sed -i '[email protected](@fmt.Fprintf(os.Stderr, @g' $(git grep fmt.Printf | cut -d':' -f 1 | uniq) sed -i '[email protected](@fmt.Fprintln(os.Stderr, @g' $(git grep fmt.Println | cut -d':' -f 1 | uniq) sed -i 's/os.Stdout/os.Stderr/g' $(git grep os.Stdout | cut -d':' -f 1) ``` Signed-off-by: Matt Moore <[email protected]>
1 parent fb04df8 commit fefa881

File tree

19 files changed

+39
-36
lines changed

19 files changed

+39
-36
lines changed

cmd/cosign/cli/attest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func AttestCmd(ctx context.Context, ko KeyOpts, imageRef string, certPath string
183183
}
184184

185185
if !upload {
186-
fmt.Println(base64.StdEncoding.EncodeToString(sig))
186+
fmt.Fprintln(os.Stderr, base64.StdEncoding.EncodeToString(sig))
187187
return nil
188188
}
189189

cmd/cosign/cli/clean.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func CleanCmd(ctx context.Context, imageRef string) error {
6363
return err
6464
}
6565
sigRef := cosign.AttachedImageTag(sigRepo, h, cosign.SignatureTagSuffix)
66-
fmt.Println(sigRef)
66+
fmt.Fprintln(os.Stderr, sigRef)
6767

6868
fmt.Fprintln(os.Stderr, "Deleting signature metadata...")
6969

cmd/cosign/cli/download/sbom.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func SBOM() *ffcli.Command {
4343
if len(args) != 1 {
4444
return flag.ErrHelp
4545
}
46-
_, err := SBOMCmd(ctx, args[0], os.Stdout)
46+
_, err := SBOMCmd(ctx, args[0], os.Stderr)
4747
return err
4848
},
4949
}

cmd/cosign/cli/download/signature.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"encoding/json"
2121
"flag"
2222
"fmt"
23+
"os"
2324

2425
"github.com/google/go-containerregistry/pkg/name"
2526
"github.com/peterbourgon/ff/v3/ffcli"
@@ -64,7 +65,7 @@ func SignatureCmd(ctx context.Context, imageRef string) error {
6465
if err != nil {
6566
return err
6667
}
67-
fmt.Println(string(b))
68+
fmt.Fprintln(os.Stderr, string(b))
6869
}
6970
return nil
7071
}

cmd/cosign/cli/fulcio/fulcio.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func getCertForOauthID(priv *ecdsa.PrivateKey, scp signingCertProvider, connecto
140140
if err := VerifySCT(fr); err != nil {
141141
return Resp{}, errors.Wrap(err, "verifying SCT")
142142
}
143-
fmt.Println("Successfully verified SCT...")
143+
fmt.Fprintln(os.Stderr, "Successfully verified SCT...")
144144
return fr, nil
145145
}
146146

cmd/cosign/cli/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ EXAMPLES
5959
if len(args) != 1 {
6060
return flag.ErrHelp
6161
}
62-
return GenerateCmd(ctx, args[0], annotations.annotations, os.Stdout)
62+
return GenerateCmd(ctx, args[0], annotations.annotations, os.Stderr)
6363
},
6464
}
6565
}

cmd/cosign/cli/pivcli/commands.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,27 @@ func (a *Attestations) Output() {
136136
Type: "CERTIFICATE",
137137
Bytes: a.DeviceCert.Raw,
138138
})
139-
fmt.Println(string(b))
139+
fmt.Fprintln(os.Stderr, string(b))
140140

141141
fmt.Fprintln(os.Stderr, "Printing key attestation certificate")
142142
b = pem.EncodeToMemory(&pem.Block{
143143
Type: "CERTIFICATE",
144144
Bytes: a.KeyCert.Raw,
145145
})
146-
fmt.Println(string(b))
146+
fmt.Fprintln(os.Stderr, string(b))
147147

148148
fmt.Fprintln(os.Stderr, "Verifying certificates...")
149149

150150
fmt.Fprintln(os.Stderr, "Verified ok")
151-
fmt.Println()
151+
fmt.Fprintln(os.Stderr, )
152152

153153
fmt.Fprintln(os.Stderr, "Device info:")
154-
fmt.Println(" Issuer:", a.DeviceCert.Issuer)
155-
fmt.Println(" Form factor:", formFactorString(a.KeyAttestation.Formfactor))
156-
fmt.Println(" PIN Policy:", pinPolicyStr(a.KeyAttestation.PINPolicy))
154+
fmt.Fprintln(os.Stderr, " Issuer:", a.DeviceCert.Issuer)
155+
fmt.Fprintln(os.Stderr, " Form factor:", formFactorString(a.KeyAttestation.Formfactor))
156+
fmt.Fprintln(os.Stderr, " PIN Policy:", pinPolicyStr(a.KeyAttestation.PINPolicy))
157157

158-
fmt.Printf(" Serial number: %d\n", a.KeyAttestation.Serial)
159-
fmt.Printf(" Version: %d.%d.%d\n", a.KeyAttestation.Version.Major, a.KeyAttestation.Version.Minor, a.KeyAttestation.Version.Patch)
158+
fmt.Fprintf(os.Stderr, " Serial number: %d\n", a.KeyAttestation.Serial)
159+
fmt.Fprintf(os.Stderr, " Version: %d.%d.%d\n", a.KeyAttestation.Version.Major, a.KeyAttestation.Version.Minor, a.KeyAttestation.Version.Patch)
160160
}
161161

162162
func AttestationCmd(_ context.Context, slotArg string) (*Attestations, error) {
@@ -261,7 +261,7 @@ func GenerateKeyCmd(ctx context.Context, managementKey string, randomKey bool, s
261261
Bytes: b,
262262
})
263263

264-
fmt.Println(string(pemBytes))
264+
fmt.Fprintln(os.Stderr, string(pemBytes))
265265
yk.Close()
266266

267267
att, err := AttestationCmd(ctx, slotArg)
@@ -305,7 +305,7 @@ var Confirm = func(p string) bool {
305305

306306
result, err := prompt.Run()
307307
if err != nil {
308-
fmt.Println(err)
308+
fmt.Fprintln(os.Stderr, err)
309309
return false
310310
}
311311
return strings.ToLower(result) == "y"

cmd/cosign/cli/pivcli/piv_tool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func Attestation() *ffcli.Command {
147147
if err != nil {
148148
return err
149149
}
150-
fmt.Println(string(b))
150+
fmt.Fprintln(os.Stderr, string(b))
151151
}
152152
return err
153153
},

cmd/cosign/cli/public_key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ EXAMPLES
9090
writer.Writer = f
9191
defer f.Close()
9292
} else {
93-
writer.Writer = os.Stdout
93+
writer.Writer = os.Stderr
9494
}
9595
pk := Pkopts{
9696
KeyRef: *key,

cmd/cosign/cli/sign.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func SignCmd(ctx context.Context, ko KeyOpts, annotations map[string]interface{}
339339
}
340340

341341
if !upload {
342-
fmt.Println(base64.StdEncoding.EncodeToString(sig))
342+
fmt.Fprintln(os.Stderr, base64.StdEncoding.EncodeToString(sig))
343343
continue
344344
}
345345

0 commit comments

Comments
 (0)