Updated metal-go client for sub-commands ports #290
+62
−43
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright © 2022 Equinix Metal Developers <[email protected]> | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
|
|
@@ -21,12 +21,14 @@ | |
| package ports | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| metal "github.com/equinix-labs/metal-go/metal/v1" | ||
| "github.com/manifoldco/promptui" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
|
|
@@ -53,26 +55,38 @@ | |
| // TODO: can we add ip-reservation-id? | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| cmd.SilenceUsage = true | ||
| inc := []string{} | ||
| exc := []string{} | ||
| f := cmd.Flag("bonded") | ||
| if !f.Changed { | ||
| _, _, err := c.PortService.BondPort(context.Background(), portID).BulkEnable(bulk).Execute() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to change port bonding: %w", err) | ||
| } | ||
| } | ||
|
|
||
| if f.Changed { | ||
| _, _, err := c.PortService.DisbondPort(context.Background(), portID).BulkDisable(bulk).Execute() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to change port bonding: %w", err) | ||
| } | ||
| } | ||
| addressFamily := int32(4) | ||
| public := false | ||
| addrs := []metal.IPAddress{{AddressFamily: &addressFamily, Public: &public}} | ||
|
Check failure on line 76 in internal/ports/convert.go
|
||
|
|
||
| if f := cmd.Flag("public-ipv4"); f.Changed { | ||
| addressFamily = int32(4) | ||
| public = true | ||
| addrs = append(addrs, metal.IPAddress{AddressFamily: &addressFamily, Public: &public}) | ||
|
Check failure on line 81 in internal/ports/convert.go
|
||
| } | ||
| if f := cmd.Flag("public-ipv6"); f.Changed { | ||
| addressFamily = int32(6) | ||
| public = true | ||
| addrs = append(addrs, metal.IPAddress{AddressFamily: &addressFamily, Public: &public}) | ||
|
Check failure on line 86 in internal/ports/convert.go
|
||
| } | ||
|
|
||
| convToL2 := func(portID string) (*metal.Port, *http.Response, error) { | ||
| if !force { | ||
| prompt := promptui.Prompt{ | ||
| Label: fmt.Sprintf("Are you sure you want to convert Port %s to Layer2 and remove assigned IP addresses: ", portID), | ||
|
|
@@ -84,32 +98,30 @@ | |
| return nil, nil, nil | ||
| } | ||
| } | ||
| return c.PortService.ConvertLayer2(context.Background(), portID).Execute() | ||
| } | ||
| convToL3 := func(portID string) (*metal.Port, *http.Response, error) { | ||
| log.Printf("Converting port %s to layer-3 with addresses %v", portID, addrs) | ||
| return c.PortService.ConvertLayer3(context.Background(), portID).Execute() | ||
| } | ||
| if f := cmd.Flag("layer2"); f.Changed { | ||
| _, _, err := map[bool]func(string) (*metal.Port, *http.Response, error){ | ||
| true: convToL2, | ||
| false: convToL3, | ||
| }[layer2](portID) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to change port network mode: %w", err) | ||
| } | ||
| } | ||
|
|
||
| port, _, err := c.PortService.FindPortById(context.Background(), portID).Include(inc).Exclude(exc).Execute() | ||
|
Check failure on line 117 in internal/ports/convert.go
|
||
| if err != nil { | ||
| return fmt.Errorf("Could not get Port: %w", err) | ||
| } | ||
|
|
||
| data := make([][]string, 1) | ||
|
|
||
| data[0] = []string{port.GetId(), port.GetName(), port.GetType(), port.GetNetworkType(), port.Data.GetMac(), strconv.FormatBool(port.Data.GetBonded())} | ||
| header := []string{"ID", "Name", "Type", "Network Type", "MAC", "Bonded"} | ||
|
|
||
| return c.Out.Output(port, header, &data) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be wired up to the
--includeand--excludeflags