report created_at and updated_at from condition API (#70)

* report created_at and updated_at from condition API * unify server flag handling across commands
metal-toolbox · Nov 17, 2023 · ff4fc3d · ff4fc3d
1 parent 225704a
commit ff4fc3d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 27 deletions.
diff --git a/cmd/collect/collect.go b/cmd/collect/collect.go
@@ -1,10 +1,14 @@
 package collect
 
 import (
+	"log"
+
 	"github.com/metal-toolbox/mctl/cmd"
 	"github.com/spf13/cobra"
 )
 
+var serverIDStr string
+
 var collect = &cobra.Command{
 	Use:   "collect",
 	Short: "Collect current server firmware status and bios configuration",
@@ -16,4 +20,11 @@ var collect = &cobra.Command{
 
 func init() {
 	cmd.RootCmd.AddCommand(collect)
+
+	pflags := collect.PersistentFlags()
+	pflags.StringVarP(&serverIDStr, "server", "s", "", "server id (typically a UUID)")
+
+	if err := collect.MarkPersistentFlagRequired("server"); err != nil {
+		log.Fatalf("marking server flag as required: %s", err.Error())
+	}
 }
diff --git a/cmd/collect/inventory.go b/cmd/collect/inventory.go
@@ -16,7 +16,6 @@ import (
 )
 
 type collectInventoryFlags struct {
-	serverID                  string
 	skipFirmwareStatusCollect bool
 	skipBiosConfigCollect     bool
 }
@@ -26,9 +25,9 @@ var (
 )
 
 var collectInventoryCmd = &cobra.Command{
-	Use:   "inventory",
+	Use:   "inventory --server | -s <server uuid>",
 	Short: "Collect current server firmware status and bios configuration",
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(cmd *cobra.Command, _ []string) {
 		collectInventory(cmd.Context())
 
 	},
@@ -37,7 +36,7 @@ var collectInventoryCmd = &cobra.Command{
 func collectInventory(ctx context.Context) {
 	theApp := mctl.MustCreateApp(ctx)
 
-	serverID, err := uuid.Parse(flagsDefinedCollectInventory.serverID)
+	serverID, err := uuid.Parse(serverIDStr)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -80,11 +79,8 @@ func init() {
 	flagsDefinedCollectInventory = &collectInventoryFlags{}
 
 	collect.AddCommand(collectInventoryCmd)
-	collectInventoryCmd.PersistentFlags().StringVar(&flagsDefinedCollectInventory.serverID, "server", "", "server UUID")
-	collectInventoryCmd.PersistentFlags().BoolVar(&flagsDefinedCollectInventory.skipFirmwareStatusCollect, "skip-fw-status", false, "Skip firmware status data collection")
-	collectInventoryCmd.PersistentFlags().BoolVar(&flagsDefinedCollectInventory.skipBiosConfigCollect, "skip-bios-config", false, "Skip BIOS configuration data collection")
-
-	if err := collectInventoryCmd.MarkPersistentFlagRequired("server"); err != nil {
-		log.Fatal(err)
-	}
+	collectInventoryCmd.PersistentFlags().BoolVar(&flagsDefinedCollectInventory.skipFirmwareStatusCollect,
+		"skip-fw-status", false, "Skip firmware status data collection")
+	collectInventoryCmd.PersistentFlags().BoolVar(&flagsDefinedCollectInventory.skipBiosConfigCollect,
+		"skip-bios-config", false, "Skip BIOS configuration data collection")
 }
diff --git a/cmd/collect/status.go b/cmd/collect/status.go
@@ -14,8 +14,6 @@ import (
 	rctypes "github.com/metal-toolbox/rivets/condition"
 )
 
-var serverIDStr string
-
 var inventoryStatus = &cobra.Command{
 	Use:   "status --server | -s <server uuid>",
 	Short: "check the progress of a inventory collection for a server",
@@ -51,12 +49,5 @@ func statusCheck(ctx context.Context) {
 }
 
 func init() {
-	flags := inventoryStatus.Flags()
-	flags.StringVarP(&serverIDStr, "server", "s", "", "server id (typically a UUID)")
-
-	if err := inventoryStatus.MarkFlagRequired("server"); err != nil {
-		log.Fatalf("marking server flag as required: %s", err.Error())
-	}
-
 	collect.AddCommand(inventoryStatus)
 }
diff --git a/cmd/common.go b/cmd/common.go
@@ -219,8 +219,10 @@ func FormatConditionResponse(response *coapiv1.ServerResponse) (string, error) {
 		Kind:       rctypes.Kind(inc.Kind),
 		Parameters: inc.Parameters,
 		// type conversion until the Condition type is fully moved into the rivets lib
-		State:  rctypes.State(inc.State),
-		Status: inc.Status,
+		State:     rctypes.State(inc.State),
+		Status:    inc.Status,
+		UpdatedAt: inc.UpdatedAt,
+		CreatedAt: inc.CreatedAt,
 	}
 
 	// XXX: seems highly unlikely that we get a response that deserializes cleanly and doesn't

diff --git a/docs/mctl_collect.md b/docs/mctl_collect.md
@@ -11,7 +11,8 @@ mctl collect [flags]
 ### Options
 
 ```
-  -h, --help   help for collect
+  -h, --help            help for collect
+  -s, --server string   server id (typically a UUID)
 ```
 
 ### Options inherited from parent commands

diff --git a/docs/mctl_collect_inventory.md b/docs/mctl_collect_inventory.md
@@ -5,14 +5,13 @@
 Collect current server firmware status and bios configuration
 
 ```
-mctl collect inventory [flags]
+mctl collect inventory --server | -s <server uuid> [flags]
 ```
 
 ### Options
 
 ```
   -h, --help               help for inventory
-      --server string      server UUID
       --skip-bios-config   Skip BIOS configuration data collection
       --skip-fw-status     Skip firmware status data collection
 ```
@@ -22,6 +21,7 @@ mctl collect inventory [flags]
 ```
       --config string   config file (default is $XDG_CONFIG_HOME/mctl/config.yml)
       --reauth          re-authenticate with oauth services
+  -s, --server string   server id (typically a UUID)
 ```
 
 ### SEE ALSO

diff --git a/docs/mctl_collect_status.md b/docs/mctl_collect_status.md
@@ -11,15 +11,15 @@ mctl collect status --server | -s <server uuid> [flags]
 ### Options
 
 ```
-  -h, --help            help for status
-  -s, --server string   server id (typically a UUID)
+  -h, --help   help for status
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string   config file (default is $XDG_CONFIG_HOME/mctl/config.yml)
       --reauth          re-authenticate with oauth services
+  -s, --server string   server id (typically a UUID)
 ```
 
 ### SEE ALSO