feat(cli): improve attestation push result in table format (#797)

Signed-off-by: Jose I. Paris <[email protected]>

Author: jiparis

app/cli/cmd/attestation_init.go

@@ -77,7 +77,7 @@ func newAttestationInitCmd() *cobra.Command {
 				return newGracefulError(err)
 			}
 
-			return encodeOutput(res, attestationStatusTableOutput)
+			return encodeOutput(res, simpleStatusTable)
 		},
 	}
 

app/cli/cmd/attestation_push.go

@@ -82,16 +82,16 @@ func newAttestationPushCmd() *cobra.Command {
 				return newGracefulError(err)
 			}
 
-			// NOTE: we are not moving yet to full table by default
-			// to maintain backward compatibility
+			// In JSON format, we encode the full attestation
 			if flagOutputFormat == formatJSON {
 				return encodeJSON(res)
 			}
 
-			// default to mix of json and text to stdout and stderr by default
-			// kept to maintain backward compatibility
-			// TODO: in the future we'll render either a table or a proper report
-			fmt.Println(res.Envelope)
+			// In TABLE format, we render the attestation status
+			if err := encodeOutput(res.Status, fullStatusTable); err != nil {
+				return fmt.Errorf("failed to render output: %w", err)
+			}
+
 			if res.Digest != "" {
 				logger.Info().Msgf("Attestation Digest: %s", res.Digest)
 			}

app/cli/cmd/attestation_status.go

@@ -51,7 +51,7 @@ func newAttestationStatusCmd() *cobra.Command {
 				return err
 			}
 
-			return encodeOutput(res, attestationStatusTableOutput)
+			return encodeOutput(res, simpleStatusTable)
 		},
 	}
 
@@ -61,7 +61,15 @@ func newAttestationStatusCmd() *cobra.Command {
 	return cmd
 }
 
-func attestationStatusTableOutput(status *action.AttestationStatusResult) error {
+func simpleStatusTable(status *action.AttestationStatusResult) error {
+	return attestationStatusTableOutput(status, false)
+}
+
+func fullStatusTable(status *action.AttestationStatusResult) error {
+	return attestationStatusTableOutput(status, true)
+}
+
+func attestationStatusTableOutput(status *action.AttestationStatusResult, full bool) error {
 	// General info table
 	gt := newTableWriter()
 	gt.AppendRow(table.Row{"Initialized At", status.InitializedAt.Format(time.RFC822)})
@@ -90,11 +98,11 @@ func attestationStatusTableOutput(status *action.AttestationStatusResult) error
 
 	gt.Render()
 
-	if err := materialsTable(status); err != nil {
+	if err := materialsTable(status, full); err != nil {
 		return err
 	}
 
-	if err := envVarsTable(status); err != nil {
+	if err := envVarsTable(status, full); err != nil {
 		return err
 	}
 
@@ -105,7 +113,7 @@ func attestationStatusTableOutput(status *action.AttestationStatusResult) error
 	return nil
 }
 
-func envVarsTable(status *action.AttestationStatusResult) error {
+func envVarsTable(status *action.AttestationStatusResult, full bool) error {
 	if len(status.EnvVars) == 0 && len(status.RunnerContext.EnvVars) == 0 {
 		return nil
 	}
@@ -138,7 +146,7 @@ func envVarsTable(status *action.AttestationStatusResult) error {
 
 	return nil
 }
-func materialsTable(status *action.AttestationStatusResult) error {
+func materialsTable(status *action.AttestationStatusResult, full bool) error {
 	if len(status.Materials) == 0 {
 		return nil
 	}

app/cli/internal/action/attestation_push.go

@@ -36,8 +36,9 @@ type AttestationPushOpts struct {
 }
 
 type AttestationResult struct {
-	Digest   string `json:"digest"`
-	Envelope string `json:"envelope"`
+	Digest   string                   `json:"digest"`
+	Envelope string                   `json:"envelope"`
+	Status   *AttestationStatusResult `json:"status"`
 }
 
 type AttestationPush struct {
@@ -68,6 +69,16 @@ func (action *AttestationPush) Run(ctx context.Context, attestationID string, ru
 		return nil, ErrAttestationNotInitialized
 	}
 
+	// Retrieve attestation status
+	statusAction, err := NewAttestationStatus(&AttestationStatusOpts{ActionsOpts: action.ActionsOpts})
+	if err != nil {
+		return nil, fmt.Errorf("creating status action: %w", err)
+	}
+	attestationStatus, err := statusAction.Run(ctx, attestationID)
+	if err != nil {
+		return nil, fmt.Errorf("creating running status action: %w", err)
+	}
+
 	if err := action.c.LoadCraftingState(ctx, attestationID); err != nil {
 		action.Logger.Err(err).Msg("loading existing attestation")
 		return nil, err
@@ -137,7 +148,7 @@ func (action *AttestationPush) Run(ctx context.Context, attestationID string, ru
 		return nil, fmt.Errorf("failed to encode output: %w", err)
 	}
 
-	attestationResult := &AttestationResult{Envelope: rawEnvelope.String()}
+	attestationResult := &AttestationResult{Envelope: rawEnvelope.String(), Status: attestationStatus}
 
 	action.Logger.Debug().Msg("render completed")
 	if action.c.CraftingState.DryRun {