make tlog upload default true and always print cert in bundle

Signed-off-by: Asra Ali <asraa@google.com>
sigstore · Dec 8, 2022 · 6ec1d76 · 6ec1d76
1 parent 432c8f0
commit 6ec1d76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cmd/cosign/cli/attest/attest_blob.go b/cmd/cosign/cli/attest/attest_blob.go
@@ -98,7 +98,6 @@ func (c *AttestBlobCommand) Exec(ctx context.Context, artifactPath string) error
 			artifact, err = os.ReadFile(filepath.Clean(artifactPath))
 		}
 		if err != nil {
-			fmt.Println(filepath.Clean(artifactPath))
 			return err
 		}
 	}
@@ -159,12 +158,11 @@ func (c *AttestBlobCommand) Exec(ctx context.Context, artifactPath string) error
 		fmt.Printf("RF3161 timestamp bundle wrote in the file %s\n", c.RFC3161TimestampPath)
 	}
 
-	var rekorBytes []byte
+	rekorBytes, err := sv.Bytes(ctx)
+	if err != nil {
+		return err
+	}
 	if sign.ShouldUploadToTlog(ctx, c.KeyOpts, nil, c.TlogUpload) {
-		rekorBytes, err = sv.Bytes(ctx)
-		if err != nil {
-			return err
-		}
 		rekorClient, err := rekor.NewClient(c.RekorURL)
 		if err != nil {
 			return err
@@ -176,7 +174,6 @@ func (c *AttestBlobCommand) Exec(ctx context.Context, artifactPath string) error
 		fmt.Fprintln(os.Stderr, "tlog entry created with index:", *entry.LogIndex)
 		signedPayload.Bundle = cbundle.EntryToBundle(entry)
 	}
-
 	if c.BundlePath != "" {
 		signedPayload.Base64Signature = base64.StdEncoding.EncodeToString(sig)
 		signedPayload.Cert = base64.StdEncoding.EncodeToString(rekorBytes)
@@ -188,7 +185,7 @@ func (c *AttestBlobCommand) Exec(ctx context.Context, artifactPath string) error
 		if err := os.WriteFile(c.BundlePath, contents, 0600); err != nil {
 			return fmt.Errorf("create bundle file: %w", err)
 		}
-		fmt.Printf("Bundle wrote in the file %s\n", c.BundlePath)
+		fmt.Fprintln(os.Stderr, "Bundle wrote in the file ", c.BundlePath)
 	}
 
 	if c.OutputSignature != "" {

diff --git a/cmd/cosign/cli/options/attest_blob.go b/cmd/cosign/cli/options/attest_blob.go
@@ -89,7 +89,7 @@ func (o *AttestBlobOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVarP(&o.SkipConfirmation, "yes", "y", false,
 		"skip confirmation prompts for non-destructive operations")
 
-	cmd.Flags().BoolVar(&o.TlogUpload, "tlog-upload", false,
+	cmd.Flags().BoolVar(&o.TlogUpload, "tlog-upload", true,
 		"whether or not to upload to the tlog")
 
 	cmd.Flags().StringVar(&o.TSAServerURL, "timestamp-server-url", "",