Remove size try command.

cmd/size.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/dustin/go-humanize"
 	"github.com/go-openapi/strfmt"
 	"github.com/google/uuid"
 	"github.com/metal-stack/metal-go/api/client/size"
@@ -63,18 +62,6 @@ func newSizeCmd(c *config) *cobra.Command {
 		},
 	}
 
-	tryCmd := &cobra.Command{
-		Use:   "try",
-		Short: "try a specific hardware spec and give the chosen size back",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return w.try()
-		},
-	}
-
-	tryCmd.Flags().Int32P("cores", "C", 0, "Cores of the hardware to try")
-	tryCmd.Flags().StringP("memory", "M", "", "Memory of the hardware to try, can be given in bytes or any human readable size spec")
-	tryCmd.Flags().StringP("storagesize", "S", "", "Total storagesize of the hardware to try, can be given in bytes or any human readable size spec")
-
 	reservationsCmd := &cobra.Command{
 		Use:   "reservations",
 		Short: "manage size reservations",
@@ -111,7 +98,7 @@ func newSizeCmd(c *config) *cobra.Command {
 
 	must(suggestCmd.RegisterFlagCompletionFunc("machine-id", c.comp.MachineListCompletion))
 
-	return genericcli.NewCmds(cmdsConfig, newSizeImageConstraintCmd(c), tryCmd, reservationsCmd, suggestCmd)
+	return genericcli.NewCmds(cmdsConfig, newSizeImageConstraintCmd(c), reservationsCmd, suggestCmd)
 }
 
 func (c sizeCmd) Get(id string) (*models.V1SizeResponse, error) {
@@ -210,43 +197,6 @@ func sizeResponseToUpdate(r *models.V1SizeResponse) *models.V1SizeUpdateRequest
 
 // non-generic command handling
 
-func (c *sizeCmd) try() error {
-	var (
-		memory int64
-		disks  []*models.V1MachineBlockDevice
-	)
-
-	if viper.IsSet("memory") {
-		m, err := humanize.ParseBytes(viper.GetString("memory"))
-		if err != nil {
-			return err
-		}
-		memory = int64(m)
-	}
-
-	if viper.IsSet("storagesize") {
-		s, err := humanize.ParseBytes(viper.GetString("storagesize"))
-		if err != nil {
-			return err
-		}
-		disks = append(disks, &models.V1MachineBlockDevice{
-			Name: pointer.Pointer("/dev/trydisk"),
-			Size: pointer.Pointer(int64(s)),
-		})
-	}
-
-	resp, err := c.client.Size().FromHardware(size.NewFromHardwareParams().WithBody(&models.V1MachineHardware{
-		CPUCores: pointer.Pointer(viper.GetInt32("cores")),
-		Memory:   &memory,
-		Disks:    disks,
-	}), nil)
-	if err != nil {
-		return err
-	}
-
-	return c.listPrinter.Print(resp.Payload)
-}
-
 func (c sizeCmd) listReverations() error {
 	resp, err := c.client.Size().ListSizeReservations(size.NewListSizeReservationsParams().WithBody(emptyBody), nil)
 	if err != nil {

cmd/size_test.go

@@ -315,17 +315,17 @@ ID   NAME     DESCRIPTION   RESERVATIONS   CPU RANGE   MEMORY RANGE   STORAGE RA
 							{
 								Max:  int64(2),
 								Min:  int64(1),
-								Type: pointer.Pointer("storage"),
+								Type: pointer.Pointer(models.V1SizeConstraintTypeStorage),
 							},
 							{
 								Max:  int64(4),
 								Min:  int64(3),
-								Type: pointer.Pointer("memory"),
+								Type: pointer.Pointer(models.V1SizeConstraintTypeMemory),
 							},
 							{
 								Max:  int64(6),
 								Min:  int64(5),
-								Type: pointer.Pointer("cores"),
+								Type: pointer.Pointer(models.V1SizeConstraintTypeCores),
 							},
 						},
 					}, nil)
@@ -336,17 +336,17 @@ ID   NAME     DESCRIPTION   RESERVATIONS   CPU RANGE   MEMORY RANGE   STORAGE RA
 					{
 						Max:  int64(2),
 						Min:  int64(1),
-						Type: pointer.Pointer("storage"),
+						Type: pointer.Pointer(models.V1SizeConstraintTypeStorage),
 					},
 					{
 						Max:  int64(4),
 						Min:  int64(3),
-						Type: pointer.Pointer("memory"),
+						Type: pointer.Pointer(models.V1SizeConstraintTypeMemory),
 					},
 					{
 						Max:  int64(6),
 						Min:  int64(5),
-						Type: pointer.Pointer("cores"),
+						Type: pointer.Pointer(models.V1SizeConstraintTypeCores),
 					},
 				},
 				Description: "foo",

