philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-27 11:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ListMachines to include machine state from Corrosion membership

Browse Source
This commit is contained in:
Pavel Sviderski
2024-11-13 16:48:55 +10:00
parent bd0e7f44b2
commit 913fb2da0c
6 changed files with 308 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cli/cli.go
+14 -5
View File
@@ -231,8 +231,8 @@ func (cli *CLI) AddMachine(ctx context.Context, remoteMachine RemoteMachine, clu
}
otherMachines := make([]*pb.MachineInfo, 0, len(listResp.Machines)-1)
for _, m := range listResp.Machines {
if m.Id != addResp.Machine.Id {
otherMachines = append(otherMachines, m)
if m.Machine.Id != addResp.Machine.Id {
otherMachines = append(otherMachines, m.Machine)
}
}
@@ -341,11 +341,12 @@ func (cli *CLI) ListMachines(ctx context.Context, clusterName string) error {
// Print the list of machines in a table format.
tw := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
// Print header.
if _, err = fmt.Fprintln(tw, "NAME\tADDRESS\tPUBLIC KEY\tENDPOINTS"); err != nil {
if _, err = fmt.Fprintln(tw, "NAME\tSTATE\tADDRESS\tPUBLIC KEY\tENDPOINTS"); err != nil {
return fmt.Errorf("write header: %w", err)
}
// Print rows.
for _, m := range listResp.Machines {
for _, member := range listResp.Machines {
m := member.Machine
subnet, _ := m.Network.Subnet.ToPrefix()
subnet = netip.PrefixFrom(network.MachineIP(subnet), subnet.Bits())
endpoints := make([]string, len(m.Network.Endpoints))
@@ -355,10 +356,18 @@ func (cli *CLI) ListMachines(ctx context.Context, clusterName string) error {
}
publicKey := secret.Secret(m.Network.PublicKey)
if _, err = fmt.Fprintf(
tw, "%s\t%s\t%s\t%s\n", m.Name, subnet, publicKey, strings.Join(endpoints, ", "),
tw, "%s\t%s\t%s\t%s\t%s\n", m.Name, capitalise(member.State.String()), subnet, publicKey, strings.Join(endpoints, ", "),
); err != nil {
return fmt.Errorf("write row: %w", err)
}
}
return tw.Flush()
}
// capitalise returns a string where the first character is upper case, and the rest is lower case.
func capitalise(s string) string {
if s == "" {
return ""
}
return strings.ToUpper(s[:1]) + strings.ToLower(s[1:])
}
internal/cli/service.go
+5 -5
View File
@@ -25,17 +25,17 @@ func (cli *CLI) RunService(ctx context.Context, clusterName string, opts *Servic
_ = c.Close()
}()
machResp, err := c.ListMachines(ctx, &emptypb.Empty{})
listResp, err := c.ListMachines(ctx, &emptypb.Empty{})
if err != nil {
return fmt.Errorf("list machines: %w", err)
}
// TODO: update ListMachine endpoint to return machine status based on the Corrosion member list.
machineIP, _ := machResp.Machines[0].Network.ManagementIp.ToAddr()
machineIP, _ := listResp.Machines[0].Machine.Network.ManagementIp.ToAddr()
if opts.Machine != "" {
for _, m := range machResp.Machines {
if m.Name == opts.Machine || m.Id == opts.Machine {
machineIP, _ = m.Network.ManagementIp.ToAddr()
for _, m := range listResp.Machines {
if m.Machine.Name == opts.Machine || m.Machine.Id == opts.Machine {
machineIP, _ = m.Machine.Network.ManagementIp.ToAddr()
break
}
}