refactor(cli): simplify archive-explode output and routing

Drop the redundant explode bool from shouldExplode (derivable from the
returned ArchiveFormat) and branch on the format at the call site.
Reuse output.EncodeOutput for the multi-material result instead of a
hand-rolled format switch, adding []*AttestationStatusMaterial to the
tabulated-data union so the slice renders as a single JSON array.

Assisted-by: Claude Code
Signed-off-by: Javier Rodriguez <javier@chainloop.dev>

Chainloop-Trace-Sessions: da72e107-14e9-4da1-add0-28004f542628, ef6d3cdb-5a23-445c-b39a-510b659023e4

Author: javirln

app/cli/cmd/attestation_add.go

@@ -150,22 +150,17 @@ func newAttestationAddCmd() *cobra.Command {
 						return err
 					}
 
-					// The explode path can return several materials. Render JSON as a
-					// single array so the output stays a parseable document; only the
-					// table renderer is emitted per material.
-					switch flagOutputFormat {
-					case output.FormatJSON:
-						return output.EncodeJSON(resp)
-					case output.FormatTable:
-						for _, m := range resp {
+					// The explode path can return several materials. EncodeOutput
+					// renders the whole slice as a single JSON array (a parseable
+					// document) and the table renderer per material.
+					return output.EncodeOutput(flagOutputFormat, resp, func(mats []*action.AttestationStatusMaterial) error {
+						for _, m := range mats {
 							if err := displayMaterialInfo(m, policies[m.Name]); err != nil {
 								return err
 							}
 						}
 						return nil
-					default:
-						return output.ErrOutputFormatNotImplemented
-					}
+					})
 				},
 			)
 		},

app/cli/cmd/output/output.go

@@ -56,6 +56,7 @@ type tabulatedData interface {
 		*action.APITokenItem |
 		[]*action.APITokenItem |
 		*action.AttestationStatusMaterial |
+		[]*action.AttestationStatusMaterial |
 		*action.ListMembershipResult |
 		*action.PolicyLintResult
 }

app/cli/pkg/action/attestation_add.go

@@ -153,11 +153,11 @@ func (action *AttestationAdd) Run(ctx context.Context, attestationID, materialNa
 	addOpts := runtimeInputAddOpts(runtimeInputs)
 
 	// Explode path: --kind set, value is a (non-archive-native) archive.
-	format, explode, err := shouldExplode(materialType, materialValue)
+	format, err := shouldExplode(materialType, materialValue)
 	if err != nil {
 		return nil, fmt.Errorf("detecting archive: %w", err)
 	}
-	if explode {
+	if format != materials.ArchiveNone {
 		if len(policyInputFiles) > 0 {
 			action.Logger.Warn().Msg("--policy-input-from-file is ignored when expanding an archive; evidence cross-links are not recorded for exploded materials")
 		}
@@ -226,15 +226,11 @@ func (action *AttestationAdd) Run(ctx context.Context, attestationID, materialNa
 // shouldExplode decides whether an att-add should explode the value into many
 // materials: only when --kind is set, the value is a supported archive, and the
 // kind is not archive-native (e.g. ZAP_DAST_ZIP, which is recorded whole).
-func shouldExplode(materialType, value string) (materials.ArchiveFormat, bool, error) {
+func shouldExplode(materialType, value string) (materials.ArchiveFormat, error) {
 	if materialType == "" || materials.IsArchiveNativeKind(materialType) {
-		return materials.ArchiveNone, false, nil
+		return materials.ArchiveNone, nil
 	}
-	format, err := materials.DetectArchive(value)
-	if err != nil {
-		return materials.ArchiveNone, false, err
-	}
-	return format, format != materials.ArchiveNone, nil
+	return materials.DetectArchive(value)
 }
 
 // runtimeInputAddOpts wraps the runtime inputs as crafter add options, or

app/cli/pkg/action/attestation_add_routing_test.go

@@ -53,29 +53,26 @@ func TestShouldExplode(t *testing.T) {
 	require.NoError(t, os.WriteFile(plainPath, []byte("not an archive"), 0600))
 
 	tests := []struct {
-		name        string
-		kind        string
-		value       string
-		wantExplode bool
-		wantFormat  materials.ArchiveFormat
+		name       string
+		kind       string
+		value      string
+		wantFormat materials.ArchiveFormat
 	}{
-		{"kind + archive", "SBOM_CYCLONEDX_JSON", zipPath, true, materials.ArchiveZip},
-		{"archive-native kind", "ZAP_DAST_ZIP", zipPath, false, materials.ArchiveNone},
-		{"no kind", "", zipPath, false, materials.ArchiveNone},
-		{"kind + non-archive", "ARTIFACT", plainPath, false, materials.ArchiveNone},
+		// A non-ArchiveNone format means the value will be exploded.
+		{"kind + archive", "SBOM_CYCLONEDX_JSON", zipPath, materials.ArchiveZip},
+		{"archive-native kind", "ZAP_DAST_ZIP", zipPath, materials.ArchiveNone},
+		{"no kind", "", zipPath, materials.ArchiveNone},
+		{"kind + non-archive", "ARTIFACT", plainPath, materials.ArchiveNone},
 		// Non-file values must never return an error — STRING and CONTAINER_IMAGE
 		// carry values that are not file paths at all.
-		{"kind STRING non-file value", "STRING", "hello world", false, materials.ArchiveNone},
-		{"kind CONTAINER_IMAGE non-file value", "CONTAINER_IMAGE", "registry.example.com/app:v1", false, materials.ArchiveNone},
+		{"kind STRING non-file value", "STRING", "hello world", materials.ArchiveNone},
+		{"kind CONTAINER_IMAGE non-file value", "CONTAINER_IMAGE", "registry.example.com/app:v1", materials.ArchiveNone},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			format, explode, err := shouldExplode(tc.kind, tc.value)
+			format, err := shouldExplode(tc.kind, tc.value)
 			require.NoError(t, err)
-			assert.Equal(t, tc.wantExplode, explode)
-			if explode {
-				assert.Equal(t, tc.wantFormat, format)
-			}
+			assert.Equal(t, tc.wantFormat, format)
 		})
 	}
 }