fix(cmd/boot): improvements to issues discovered while implementing metadata commands

cmd/boot/bmc/add.go

@@ -20,52 +20,54 @@ func newCmdBootBmcAdd() *cobra.Command {
 	var bootBmcAddCmd = &cobra.Command{
 		Use:   "add",
 		Args:  cobra.NoArgs,
-		Short: "Add a new BMC to boot-service",
-		Long: `Add a new BMC to boot-service.
+		Short: "Add one or more BMCs to boot-service",
+		Long: `Add one or more BMCs to boot-service.
 
 See ochami-boot(1) for more details.`,
 		Example: `  # Add BMC using payload data
   ochami boot bmc add -d \
     '{
-      "xname": "x1000c0s0b0",
-      "description": "This node's BMC",
-      "interface": {
-        "type": "management",
-        "mac": "de:ca:fc:0f:fe:e1",
-        "ip": "172.16.0.254"
-      }
-    }'
+       "xname": "x1000c0s0b0",
+       "description": "This node's BMC",
+       "interface": {
+         "type": "management",
+         "mac": "de:ca:fc:0f:fe:e1",
+         "ip": "172.16.0.254"
+       }
+     }'
 
   # Add multiple BMCs using payload data
   ochami boot bmc add -d \
     '[
-      {
-        "xname": "x1000c0s0b0",
-        "description": "Node 1's BMC",
-        "interface": {
-          "type": "management",
-          "mac": "de:ca:fc:0f:fe:e1",
-          "ip": "172.16.0.1"
-        }
-      },
-      {
-        "xname": "x1000c0s0b1",
-        "description": "Node 2's BMC",
-        "interface": {
-          "type": "management",
-          "mac": "de:ca:fc:0f:fe:e2",
-          "ip": "172.16.0.2"
-        }
-      }
-    ]'
+       {
+         "xname": "x1000c0s0b0",
+         "description": "Node 1's BMC",
+         "interface": {
+           "type": "management",
+           "mac": "de:ca:fc:0f:fe:e1",
+           "ip": "172.16.0.1"
+         }
+       },
+       {
+         "xname": "x1000c0s0b1",
+         "description": "Node 2's BMC",
+         "interface": {
+           "type": "management",
+           "mac": "de:ca:fc:0f:fe:e2",
+           "ip": "172.16.0.2"
+         }
+       }
+     ]'
 
   # Add BMCs using input payload file
   ochami boot bmc add -d @payload.json
   ochami boot bmc add -d @payload.yaml -f yaml
 
   # Add BMCs using data from stdin
   echo '<json_data>' | ochami boot bmc add -d @-
-  echo '<yaml_data>' | ochami boot bmc add -d @- -f yaml`,
+  echo '<json_data>' | ochami boot bmc add
+  echo '<yaml_data>' | ochami boot bmc add -d @- -f yaml
+  echo '<yaml_data>' | ochami boot bmc add -f yaml`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)
@@ -75,7 +77,11 @@ See ochami-boot(1) for more details.`,
 
 			// Read node data
 			bmcs := []boot_service_client.CreateBMCRequest{}
-			cli.HandlePayloadSlice[boot_service_client.CreateBMCRequest](cmd, &bmcs)
+			if cmd.Flag("data").Changed {
+				cli.HandlePayloadSlice[boot_service_client.CreateBMCRequest](cmd, &bmcs)
+			} else {
+				cli.HandlePayloadStdinSlice[boot_service_client.CreateBMCRequest](cmd, &bmcs)
+			}
 
 			// Send off requests
 			bmcsCreated, errs, err := bootServiceClient.AddBMCs(cli.Token, bmcs)
@@ -106,8 +112,6 @@ See ochami-boot(1) for more details.`,
 	bootBmcAddCmd.Flags().StringP("data", "d", "", "payload data or (if starting with @) file containing payload data (can be - to read from stdin)")
 	bootBmcAddCmd.Flags().VarP(&cli.FormatInput, "format-input", "f", "format of input payload data (json,json-pretty,yaml)")
 
-	bootBmcAddCmd.MarkFlagsOneRequired("data")
-
 	bootBmcAddCmd.RegisterFlagCompletionFunc("format-input", cli.CompletionFormatData)
 
 	return bootBmcAddCmd

