fix: require rescue bus and device as pair, remove unsupported local-image-path from update command, fix describe for undefined fields

Author: bahkauv70

internal/cmd/beta/image/create/create.go

@@ -283,6 +283,7 @@ func configureFlags(cmd *cobra.Command) {
 	if err := flags.MarkFlagsRequired(cmd, nameFlag, diskFormatFlag, localFilePathFlag); err != nil {
 		cobra.CheckErr(err)
 	}
+	cmd.MarkFlagsRequiredTogether(rescueBusFlag, rescueDeviceFlag)
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {

internal/cmd/beta/image/describe/describe.go

@@ -141,11 +141,11 @@ func outputResult(p *print.Printer, model *inputModel, resp *iaas.Image) error {
 				table.AddRow("OPERATING SYSTEM", *os)
 				table.AddSeparator()
 			}
-			if distro := config.OperatingSystemDistro; distro != nil {
+			if distro := config.OperatingSystemDistro; distro != nil && distro.IsSet() {
 				table.AddRow("OPERATING SYSTEM DISTRIBUTION", *distro.Get())
 				table.AddSeparator()
 			}
-			if version := config.OperatingSystemVersion; version != nil {
+			if version := config.OperatingSystemVersion; version != nil && version.IsSet() {
 				table.AddRow("OPERATING SYSTEM VERSION", *version.Get())
 				table.AddSeparator()
 			}

internal/cmd/beta/image/update/update.go

@@ -53,21 +53,19 @@ func (ic *imageConfig) isEmpty() bool {
 type inputModel struct {
 	*globalflags.GlobalFlagModel
 
-	Id            string
-	Name          *string
-	DiskFormat    *string
-	LocalFilePath *string
-	Labels        *map[string]string
-	Config        *imageConfig
-	MinDiskSize   *int64
-	MinRam        *int64
-	Protected     *bool
+	Id          string
+	Name        *string
+	DiskFormat  *string
+	Labels      *map[string]string
+	Config      *imageConfig
+	MinDiskSize *int64
+	MinRam      *int64
+	Protected   *bool
 }
 
 func (im *inputModel) isEmpty() bool {
 	return im.Name == nil &&
 		im.DiskFormat == nil &&
-		im.LocalFilePath == nil &&
 		im.Labels == nil &&
 		(im.Config == nil || im.Config.isEmpty()) &&
 		im.MinDiskSize == nil &&
@@ -78,9 +76,8 @@ func (im *inputModel) isEmpty() bool {
 const imageIdArg = "IMAGE_ID"
 
 const (
-	nameFlag          = "name"
-	diskFormatFlag    = "disk-format"
-	localFilePathFlag = "local-file-path"
+	nameFlag       = "name"
+	diskFormatFlag = "disk-format"
 
 	bootMenuFlag               = "boot-menu"
 	cdromBusFlag               = "cdrom-bus"
@@ -167,7 +164,6 @@ func NewCmd(p *print.Printer) *cobra.Command {
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().String(nameFlag, "", "The name of the image.")
 	cmd.Flags().String(diskFormatFlag, "", "The disk format of the image. ")
-	cmd.Flags().String(localFilePathFlag, "", "The path to the local disk image file.")
 
 	cmd.Flags().Bool(bootMenuFlag, false, "Enables the BIOS bootmenu.")
 	cmd.Flags().String(cdromBusFlag, "", "Sets CDROM bus controller type.")
@@ -188,6 +184,8 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64(minDiskSizeFlag, 0, "Size in Gigabyte.")
 	cmd.Flags().Int64(minRamFlag, 0, "Size in Megabyte.")
 	cmd.Flags().Bool(protectedFlag, false, "Protected VM.")
+
+	cmd.MarkFlagsRequiredTogether(rescueBusFlag, rescueDeviceFlag)
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
@@ -201,9 +199,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
 		Id:              cliArgs[0],
 		Name:            flags.FlagToStringPointer(p, cmd, nameFlag),
 
-		DiskFormat:    flags.FlagToStringPointer(p, cmd, diskFormatFlag),
-		LocalFilePath: flags.FlagToStringPointer(p, cmd, localFilePathFlag),
-		Labels:        flags.FlagToStringToStringPointer(p, cmd, labelsFlag),
+		DiskFormat: flags.FlagToStringPointer(p, cmd, diskFormatFlag),
+		Labels:     flags.FlagToStringToStringPointer(p, cmd, labelsFlag),
 		Config: &imageConfig{
 			BootMenu:               flags.FlagToBoolPointer(p, cmd, bootMenuFlag),
 			CdromBus:               flags.FlagToStringPointer(p, cmd, cdromBusFlag),

internal/cmd/beta/image/update/update_test.go

@@ -26,7 +26,6 @@ var (
 	testProjectId = uuid.NewString()
 
 	testImageId                      = []string{uuid.NewString()}
-	testLocalImagePath               = "/does/not/exist"
 	testDiskFormat                   = "raw"
 	testDiskSize               int64 = 16 * 1024 * 1024 * 1024
 	testRamSize                int64 = 8 * 1024 * 1024 * 1024
@@ -54,7 +53,6 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 
 		nameFlag:                   testName,
 		diskFormatFlag:             testDiskFormat,
-		localFilePathFlag:          testLocalImagePath,
 		bootMenuFlag:               strconv.FormatBool(testBootmenu),
 		cdromBusFlag:               testCdRomBus,
 		diskBusFlag:                testDiskBus,
@@ -95,7 +93,6 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		Id:              testImageId[0],
 		Name:            &testName,
 		DiskFormat:      &testDiskFormat,
-		LocalFilePath:   &testLocalImagePath,
 		Labels:          utils.Ptr(parseLabels(testLabels)),
 		Config: &imageConfig{
 			BootMenu:               &testBootmenu,