@@ -190,13 +190,6 @@ func (c *verifyCmd) verify(cmd *cobra.Command, verifyClient verifyClient, config
190
190
var attDocOutput string
191
191
switch c .flags .output {
192
192
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
-
200
193
attDocOutput , err = formatJSON (cmd .Context (), rawAttestationDoc , attConfig , c .log )
201
194
case "raw" :
202
195
attDocOutput = fmt .Sprintf ("Attestation Document:\n %s\n " , rawAttestationDoc )
@@ -256,13 +249,14 @@ func formatJSON(ctx context.Context, docString string, attestationCfg config.Att
256
249
return "" , fmt .Errorf ("unmarshalling attestation document: %w" , err )
257
250
}
258
251
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 {}:
262
254
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 ())
263
259
}
264
-
265
- return tdxFormatJSON (doc .InstanceInfo , attestationCfg )
266
260
}
267
261
268
262
func snpFormatJSON (ctx context.Context , instanceInfoRaw []byte , attestationCfg config.AttestationCfg , log debugLog ,
0 commit comments