cmd/boot/bmc/delete.go

@@ -33,6 +33,26 @@ See ochami-boot(1) for more details.`,
   # Don't confirm deletion
   ochami boot bmc delete --no-confirm bmc-773d99bf`,
 		Run: func(cmd *cobra.Command, args []string) {
+			// Ask before attempting deletion unless --no-confirm was passed
+			noConfirm, err := cmd.Flags().GetBool("no-confirm")
+			if err != nil {
+				log.Logger.Error().Err(err).Msg("failed to get --no-confirm")
+				os.Exit(1)
+			}
+			if !noConfirm {
+				log.Logger.Debug().Msg("--no-confirm not passed, prompting user to confirm deletion")
+				respDelete, err := cli.Ios.LoopYesNo("Really delete?")
+				if err != nil {
+					log.Logger.Error().Err(err).Msg("failed to fetch user input")
+					os.Exit(1)
+				} else if !respDelete {
+					log.Logger.Info().Msg("user aborted BMC deletion")
+					os.Exit(0)
+				} else {
+					log.Logger.Debug().Msg("user answered affirmatively to delete BMC(s)")
+				}
+			}
+
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)
 

cmd/boot/bmc/get.go

@@ -25,7 +25,7 @@ func newCmdBootBmcGet() *cobra.Command {
 
 See ochami-boot(1) for more details.`,
 		Example: `  # Get info about a BMC
-  ochami boot node get bmc-773d99bf`,
+  ochami boot bmc get bmc-773d99bf`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)

cmd/boot/bmc/patch.go

@@ -41,12 +41,12 @@ If --set/--unset/--add/--remove are specified or --patch-method is 'keyval',
 the manual, key-value patch method using dot notation (e.g. key.subkey=value)
 is used.
 
-Otherwise, --data can be used to pass in raw patch data, using --patch-format
-to specify the patch format (see examples below).
+Otherwise, stdin and/or --data can be used to pass in raw patch data, using
+--patch-method to specify the patch format (see examples below).
 
---format-input can only be used with --data. It can be used to tell ochami to
-use a different format (e.g. YAML) for the data input for either of these
-methods.
+--format-input can only be used with stdin/--data. It can be used to tell
+ochami to use a different format (e.g. YAML) for the data input for either
+of these methods.
 
 See ochami-boot(1) for more details.`,
 		Example: `  # Patch using JSON patch (RFC 6902)
