mirror of
https://github.com/psviderski/uncloud.git
synced 2026-08-26 11:03:34 +00:00
strip one proto layer in ListMachines method
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/spf13/cobra"
|
||||
"google.golang.org/protobuf/types/known/emptypb"
|
||||
"net/netip"
|
||||
"os"
|
||||
"strings"
|
||||
@@ -39,7 +38,7 @@ func runList(ctx context.Context, uncli *cli.CLI, clusterName string) error {
|
||||
}
|
||||
defer c.Close()
|
||||
|
||||
listResp, err := c.ListMachines(ctx, &emptypb.Empty{})
|
||||
machines, err := c.ListMachines(ctx)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list machines: %w", err)
|
||||
}
|
||||
@@ -51,7 +50,7 @@ func runList(ctx context.Context, uncli *cli.CLI, clusterName string) error {
|
||||
return fmt.Errorf("write header: %w", err)
|
||||
}
|
||||
// Print rows.
|
||||
for _, member := range listResp.Machines {
|
||||
for _, member := range machines {
|
||||
m := member.Machine
|
||||
subnet, _ := m.Network.Subnet.ToPrefix()
|
||||
subnet = netip.PrefixFrom(network.MachineIP(subnet), subnet.Bits())
|
||||
|
||||
@@ -5,7 +5,6 @@ import (
|
||||
"fmt"
|
||||
"github.com/docker/docker/pkg/stringid"
|
||||
"github.com/docker/go-units"
|
||||
"google.golang.org/protobuf/types/known/emptypb"
|
||||
"os"
|
||||
"text/tabwriter"
|
||||
"time"
|
||||
@@ -50,12 +49,12 @@ func inspect(ctx context.Context, uncli *client.CLI, opts *inspectOptions) error
|
||||
return fmt.Errorf("inspect service: %w", err)
|
||||
}
|
||||
|
||||
resp, err := cli.ListMachines(ctx, &emptypb.Empty{})
|
||||
machines, err := cli.ListMachines(ctx)
|
||||
if err != nil {
|
||||
return fmt.Errorf("list machines: %w", err)
|
||||
}
|
||||
machinesNamesByID := make(map[string]string)
|
||||
for _, m := range resp.Machines {
|
||||
for _, m := range machines {
|
||||
machinesNamesByID[m.Machine.Id] = m.Machine.Name
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user