v2: add support for listing all keys

Also adds UserID to Key type.

Updates tailscale/corp#22783

Signed-off-by: Percy Wegmann <[email protected]>

Author: oxtoacart

v2/README.md

@@ -52,7 +52,7 @@ func main() {
 	oauthScopes := []string{"all:write"}
 	tailnet := os.Getenv("TAILSCALE_TAILNET")
 
-	&tsclient.Client{
+	client := &tsclient.Client{
 		Tailnet: os.Getenv("TAILSCALE_TAILNET"),
 		HTTP:    tsclient.OAuthConfig{
 			ClientID:     os.Getenv("TAILSCALE_OAUTH_CLIENT_ID"),

v2/keys.go

@@ -44,6 +44,7 @@ type (
 		Revoked      time.Time       `json:"revoked"`
 		Invalid      bool            `json:"invalid"`
 		Capabilities KeyCapabilities `json:"capabilities"`
+		UserID       string          `json:"userId"`
 	}
 )
 
@@ -70,8 +71,14 @@ func (kr *KeysResource) Get(ctx context.Context, id string) (*Key, error) {
 
 // List returns every [Key] within the tailnet. The only fields set for each [Key] will be its identifier.
 // The keys returned are relative to the user that owns the API key used to authenticate the client.
-func (kr *KeysResource) List(ctx context.Context) ([]Key, error) {
-	req, err := kr.buildRequest(ctx, http.MethodGet, kr.buildTailnetURL("keys"))
+//
+// Specify all to list both user and tailnet level keys.
+func (kr *KeysResource) List(ctx context.Context, all bool) ([]Key, error) {
+	url := kr.buildTailnetURL("keys")
+	if all {
+		url.RawQuery = "all=true"
+	}
+	req, err := kr.buildRequest(ctx, http.MethodGet, url)
 	if err != nil {
 		return nil, err
 	}

v2/keys_test.go

@@ -174,7 +174,7 @@ func TestClient_Keys(t *testing.T) {
 		"keys": expected,
 	}
 
-	actual, err := client.Keys().List(context.Background())
+	actual, err := client.Keys().List(context.Background(), false)
 	assert.NoError(t, err)
 	assert.EqualValues(t, expected, actual)
 	assert.Equal(t, http.MethodGet, server.Method)