chore: minor formatting for 'wg show' command, enrich Unimplemented error with >=0.16 requirement

cmd/uncloud/wg/wg.go

@@ -2,7 +2,6 @@ package wg
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"os"
 	"strings"
@@ -11,8 +10,10 @@ import (
 
 	"github.com/docker/go-units"
 	"github.com/psviderski/uncloud/internal/cli"
-	"github.com/psviderski/uncloud/internal/machine/api/pb"
 	"github.com/spf13/cobra"
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func NewRootCommand() *cobra.Command {
@@ -32,15 +33,17 @@ func newShowCommand() *cobra.Command {
 	opts := showOptions{}
 	cmd := &cobra.Command{
 		Use:   "show",
-		Short: "Show WireGuard configuration for the current machine",
-		Long:  "Shows the WireGuard configuration for the machine currently connected to (or specified by the global --connect flag).",
-		Args:  cobra.NoArgs,
+		Short: "Show WireGuard network configuration for a machine.",
+		Long: "Show the WireGuard network configuration for the machine currently connected to " +
+			"(or specified by the global --connect flag).",
+		Args: cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			uncli := cmd.Context().Value("cli").(*cli.CLI)
 			return runShow(cmd.Context(), uncli, opts)
 		},
 	}
-	cmd.Flags().StringVarP(&opts.machine, "machine", "m", "", "Name or ID of the machine to show configuration for")
+	cmd.Flags().StringVarP(&opts.machine, "machine", "m", "",
+		"Name or ID of the machine to show the configuration for. (default is connected machine)")
 	return cmd
 }
 
@@ -59,10 +62,12 @@ func runShow(ctx context.Context, uncli *cli.CLI, opts showOptions) error {
 		}
 	}
 
-	// Explicitly using the interface method to avoid ambiguity if any
-	var _ pb.MachineClient = client.MachineClient
-	resp, err := client.MachineClient.GetWireGuardDevice(ctx, nil)
+	resp, err := client.MachineClient.InspectWireGuardNetwork(ctx, nil)
 	if err != nil {
+		if status.Code(err) == codes.Unimplemented {
+			return fmt.Errorf("inspect WireGuard network: "+
+				"make sure the target machine is running uncloudd daemon version >= 0.16.0: %w", err)
+		}
 		return err
 	}
 
@@ -72,28 +77,33 @@ func runShow(ctx context.Context, uncli *cli.CLI, opts showOptions) error {
 	}
 	machinesNamesByPublicKey := make(map[string]string)
 	for _, m := range machines {
-		publicKey := base64.StdEncoding.EncodeToString(m.Machine.Network.PublicKey)
+		publicKey := wgtypes.Key(m.Machine.Network.PublicKey).String()
 		machinesNamesByPublicKey[publicKey] = m.Machine.Name
 	}
 
 	// Fetch the machine's name for more descriptive output
-	inspectResp, err := client.Inspect(ctx, nil)
+	inspectResp, err := client.MachineClient.InspectMachine(ctx, nil)
 	if err == nil {
-		fmt.Printf("Machine Name:         %s\n", inspectResp.Name)
+		fmt.Printf("Machine name:         %s\n", inspectResp.Machines[0].Machine.Name)
 	}
 
-	fmt.Printf("WireGuard interface:  %s\n", resp.Name)
-	fmt.Printf("WireGuard public key: %s\n", resp.PublicKey)
+	fmt.Printf("WireGuard interface:  %s\n", resp.InterfaceName)
+	fmt.Printf("WireGuard public key: %s\n", wgtypes.Key(resp.PublicKey).String())
 	fmt.Printf("WireGuard port:       %d\n", resp.ListenPort)
 	fmt.Println()
 
+	if len(resp.Peers) == 0 {
+		fmt.Println("No WireGuard peers configured.")
+		return nil
+	}
+
 	tw := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-	if _, err = fmt.Fprintln(tw, "MACHINE\tPUBLIC KEY\tENDPOINT\tHANDSHAKE\tRECEIVED\tSENT\tALLOWED IPS"); err != nil {
+	if _, err = fmt.Fprintln(tw, "PEER\tPUBLIC KEY\tENDPOINT\tHANDSHAKE\tRECEIVED\tSENT\tALLOWED IPS"); err != nil {
 		return fmt.Errorf("write header: %w", err)
 	}
 
 	for _, peer := range resp.Peers {
-		machineName, ok := machinesNamesByPublicKey[peer.PublicKey]
+		machineName, ok := machinesNamesByPublicKey[wgtypes.Key(peer.PublicKey).String()]
 		if !ok {
 			machineName = "(unknown)"
 		}
@@ -107,7 +117,7 @@ func runShow(ctx context.Context, uncli *cli.CLI, opts showOptions) error {
 			tw,
 			"%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
 			machineName,
-			peer.PublicKey,
+			wgtypes.Key(peer.PublicKey).String(),
 			peer.Endpoint,
 			lastHandshake,
 			units.HumanSize(float64(peer.ReceiveBytes)),