Bug: nonjson: Ensure sku, display-name, or id are set

zsrv · Feb 14, 2023 · 1a527c8 · 1a527c8
1 parent 9a35ab2
commit 1a527c8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cmd/nonjson.go b/cmd/nonjson.go
@@ -73,25 +73,32 @@ var nonjsonEncodeCmd = &cobra.Command{
 
 		pk := nonjson.NewProductKey()
 
+		var swidSet bool
 		switch {
 		case swSKU != "":
 			swid, err := nonjson.SoftwareIdentifiers.BySKU(swSKU)
 			if err != nil {
 				return err
 			}
 			pk.SoftwareIdentifier = *swid
+			swidSet = true
 		case swDisplayName != "":
 			swid, err := nonjson.SoftwareIdentifiers.ByDisplayName(swDisplayName)
 			if err != nil {
 				return err
 			}
 			pk.SoftwareIdentifier = *swid
+			swidSet = true
 		case len(swID) > 0:
 			swid, err := nonjson.SoftwareIdentifiers.ByID(swID[0])
 			if err != nil {
 				return err
 			}
 			pk.SoftwareIdentifier = *swid
+			swidSet = true
+		}
+		if swidSet != true {
+			return errors.New("one of sku, display-name, id are required")
 		}
 
 		if softwareVersion != "" {