@@ -67,7 +67,9 @@ See ochami-boot(1) for more details.`,
 
   # Patch using stdin
   echo '<json_data>' | ochami boot bmc patch bmc-773d99bf -d @-
-  echo '<yaml_data>' | ochami boot bmc patch bmc-773d99bf -f yaml -d @-`,
+  echo '<json_data>' | ochami boot bmc patch bmc-773d99bf
+  echo '<yaml_data>' | ochami boot bmc patch bmc-773d99bf -d @- -f yaml
+  echo '<yaml_data>' | ochami boot bmc patch bmc-773d99bf -f yaml`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)
@@ -77,8 +79,8 @@ See ochami-boot(1) for more details.`,
 
 			var patchData map[string]interface{}
 			if cmd.Flag("set").Changed || cmd.Flag("unset").Changed || cmd.Flag("add").Changed || cmd.Flag("remove").Changed {
-				if cmd.Flag("patch-format").Changed && formatPatch != client.PatchMethodKeyVal {
-					log.Logger.Warn().Msg("overriding --patch-format since --set/--unset/--add/--remove was passed")
+				if cmd.Flag("patch-method").Changed && formatPatch != client.PatchMethodKeyVal {
+					log.Logger.Warn().Msg("overriding --patch-method since --set/--unset/--add/--remove was passed")
 				}
 
 				pd, err := client.NewKeyValPatch(setList, unsetList, addList, removeList)
@@ -89,7 +91,11 @@ See ochami-boot(1) for more details.`,
 				}
 				patchData = pd
 			} else {
-				cli.HandlePayload(cmd, &patchData)
+				if cmd.Flag("data").Changed {
+					cli.HandlePayload(cmd, &patchData)
+				} else {
+					cli.HandlePayloadStdin(cmd, &patchData)
+				}
 			}
 
 			bmcPatched, err := bootServiceClient.PatchBMC(cli.Token, formatPatch, args[0], patchData)
@@ -116,7 +122,6 @@ See ochami-boot(1) for more details.`,
 		bootBmcPatchCmd.MarkFlagsMutuallyExclusive("format-input", flag)
 		bootBmcPatchCmd.MarkFlagsMutuallyExclusive("data", flag)
 	}
-	bootBmcPatchCmd.MarkFlagsOneRequired("data", "set", "unset", "add", "remove")
 
 	bootBmcPatchCmd.RegisterFlagCompletionFunc("format-input", cli.CompletionFormatData)
 

cmd/boot/bmc/set.go

@@ -27,22 +27,24 @@ See ochami-boot(1) for more details.`,
 		Example: `  # Set BMC details using payload data
   ochami boot bmc set bmc-773d99bf -d \
     '{
-      "xname": "x1000c0s0b0",
-      "description": "This node's BMC",
-      "interface": {
-        "type": "management",
-        "mac": "de:ca:fc:0f:fe:e1",
-        "ip": "172.16.0.254"
-      }
-    }'
+       "xname": "x1000c0s0b0",
+       "description": "This node's BMC",
+       "interface": {
+         "type": "management",
+         "mac": "de:ca:fc:0f:fe:e1",
+         "ip": "172.16.0.254"
+       }
+     }'
 
   # Set BMC details using input payload file
   ochami boot bmc set -d @payload.json bmc-773d99bf
   ochami boot bmc set -d @payload.yaml -f yaml bmc-773d99bf
 
   # Set BMC details using data from stdin
   echo '<json_data>' | ochami boot bmc set -d @- bmc-773d99bf
-  echo '<yaml_data>' | ochami boot bmc set -d @- -f yaml bmc-773d99bf`,
+  echo '<json_data>' | ochami boot bmc set bmc-773d99bf
+  echo '<yaml_data>' | ochami boot bmc set -d @- -f yaml bmc-773d99bf
+  echo '<yaml_data>' | ochami boot bmc set -f yaml bmc-773d99bf`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)
@@ -52,7 +54,11 @@ See ochami-boot(1) for more details.`,
 
 			// Read BMC data
 			bmc := boot_service_client.UpdateBMCRequest{}
-			cli.HandlePayload(cmd, &bmc)
+			if cmd.Flag("data").Changed {
+				cli.HandlePayload(cmd, &bmc)
+			} else {
+				cli.HandlePayloadStdin(cmd, &bmc)
+			}
 
 			// Send off requests
 			bmcSet, err := bootServiceClient.SetBMC(cli.Token, args[0], bmc)
@@ -70,8 +76,6 @@ See ochami-boot(1) for more details.`,
 	bootBmcSetCmd.Flags().StringP("data", "d", "", "payload data or (if starting with @) file containing payload data (can be - to read from stdin)")
 	bootBmcSetCmd.Flags().VarP(&cli.FormatInput, "format-input", "f", "format of input payload data (json,json-pretty,yaml)")
 
-	bootBmcSetCmd.MarkFlagsOneRequired("data")
-
 	bootBmcSetCmd.RegisterFlagCompletionFunc("format-input", cli.CompletionFormatData)
 
 	return bootBmcSetCmd

cmd/boot/config/add.go

@@ -27,54 +27,56 @@ See ochami-boot(1) for more details.`,
 		Example: `  # Add boot configuration using payload data
   ochami boot config add -d \
     '{
