Skip to content

Commit

Permalink
Update to metal-go v0.39.2. (#268)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerrit91
Gerrit91 authored Nov 11, 2024
1 parent a290506 commit b59d48b
Show file tree
Hide file tree
Showing 16 changed files with 101 additions and 96 deletions.
12 changes: 6 additions & 6 deletions cmd/filesystemlayout.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func newFilesystemLayoutCmd(c *config) *cobra.Command {
return genericcli.NewCmds(cmdsConfig, tryCmd, matchCmd)
}

func (c fslCmd) Get(id string) (*models.V1FilesystemLayoutResponse, error) {
func (c *fslCmd) Get(id string) (*models.V1FilesystemLayoutResponse, error) {
resp, err := c.client.Filesystemlayout().GetFilesystemLayout(fsmodel.NewGetFilesystemLayoutParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -79,7 +79,7 @@ func (c fslCmd) Get(id string) (*models.V1FilesystemLayoutResponse, error) {
return resp.Payload, nil
}

func (c fslCmd) List() ([]*models.V1FilesystemLayoutResponse, error) {
func (c *fslCmd) List() ([]*models.V1FilesystemLayoutResponse, error) {
resp, err := c.client.Filesystemlayout().ListFilesystemLayouts(fsmodel.NewListFilesystemLayoutsParams(), nil)
if err != nil {
return nil, err
Expand All @@ -88,7 +88,7 @@ func (c fslCmd) List() ([]*models.V1FilesystemLayoutResponse, error) {
return resp.Payload, nil
}

func (c fslCmd) Delete(id string) (*models.V1FilesystemLayoutResponse, error) {
func (c *fslCmd) Delete(id string) (*models.V1FilesystemLayoutResponse, error) {
resp, err := c.client.Filesystemlayout().DeleteFilesystemLayout(fsmodel.NewDeleteFilesystemLayoutParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -97,7 +97,7 @@ func (c fslCmd) Delete(id string) (*models.V1FilesystemLayoutResponse, error) {
return resp.Payload, nil
}

func (c fslCmd) Create(rq *models.V1FilesystemLayoutCreateRequest) (*models.V1FilesystemLayoutResponse, error) {
func (c *fslCmd) Create(rq *models.V1FilesystemLayoutCreateRequest) (*models.V1FilesystemLayoutResponse, error) {
resp, err := c.client.Filesystemlayout().CreateFilesystemLayout(fsmodel.NewCreateFilesystemLayoutParams().WithBody(rq), nil)
if err != nil {
var r *fsmodel.CreateFilesystemLayoutConflict
Expand All @@ -110,7 +110,7 @@ func (c fslCmd) Create(rq *models.V1FilesystemLayoutCreateRequest) (*models.V1Fi
return resp.Payload, nil
}

func (c fslCmd) Update(rq *models.V1FilesystemLayoutUpdateRequest) (*models.V1FilesystemLayoutResponse, error) {
func (c *fslCmd) Update(rq *models.V1FilesystemLayoutUpdateRequest) (*models.V1FilesystemLayoutResponse, error) {
resp, err := c.client.Filesystemlayout().UpdateFilesystemLayout(fsmodel.NewUpdateFilesystemLayoutParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -119,7 +119,7 @@ func (c fslCmd) Update(rq *models.V1FilesystemLayoutUpdateRequest) (*models.V1Fi
return resp.Payload, nil
}

func (c fslCmd) Convert(r *models.V1FilesystemLayoutResponse) (string, *models.V1FilesystemLayoutCreateRequest, *models.V1FilesystemLayoutUpdateRequest, error) {
func (c *fslCmd) Convert(r *models.V1FilesystemLayoutResponse) (string, *models.V1FilesystemLayoutCreateRequest, *models.V1FilesystemLayoutUpdateRequest, error) {
if r.ID == nil {
return "", nil, nil, fmt.Errorf("id is nil")
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type firewallCmd struct {
}

func newFirewallCmd(c *config) *cobra.Command {
w := firewallCmd{
w := &firewallCmd{
config: c,
}

Expand Down Expand Up @@ -125,7 +125,7 @@ ingress:
return genericcli.NewCmds(cmdsConfig, firewallSSHCmd)
}

func (c firewallCmd) Get(id string) (*models.V1FirewallResponse, error) {
func (c *firewallCmd) Get(id string) (*models.V1FirewallResponse, error) {
resp, err := c.client.Firewall().FindFirewall(firewall.NewFindFirewallParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -134,7 +134,7 @@ func (c firewallCmd) Get(id string) (*models.V1FirewallResponse, error) {
return resp.Payload, nil
}

func (c firewallCmd) List() ([]*models.V1FirewallResponse, error) {
func (c *firewallCmd) List() ([]*models.V1FirewallResponse, error) {
var macs []string
if viper.IsSet("mac") {
macs = pointer.WrapInSlice(viper.GetString("mac"))
Expand All @@ -158,11 +158,11 @@ func (c firewallCmd) List() ([]*models.V1FirewallResponse, error) {
return resp.Payload, nil
}

func (c firewallCmd) Delete(_ string) (*models.V1FirewallResponse, error) {
func (c *firewallCmd) Delete(_ string) (*models.V1FirewallResponse, error) {
return nil, fmt.Errorf("firewall entity does not support delete operation, use machine delete")
}

func (c firewallCmd) Create(rq *models.V1FirewallCreateRequest) (*models.V1FirewallResponse, error) {
func (c *firewallCmd) Create(rq *models.V1FirewallCreateRequest) (*models.V1FirewallResponse, error) {
resp, err := c.client.Firewall().AllocateFirewall(firewall.NewAllocateFirewallParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -171,11 +171,11 @@ func (c firewallCmd) Create(rq *models.V1FirewallCreateRequest) (*models.V1Firew
return resp.Payload, nil
}

func (c firewallCmd) Update(rq any) (*models.V1FirewallResponse, error) {
func (c *firewallCmd) Update(rq any) (*models.V1FirewallResponse, error) {
return nil, fmt.Errorf("firewall entity does not support update operation, use machine update")
}

func (c firewallCmd) Convert(r *models.V1FirewallResponse) (string, *models.V1FirewallCreateRequest, any, error) {
func (c *firewallCmd) Convert(r *models.V1FirewallResponse) (string, *models.V1FirewallCreateRequest, any, error) {
if r.ID == nil {
return "", nil, nil, fmt.Errorf("id is nil")
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/ip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ipCmd struct {
}

func newIPCmd(c *config) *cobra.Command {
w := ipCmd{
w := &ipCmd{
config: c,
}

Expand Down Expand Up @@ -86,7 +86,7 @@ func newIPCmd(c *config) *cobra.Command {
return genericcli.NewCmds(cmdsConfig, issuesCmd)
}

func (c ipCmd) Get(id string) (*models.V1IPResponse, error) {
func (c *ipCmd) Get(id string) (*models.V1IPResponse, error) {
resp, err := c.client.IP().FindIP(ip.NewFindIPParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -95,7 +95,7 @@ func (c ipCmd) Get(id string) (*models.V1IPResponse, error) {
return resp.Payload, nil
}

func (c ipCmd) List() ([]*models.V1IPResponse, error) {
func (c *ipCmd) List() ([]*models.V1IPResponse, error) {
resp, err := c.client.IP().FindIPs(ip.NewFindIPsParams().WithBody(&models.V1IPFindRequest{
Ipaddress: viper.GetString("ipaddress"),
Name: viper.GetString("name"),
Expand All @@ -113,7 +113,7 @@ func (c ipCmd) List() ([]*models.V1IPResponse, error) {
return resp.Payload, nil
}

func (c ipCmd) Delete(id string) (*models.V1IPResponse, error) {
func (c *ipCmd) Delete(id string) (*models.V1IPResponse, error) {
resp, err := c.client.IP().FreeIP(ip.NewFreeIPParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -122,7 +122,7 @@ func (c ipCmd) Delete(id string) (*models.V1IPResponse, error) {
return resp.Payload, nil
}

func (c ipCmd) Create(rq *ipAllocateRequest) (*models.V1IPResponse, error) {
func (c *ipCmd) Create(rq *ipAllocateRequest) (*models.V1IPResponse, error) {
if rq.SpecificIP == "" {
resp, err := c.client.IP().AllocateIP(ip.NewAllocateIPParams().WithBody(rq.V1IPAllocateRequest), nil)
if err != nil {
Expand All @@ -148,7 +148,7 @@ func (c ipCmd) Create(rq *ipAllocateRequest) (*models.V1IPResponse, error) {
return resp.Payload, nil
}

func (c ipCmd) Update(rq *models.V1IPUpdateRequest) (*models.V1IPResponse, error) {
func (c *ipCmd) Update(rq *models.V1IPUpdateRequest) (*models.V1IPResponse, error) {
resp, err := c.client.IP().UpdateIP(ip.NewUpdateIPParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -157,7 +157,7 @@ func (c ipCmd) Update(rq *models.V1IPUpdateRequest) (*models.V1IPResponse, error
return resp.Payload, nil
}

func (c ipCmd) Convert(r *models.V1IPResponse) (string, *ipAllocateRequest, *models.V1IPUpdateRequest, error) {
func (c *ipCmd) Convert(r *models.V1IPResponse) (string, *ipAllocateRequest, *models.V1IPUpdateRequest, error) {
if r.Ipaddress == nil {
return "", nil, nil, fmt.Errorf("ipaddress is nil")
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (c *machineCmd) listCmdFlags(cmd *cobra.Command, lastEventErrorThresholdDef
}

func newMachineCmd(c *config) *cobra.Command {
w := machineCmd{
w := &machineCmd{
config: c,
}

Expand Down Expand Up @@ -538,7 +538,7 @@ MODE can be omitted or one of:
genericcli.Must(cmd.RegisterFlagCompletionFunc("filesystemlayout", c.comp.FilesystemLayoutListCompletion))
}

func (c machineCmd) Get(id string) (*models.V1MachineResponse, error) {
func (c *machineCmd) Get(id string) (*models.V1MachineResponse, error) {
resp, err := c.client.Machine().FindMachine(machine.NewFindMachineParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -547,7 +547,7 @@ func (c machineCmd) Get(id string) (*models.V1MachineResponse, error) {
return resp.Payload, nil
}

func (c machineCmd) List() ([]*models.V1MachineResponse, error) {
func (c *machineCmd) List() ([]*models.V1MachineResponse, error) {
resp, err := c.client.Machine().FindMachines(machine.NewFindMachinesParams().WithBody(machineFindRequestFromCLI()), nil)
if err != nil {
return nil, err
Expand Down Expand Up @@ -587,7 +587,7 @@ func machineFindRequestFromCLI() *models.V1MachineFindRequest {
}
}

func (c machineCmd) Delete(id string) (*models.V1MachineResponse, error) {
func (c *machineCmd) Delete(id string) (*models.V1MachineResponse, error) {
if viper.GetBool("remove-from-database") {
if !viper.GetBool(forceFlag) {
return nil, fmt.Errorf("remove-from-database is set but you forgot to add --%s", forceFlag)
Expand All @@ -609,7 +609,7 @@ func (c machineCmd) Delete(id string) (*models.V1MachineResponse, error) {
return resp.Payload, nil
}

func (c machineCmd) Create(rq *models.V1MachineAllocateRequest) (*models.V1MachineResponse, error) {
func (c *machineCmd) Create(rq *models.V1MachineAllocateRequest) (*models.V1MachineResponse, error) {
resp, err := c.client.Machine().AllocateMachine(machine.NewAllocateMachineParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -618,7 +618,7 @@ func (c machineCmd) Create(rq *models.V1MachineAllocateRequest) (*models.V1Machi
return resp.Payload, nil
}

func (c machineCmd) Update(rq *models.V1MachineUpdateRequest) (*models.V1MachineResponse, error) {
func (c *machineCmd) Update(rq *models.V1MachineUpdateRequest) (*models.V1MachineResponse, error) {
resp, err := c.client.Machine().UpdateMachine(machine.NewUpdateMachineParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -627,7 +627,7 @@ func (c machineCmd) Update(rq *models.V1MachineUpdateRequest) (*models.V1Machine
return resp.Payload, nil
}

func (c machineCmd) Convert(r *models.V1MachineResponse) (string, *models.V1MachineAllocateRequest, *models.V1MachineUpdateRequest, error) {
func (c *machineCmd) Convert(r *models.V1MachineResponse) (string, *models.V1MachineAllocateRequest, *models.V1MachineUpdateRequest, error) {
if r.ID == nil {
return "", nil, nil, fmt.Errorf("ipaddress is nil")
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type networkCmd struct {
}

func newNetworkCmd(c *config) *cobra.Command {
w := networkCmd{
w := &networkCmd{
config: c,
childCLI: genericcli.NewGenericCLI[*models.V1NetworkAllocateRequest, any, *models.V1NetworkResponse](networkChildCRUD{config: c}).WithFS(c.fs),
}
Expand Down Expand Up @@ -157,7 +157,7 @@ func newNetworkCmd(c *config) *cobra.Command {
)
}

func (c networkCmd) Get(id string) (*models.V1NetworkResponse, error) {
func (c *networkCmd) Get(id string) (*models.V1NetworkResponse, error) {
resp, err := c.client.Network().FindNetwork(network.NewFindNetworkParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -166,7 +166,7 @@ func (c networkCmd) Get(id string) (*models.V1NetworkResponse, error) {
return resp.Payload, nil
}

func (c networkCmd) List() ([]*models.V1NetworkResponse, error) {
func (c *networkCmd) List() ([]*models.V1NetworkResponse, error) {
resp, err := c.client.Network().FindNetworks(network.NewFindNetworksParams().WithBody(&models.V1NetworkFindRequest{
ID: viper.GetString("id"),
Name: viper.GetString("name"),
Expand All @@ -187,7 +187,7 @@ func (c networkCmd) List() ([]*models.V1NetworkResponse, error) {
return resp.Payload, nil
}

func (c networkCmd) Delete(id string) (*models.V1NetworkResponse, error) {
func (c *networkCmd) Delete(id string) (*models.V1NetworkResponse, error) {
resp, err := c.client.Network().DeleteNetwork(network.NewDeleteNetworkParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -196,7 +196,7 @@ func (c networkCmd) Delete(id string) (*models.V1NetworkResponse, error) {
return resp.Payload, nil
}

func (c networkCmd) Create(rq *models.V1NetworkCreateRequest) (*models.V1NetworkResponse, error) {
func (c *networkCmd) Create(rq *models.V1NetworkCreateRequest) (*models.V1NetworkResponse, error) {
resp, err := c.client.Network().CreateNetwork(network.NewCreateNetworkParams().WithBody(rq), nil)
if err != nil {
var r *network.CreateNetworkConflict
Expand All @@ -209,7 +209,7 @@ func (c networkCmd) Create(rq *models.V1NetworkCreateRequest) (*models.V1Network
return resp.Payload, nil
}

func (c networkCmd) Update(rq *models.V1NetworkUpdateRequest) (*models.V1NetworkResponse, error) {
func (c *networkCmd) Update(rq *models.V1NetworkUpdateRequest) (*models.V1NetworkResponse, error) {
resp, err := c.client.Network().UpdateNetwork(network.NewUpdateNetworkParams().WithBody(rq).WithForce(pointer.Pointer(viper.GetBool(forceFlag))), nil)
if err != nil {
return nil, err
Expand All @@ -218,7 +218,7 @@ func (c networkCmd) Update(rq *models.V1NetworkUpdateRequest) (*models.V1Network
return resp.Payload, nil
}

func (c networkCmd) Convert(r *models.V1NetworkResponse) (string, *models.V1NetworkCreateRequest, *models.V1NetworkUpdateRequest, error) {
func (c *networkCmd) Convert(r *models.V1NetworkResponse) (string, *models.V1NetworkCreateRequest, *models.V1NetworkUpdateRequest, error) {
if r.ID == nil {
return "", nil, nil, fmt.Errorf("id is nil")
}
Expand Down
21 changes: 12 additions & 9 deletions cmd/partition.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type partitionCmd struct {
}

func newPartitionCmd(c *config) *cobra.Command {
w := partitionCmd{
w := &partitionCmd{
config: c,
}

Expand Down Expand Up @@ -59,15 +59,17 @@ func newPartitionCmd(c *config) *cobra.Command {

partitionCapacityCmd.Flags().StringP("id", "", "", "filter on partition id. [optional]")
partitionCapacityCmd.Flags().StringP("size", "", "", "filter on size id. [optional]")
partitionCapacityCmd.Flags().StringP("project-id", "", "", "consider project-specific counts, e.g. size reservations. [optional]")
partitionCapacityCmd.Flags().StringSlice("sort-by", []string{}, fmt.Sprintf("order by (comma separated) column(s), sort direction can be changed by appending :asc or :desc behind the column identifier. possible values: %s", strings.Join(sorters.PartitionCapacitySorter().AvailableKeys(), "|")))
genericcli.Must(partitionCapacityCmd.RegisterFlagCompletionFunc("id", c.comp.PartitionListCompletion))
genericcli.Must(partitionCapacityCmd.RegisterFlagCompletionFunc("project-id", c.comp.ProjectListCompletion))
genericcli.Must(partitionCapacityCmd.RegisterFlagCompletionFunc("size", c.comp.SizeListCompletion))
genericcli.Must(partitionCapacityCmd.RegisterFlagCompletionFunc("sort-by", cobra.FixedCompletions(sorters.PartitionCapacitySorter().AvailableKeys(), cobra.ShellCompDirectiveNoFileComp)))

return genericcli.NewCmds(cmdsConfig, partitionCapacityCmd)
}

func (c partitionCmd) Get(id string) (*models.V1PartitionResponse, error) {
func (c *partitionCmd) Get(id string) (*models.V1PartitionResponse, error) {
resp, err := c.client.Partition().FindPartition(partition.NewFindPartitionParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -76,7 +78,7 @@ func (c partitionCmd) Get(id string) (*models.V1PartitionResponse, error) {
return resp.Payload, nil
}

func (c partitionCmd) List() ([]*models.V1PartitionResponse, error) {
func (c *partitionCmd) List() ([]*models.V1PartitionResponse, error) {
resp, err := c.client.Partition().ListPartitions(partition.NewListPartitionsParams(), nil)
if err != nil {
return nil, err
Expand All @@ -85,7 +87,7 @@ func (c partitionCmd) List() ([]*models.V1PartitionResponse, error) {
return resp.Payload, nil
}

func (c partitionCmd) Delete(id string) (*models.V1PartitionResponse, error) {
func (c *partitionCmd) Delete(id string) (*models.V1PartitionResponse, error) {
resp, err := c.client.Partition().DeletePartition(partition.NewDeletePartitionParams().WithID(id), nil)
if err != nil {
return nil, err
Expand All @@ -94,7 +96,7 @@ func (c partitionCmd) Delete(id string) (*models.V1PartitionResponse, error) {
return resp.Payload, nil
}

func (c partitionCmd) Create(rq *models.V1PartitionCreateRequest) (*models.V1PartitionResponse, error) {
func (c *partitionCmd) Create(rq *models.V1PartitionCreateRequest) (*models.V1PartitionResponse, error) {
resp, err := c.client.Partition().CreatePartition(partition.NewCreatePartitionParams().WithBody(rq), nil)
if err != nil {
var r *partition.CreatePartitionConflict
Expand All @@ -107,7 +109,7 @@ func (c partitionCmd) Create(rq *models.V1PartitionCreateRequest) (*models.V1Par
return resp.Payload, nil
}

func (c partitionCmd) Update(rq *models.V1PartitionUpdateRequest) (*models.V1PartitionResponse, error) {
func (c *partitionCmd) Update(rq *models.V1PartitionUpdateRequest) (*models.V1PartitionResponse, error) {
resp, err := c.client.Partition().UpdatePartition(partition.NewUpdatePartitionParams().WithBody(rq), nil)
if err != nil {
return nil, err
Expand All @@ -116,7 +118,7 @@ func (c partitionCmd) Update(rq *models.V1PartitionUpdateRequest) (*models.V1Par
return resp.Payload, nil
}

func (c partitionCmd) Convert(r *models.V1PartitionResponse) (string, *models.V1PartitionCreateRequest, *models.V1PartitionUpdateRequest, error) {
func (c *partitionCmd) Convert(r *models.V1PartitionResponse) (string, *models.V1PartitionCreateRequest, *models.V1PartitionUpdateRequest, error) {
if r.ID == nil {
return "", nil, nil, fmt.Errorf("id is nil")
}
Expand Down Expand Up @@ -161,8 +163,9 @@ func partitionResponseToUpdate(r *models.V1PartitionResponse) *models.V1Partitio

func (c *partitionCmd) partitionCapacity() error {
resp, err := c.client.Partition().PartitionCapacity(partition.NewPartitionCapacityParams().WithBody(&models.V1PartitionCapacityRequest{
ID: viper.GetString("id"),
Sizeid: viper.GetString("size"),
ID: viper.GetString("id"),
Sizeid: viper.GetString("size"),
Projectid: pointer.PointerOrNil(viper.GetString("project-id")),
}), nil)
if err != nil {
return err
Expand Down
Loading

0 comments on commit b59d48b

Please sign in to comment.