From c1daa42c247ed4a5518ebfe37a19167fb4b52520 Mon Sep 17 00:00:00 2001 From: Harry Bowron Date: Tue, 24 Jan 2023 07:01:47 -0500 Subject: [PATCH] client/tailscale/keys: fix client.Keys unmarshalling Signed-off-by: Author Name hbowron@gmail.com Signed-off-by: Harry Bowron Fixes #7020 --- client/tailscale/keys.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/tailscale/keys.go b/client/tailscale/keys.go index 1713182ef..571c57c78 100644 --- a/client/tailscale/keys.go +++ b/client/tailscale/keys.go @@ -55,14 +55,14 @@ func (c *Client) Keys(ctx context.Context) ([]string, error) { return nil, handleErrorResponse(b, resp) } - var keys []struct { - ID string `json:"id"` + var keys struct { + Keys []*Key `json:"keys"` } if err := json.Unmarshal(b, &keys); err != nil { return nil, err } - ret := make([]string, 0, len(keys)) - for _, k := range keys { + ret := make([]string, 0, len(keys.Keys)) + for _, k := range keys.Keys { ret = append(ret, k.ID) } return ret, nil