FS-928 Optimize bom cmd according to thread discussion. (#49)

* optimize bom cmd

* fix typo and defer to Cobra

cmd/create/bomupload.go

@@ -20,7 +20,7 @@ var (
 )
 
 var uploadBomFile = &cobra.Command{
-	Use:   "uploadbom",
+	Use:   "bom",
 	Short: "Upload Bom File",
 	Run: func(cmd *cobra.Command, args []string) {
 		theApp := mctl.MustCreateApp(cmd.Context())

cmd/create/create.go

@@ -13,7 +13,7 @@ var create = &cobra.Command{
 	Use:   "create",
 	Short: "Create resources",
 	Run: func(cmd *cobra.Command, args []string) {
-		commands := []string{"firmware", "firmware-set", "uploadbom"}
+		commands := []string{"firmware", "firmware-set", "bom"}
 		log.Fatal("A valid create command parameter was expected: " + strings.Join(commands, ", "))
 	},
 }

cmd/get/bom.go

@@ -0,0 +1,65 @@
+package get
+
+import (
+	"log"
+
+	mctl "github.com/metal-toolbox/mctl/cmd"
+	"github.com/metal-toolbox/mctl/internal/app"
+	"github.com/spf13/cobra"
+	serverservice "go.hollow.sh/serverservice/pkg/api/v1"
+)
+
+type getBomInfoByBmcMacAddressFlags struct {
+	aocMacAddr string
+	bmcMacAddr string
+}
+
+func (gb *getBomInfoByBmcMacAddressFlags) hasAOCMacAddr() bool {
+	return gb.aocMacAddr != ""
+}
+
+func (gb *getBomInfoByBmcMacAddressFlags) hasBMCMacAddr() bool {
+	return gb.bmcMacAddr != ""
+}
+
+var (
+	flagsGetBomByMacAddress *getBomInfoByBmcMacAddressFlags
+)
+
+var getBomInfoByMacAddress = &cobra.Command{
+	Use:   "bom",
+	Short: "Get bom object by AOC or BMC Addr",
+	Run: func(cmd *cobra.Command, args []string) {
+		if !flagsGetBomByMacAddress.hasAOCMacAddr() && !flagsGetBomByMacAddress.hasBMCMacAddr() {
+			log.Fatalf("--aoc-mac and --bmc-mac not set")
+		}
+
+		theApp := mctl.MustCreateApp(cmd.Context())
+
+		client, err := app.NewServerserviceClient(cmd.Context(), theApp.Config.Serverservice, theApp.Reauth)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		var bomInfo *serverservice.Bom
+		if flagsGetBomByMacAddress.hasAOCMacAddr() {
+			bomInfo, _, err = client.GetBomInfoByAOCMacAddr(cmd.Context(), flagsGetBomByMacAddress.aocMacAddr)
+		} else {
+			bomInfo, _, err = client.GetBomInfoByBMCMacAddr(cmd.Context(), flagsGetBomByMacAddress.bmcMacAddr)
+		}
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		writeResults(bomInfo)
+	},
+}
+
+func init() {
+	flagsGetBomByMacAddress = &getBomInfoByBmcMacAddressFlags{}
+
+	getBomInfoByMacAddress.PersistentFlags().StringVar(&flagsGetBomByMacAddress.aocMacAddr, "aoc-mac", "", "get bom info by aoc mac address")
+	getBomInfoByMacAddress.PersistentFlags().StringVar(&flagsGetBomByMacAddress.bmcMacAddr, "bmc-mac", "", "get bom info by bmc mac address")
+
+	getBomInfoByMacAddress.MarkFlagsMutuallyExclusive("aoc-mac", "bmc-mac")
+}

cmd/get/get.go

@@ -25,8 +25,7 @@ func init() {
 	cmdGet.AddCommand(getFirmware)
 	cmdGet.AddCommand(getFirmwareSet)
 	cmdGet.AddCommand(getBiosConfig)
-	cmdGet.AddCommand(getBomInfoByAocMacAddress)
-	cmdGet.AddCommand(getBomInfoByBmcMacAddress)
+	cmdGet.AddCommand(getBomInfoByMacAddress)
 
 	cmdGet.PersistentFlags().StringVarP(&output, "output", "o", "json", "{json|text}")
 }

docs/mctl_create.md

@@ -24,7 +24,7 @@ mctl create [flags]
 ### SEE ALSO
 
 * [mctl](mctl.md)	 - mctl is a CLI utility to interact with metal toolbox services
+* [mctl create bom](mctl_create_bom.md)	 - Upload Bom File
 * [mctl create firmware](mctl_create_firmware.md)	 - Create firmware
 * [mctl create firmware-set](mctl_create_firmware-set.md)	 - Create a firmware set
-* [mctl create uploadbom](mctl_create_uploadbom.md)	 - Upload Bom File
 

docs/mctl_create_bom.md

@@ -0,0 +1,28 @@
+[Auto generated by spf13/cobra]: <>
+
+## mctl create bom
+
+Upload Bom File
+
+```
+mctl create bom [flags]
+```
+
+### Options
+
+```
+      --from-xlsx-file string   Xlsx file with bom informations
+  -h, --help                    help for bom
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $XDG_CONFIG_HOME/mctl/config.yml)
+      --reauth          re-authenticate with oauth services
+```
+
+### SEE ALSO
+
+* [mctl create](mctl_create.md)	 - Create resources
+

docs/mctl_get.md

@@ -25,9 +25,8 @@ mctl get [flags]
 ### SEE ALSO
 
 * [mctl](mctl.md)	 - mctl is a CLI utility to interact with metal toolbox services
-* [mctl get aocmacaddress](mctl_get_aocmacaddress.md)	 - Get bom object by aocMacAddr
 * [mctl get bios-config](mctl_get_bios-config.md)	 - Get bios configuration information for a server
-* [mctl get bmcmacaddress](mctl_get_bmcmacaddress.md)	 - Get bom object by bmcMacAddr
+* [mctl get bom](mctl_get_bom.md)	 - Get bom object by AOC or BMC Addr
 * [mctl get component](mctl_get_component.md)	 - get server components
 * [mctl get condition](mctl_get_condition.md)	 - get server condition
 * [mctl get firmware](mctl_get_firmware.md)	 - Get information for given firmware identifier

docs/mctl_get_aocMacAddress.md → docs/mctl_get_bom.md

@@ -1,18 +1,19 @@
 [Auto generated by spf13/cobra]: <>
 
-## mctl get aocmacaddress
+## mctl get bom
 
-Get bom object by aocMacAddr
+Get bom object by AOC or BMC Addr
 
 ```
-mctl get aocmacaddress [flags]
+mctl get bom [flags]
 ```
 
 ### Options
 
 ```
-      --get-bom-by-aoc-mac-address string   get bom info by aocMacAddr
-  -h, --help                                help for aocmacaddress
+      --aoc-mac string   get bom info by aoc mac address
+      --bmc-mac string   get bom info by bmc mac address
+  -h, --help             help for bom
 ```
 
 ### Options inherited from parent commands