Skip to content

Commit b3fbd44

Browse files
committed
Move type switch for better error reporting
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
1 parent 3e91f1a commit b3fbd44

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

cli/internal/cmd/verify.go

+6-12
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,6 @@ func (c *verifyCmd) verify(cmd *cobra.Command, verifyClient verifyClient, config
190190
var attDocOutput string
191191
switch c.flags.output {
192192
case "json":
193-
if !(attConfig.GetVariant().Equal(variant.AzureSEVSNP{}) ||
194-
attConfig.GetVariant().Equal(variant.AWSSEVSNP{}) ||
195-
attConfig.GetVariant().Equal(variant.GCPSEVSNP{}) ||
196-
attConfig.GetVariant().Equal(variant.AzureTDX{})) {
197-
return errors.New("json output is only supported for SEV-SNP and TDX variants")
198-
}
199-
200193
attDocOutput, err = formatJSON(cmd.Context(), rawAttestationDoc, attConfig, c.log)
201194
case "raw":
202195
attDocOutput = fmt.Sprintf("Attestation Document:\n%s\n", rawAttestationDoc)
@@ -256,13 +249,14 @@ func formatJSON(ctx context.Context, docString string, attestationCfg config.Att
256249
return "", fmt.Errorf("unmarshalling attestation document: %w", err)
257250
}
258251

259-
if (attestationCfg.GetVariant().Equal(variant.AWSSEVSNP{}) ||
260-
attestationCfg.GetVariant().Equal(variant.AzureSEVSNP{}) ||
261-
attestationCfg.GetVariant().Equal(variant.GCPSEVSNP{})) {
252+
switch attestationCfg.GetVariant() {
253+
case variant.AWSSEVSNP{}, variant.AzureSEVSNP{}, variant.GCPSEVSNP{}:
262254
return snpFormatJSON(ctx, doc.InstanceInfo, attestationCfg, log)
255+
case variant.AzureTDX{}:
256+
return tdxFormatJSON(doc.InstanceInfo, attestationCfg)
257+
default:
258+
return "", fmt.Errorf("json output is not supported for variant %s", attestationCfg.GetVariant())
263259
}
264-
265-
return tdxFormatJSON(doc.InstanceInfo, attestationCfg)
266260
}
267261

268262
func snpFormatJSON(ctx context.Context, instanceInfoRaw []byte, attestationCfg config.AttestationCfg, log debugLog,

0 commit comments

Comments
 (0)