-      "hosts": [
-        "item1",
-        "item2"
-      ],
-      "macs": [
-        "de:ca:fc:0f:fe:e1",
-        "de:ca:fc:0f:fe:e2"
-      ],
-      "nids": [
-        1,
-        2
-      ],
-      "groups": [
-        "group1",
-        "group2"
-      ],
-      "kernel": "http://s3.openchami.cluster/kernels/vmlinuz1",
-      "initrd": "http://s3.openchami.cluster/initrds/initramfs1.img",
-      "params": "console=tty0,115200n8 console=ttyS0,115200n8",
-      "priority": 42
-    }'
+       "hosts": [
+         "item1",
+         "item2"
+       ],
+       "macs": [
+         "de:ca:fc:0f:fe:e1",
+         "de:ca:fc:0f:fe:e2"
+       ],
+       "nids": [
+         1,
+         2
+       ],
+       "groups": [
+         "group1",
+         "group2"
+       ],
+       "kernel": "http://s3.openchami.cluster/kernels/vmlinuz1",
+       "initrd": "http://s3.openchami.cluster/initrds/initramfs1.img",
+       "params": "console=tty0,115200n8 console=ttyS0,115200n8",
+       "priority": 42
+     }'
 
   # Add multiple boot configurations using payload data
   ochami boot config add -d \
     '[
-      {
-        "hosts": ["host1"],
-        "kernel": "http://s3.openchami.cluster/kernels/vmlinuz1",
-        "initrd": "http://s3.openchami.cluster/initrds/initramfs1.img",
-        "params": "console=tty0,115200n8 console=ttyS0,115200n8",
-        "priority": 42
-      },
-      {
-        "macs": ["de:ca:fc:0f:fe:ee"],
-        "kernel": "http://s3.openchami.cluster/kernels/vmlinuz2",
-        "initrd": "http://s3.openchami.cluster/initrds/initramfs2.img",
-        "params": "ip=dhcp",
-        "priority": 43
-      }
-    ]'
+       {
+         "hosts": ["host1"],
+         "kernel": "http://s3.openchami.cluster/kernels/vmlinuz1",
+         "initrd": "http://s3.openchami.cluster/initrds/initramfs1.img",
+         "params": "console=tty0,115200n8 console=ttyS0,115200n8",
+         "priority": 42
+       },
+       {
+         "macs": ["de:ca:fc:0f:fe:ee"],
+         "kernel": "http://s3.openchami.cluster/kernels/vmlinuz2",
+         "initrd": "http://s3.openchami.cluster/initrds/initramfs2.img",
+         "params": "ip=dhcp",
+         "priority": 43
+       }
+     ]'
 
   # Add boot configuration using input payload file
   ochami boot config add -d @payload.json
   ochami boot config add -d @payload.yaml -f yaml
 
   # Add boot configuration using data from stdin
   echo '<json_data>' | ochami boot config add -d @-
-  echo '<yaml_data>' | ochami boot config add -d @- -f yaml`,
+  echo '<json_data>' | ochami boot config add
+  echo '<yaml_data>' | ochami boot config add -d @- -f yaml
+  echo '<yaml_data>' | ochami boot config add -f yaml`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// Create client to use for requests
 			bootServiceClient := boot_service_lib.GetClient(cmd)
@@ -84,7 +86,11 @@ See ochami-boot(1) for more details.`,
 
 			// Read boot configuration data
 			bcs := []boot_service_client.CreateBootConfigurationRequest{}
-			cli.HandlePayloadSlice[boot_service_client.CreateBootConfigurationRequest](cmd, &bcs)
+			if cmd.Flag("data").Changed {
+				cli.HandlePayloadSlice[boot_service_client.CreateBootConfigurationRequest](cmd, &bcs)
+			} else {
+				cli.HandlePayloadStdinSlice[boot_service_client.CreateBootConfigurationRequest](cmd, &bcs)
+			}
 
 			// Send off requests
 			cfgsCreated, errs, err := bootServiceClient.AddBootConfigs(cli.Token, bcs)
@@ -115,8 +121,6 @@ See ochami-boot(1) for more details.`,
 	bootConfigAddCmd.Flags().StringP("data", "d", "", "payload data or (if starting with @) file containing payload data (can be - to read from stdin)")
 	bootConfigAddCmd.Flags().VarP(&cli.FormatInput, "format-input", "f", "format of input payload data (json,json-pretty,yaml)")
 
-	bootConfigAddCmd.MarkFlagsOneRequired("data")
-
 	bootConfigAddCmd.RegisterFlagCompletionFunc("format-input", cli.CompletionFormatData)
 
 	return bootConfigAddCmd