cmd/tableprinters/printer.go

@@ -105,10 +105,6 @@ func (t *TablePrinter) ToHeaderAndRows(data any, wide bool) ([]string, [][]strin
 		return t.SizeTable(pointer.WrapInSlice(d), wide)
 	case []*models.V1SizeResponse:
 		return t.SizeTable(d, wide)
-	case *models.V1SizeMatchingLog:
-		return t.SizeMatchingLogTable(pointer.WrapInSlice(d), wide)
-	case []*models.V1SizeMatchingLog:
-		return t.SizeMatchingLogTable(d, wide)
 	case *models.V1SizeReservationResponse:
 		return t.SizeReservationTable(pointer.WrapInSlice(d), wide)
 	case []*models.V1SizeReservationResponse:

cmd/tableprinters/size.go

@@ -63,38 +63,6 @@ func (t *TablePrinter) SizeTable(data []*models.V1SizeResponse, wide bool) ([]st
 	return header, rows, nil
 }
 
-func (t *TablePrinter) SizeMatchingLogTable(data []*models.V1SizeMatchingLog, wide bool) ([]string, [][]string, error) {
-	var (
-		header = []string{"Name", "Match", "CPU Constraint", "Memory Constraint", "Storage Constraint"}
-		rows   [][]string
-	)
-
-	for _, d := range data {
-		var cpu, memory, storage string
-		for _, cs := range d.Constraints {
-			c := cs.Constraint
-			switch *c.Type {
-			case "cores": // TODO: should be enums in spec
-				cpu = fmt.Sprintf("%d - %d\n%s\nmatches: %v", c.Min, c.Max, *cs.Log, *cs.Match)
-			case "memory":
-				memory = fmt.Sprintf("%s - %s\n%s\nmatches: %v", humanize.Bytes(uint64(c.Min)), humanize.Bytes(uint64(c.Max)), *cs.Log, *cs.Match)
-			case "storage":
-				storage = fmt.Sprintf("%s - %s\n%s\nmatches: %v", humanize.Bytes(uint64(c.Min)), humanize.Bytes(uint64(c.Max)), *cs.Log, *cs.Match)
-			}
-		}
-		sizeMatch := fmt.Sprintf("%v", *d.Match)
-
-		rows = append(rows, []string{*d.Name, sizeMatch, cpu, memory, storage})
-	}
-
-	t.t.MutateTable(func(table *tablewriter.Table) {
-		table.SetAutoWrapText(false)
-		table.SetColMinWidth(3, 40)
-	})
-
-	return header, rows, nil
-}
-
 func (t *TablePrinter) SizeReservationTable(data []*models.V1SizeReservationResponse, wide bool) ([]string, [][]string, error) {
 	var (
 		header = []string{"Partition", "Size", "Tenant", "Project", "Project Name", "Used/Amount", "Project Allocations"}

docs/metalctl_size.md

@@ -52,6 +52,5 @@ a size matches a machine in terms of cpu cores, ram and storage.
 * [metalctl size list](metalctl_size_list.md)	 - list all sizes
 * [metalctl size reservations](metalctl_size_reservations.md)	 - manage size reservations
 * [metalctl size suggest](metalctl_size_suggest.md)	 - suggest size from a given machine id
-* [metalctl size try](metalctl_size_try.md)	 - try a specific hardware spec and give the chosen size back
 * [metalctl size update](metalctl_size_update.md)	 - updates the size