mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2025-12-23 22:36:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use passed-in context

Browse Source 
Co-authored-by: Ryan Richard <richardry@vmware.com>
This commit is contained in:
Joshua Casey
2024-05-17 14:07:23 -05:00
parent a12a5f387a
commit 555b1c80e3
2 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
internal/githubclient/githubclient_test.go
View File

@@ -1,6 +1,7 @@
package githubclient
import (
"context"
"net/http"
"strings"
"testing"
@@ -126,6 +127,7 @@ func TestGetUser(t *testing.T) {
name string
httpClient *http.Client
token string
ctx context.Context
wantErr string
wantUserInfo UserInfo
}{
@@ -191,6 +193,17 @@ func TestGetUser(t *testing.T) {
token: "does-this-token-work",
wantErr: `the "ID" attribute is missing for authenticated user`,
},
{
name: "passes the context parameter into the API call",
token: "some-token",
httpClient: mock.NewMockedHTTPClient(),
ctx: func() context.Context {
canceledCtx, cancel := context.WithCancel(context.Background())
cancel()
return canceledCtx
}(),
wantErr: "error fetching authenticated user: context canceled",
},
{
name: "returns errors from the API",
httpClient: mock.NewMockedHTTPClient(
@@ -216,7 +229,13 @@ func TestGetUser(t *testing.T) {
githubClient := &githubClient{
client: github.NewClient(test.httpClient).WithAuthToken(test.token),
}
actual, err := githubClient.GetUserInfo()
ctx := context.Background()
if test.ctx != nil {
ctx = test.ctx
}
actual, err := githubClient.GetUserInfo(ctx)
if test.wantErr != "" {
rt, ok := test.httpClient.Transport.(*mock.EnforceHostRoundTripper)
require.True(t, ok)
@@ -238,6 +257,7 @@ func TestGetOrgMembership(t *testing.T) {
name string
httpClient *http.Client
token string
ctx context.Context
wantErr string
wantOrgs []string
}{
@@ -292,6 +312,17 @@ func TestGetOrgMembership(t *testing.T) {
token: "does-this-token-work",
wantOrgs: []string{"some-org-to-which-the-authenticated-user-belongs"},
},
{
name: "passes the context parameter into the API call",
token: "some-token",
httpClient: mock.NewMockedHTTPClient(),
ctx: func() context.Context {
canceledCtx, cancel := context.WithCancel(context.Background())
cancel()
return canceledCtx
}(),
wantErr: "error fetching organizations for authenticated user: context canceled",
},
{
name: "returns errors from the API",
httpClient: mock.NewMockedHTTPClient(
@@ -317,7 +348,13 @@ func TestGetOrgMembership(t *testing.T) {
githubClient := &githubClient{
client: github.NewClient(test.httpClient).WithAuthToken(test.token),
}
actual, err := githubClient.GetOrgMembership()
ctx := context.Background()
if test.ctx != nil {
ctx = test.ctx
}
actual, err := githubClient.GetOrgMembership(ctx)
if test.wantErr != "" {
rt, ok := test.httpClient.Transport.(*mock.EnforceHostRoundTripper)
require.True(t, ok)
@@ -339,6 +376,7 @@ func TestGetTeamMembership(t *testing.T) {
name string
httpClient *http.Client
token string
ctx context.Context
allowedOrganizations []string
wantErr string
wantTeams []TeamInfo
@@ -647,6 +685,17 @@ func TestGetTeamMembership(t *testing.T) {
},
},
},
{
name: "passes the context parameter into the API call",
token: "some-token",
httpClient: mock.NewMockedHTTPClient(),
ctx: func() context.Context {
canceledCtx, cancel := context.WithCancel(context.Background())
cancel()
return canceledCtx
}(),
wantErr: "error fetching team membership for authenticated user: context canceled",
},
{
name: "returns errors from the API",
httpClient: mock.NewMockedHTTPClient(
@@ -673,7 +722,12 @@ func TestGetTeamMembership(t *testing.T) {
client: github.NewClient(test.httpClient).WithAuthToken(test.token),
}
actual, err := githubClient.GetTeamMembership(sets.New[string](test.allowedOrganizations...))
ctx := context.Background()
if test.ctx != nil {
ctx = test.ctx
}
actual, err := githubClient.GetTeamMembership(ctx, sets.New[string](test.allowedOrganizations...))
if test.wantErr != "" {
rt, ok := test.httpClient.Transport.(*mock.EnforceHostRoundTripper)
require.True(t, ok)