Skip to content

chore: instrument external oauth2 requests #11519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jan 10, 2024
Merged

chore: instrument external oauth2 requests #11519

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b7f13fa
chore: instrument external oauth2 requests
Emyrk Jan 9, 2024
fd1e012
Add a unit test
Emyrk Jan 9, 2024
a6de1e3
remove internet based request
Emyrk Jan 9, 2024
005883a
use ctx
Emyrk Jan 9, 2024
2f77f99
typo
Emyrk Jan 9, 2024
3377a9b
Work on instrumenting related oauth2 calls
Emyrk Jan 9, 2024
07fd10d
remove print
Emyrk Jan 9, 2024
117a405
typos
Emyrk Jan 9, 2024
73abae6
Fixup some unit tests
Emyrk Jan 9, 2024
e5e190d
fixup test cases
Emyrk Jan 9, 2024
d4b36d3
remove oidc instrument
Emyrk Jan 9, 2024
8964297
typos
Emyrk Jan 9, 2024
2ba7a5c
more test coverage
Emyrk Jan 9, 2024
8963aaa
left debug
Emyrk Jan 9, 2024
bfa427f
Add comments
Emyrk Jan 9, 2024
9d1c76c
use consts for source labels
Emyrk Jan 10, 2024
c149f8f
Spell out config
Emyrk Jan 10, 2024
30c459f
fix compile
Emyrk Jan 10, 2024
cd98806
Use req with context
Emyrk Jan 10, 2024
85e2d91
no panic
Emyrk Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
no panic
  • Loading branch information
@Emyrk
Emyrk committed Jan 10, 2024
commit 85e2d91ace97cc1177db1c67c7aba6697899824f
14 changes: 8 additions & 6 deletions coderd/promoauth/oauth2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package promoauth_test

import (
"net/http"
"net/url"
"testing"
"time"

Expand Down Expand Up @@ -30,7 +31,7 @@ func TestInstrument(t *testing.T) {
cfg := externalauth.Config{
InstrumentedOAuth2Config: factory.New(id, idp.OIDCConfig(t, []string{})),
ID: "test",
ValidateURL: must(idp.IssuerURL().Parse("/oauth2/userinfo")).String(),
ValidateURL: must[*url.URL](t)(idp.IssuerURL().Parse("/oauth2/userinfo")).String(),
}

// 0 Requests before we start
Expand Down Expand Up @@ -60,7 +61,7 @@ func TestInstrument(t *testing.T) {
// extend the http.DefaultTransport. If a `.Clone()` is not done, this can be
// mis-used. It is cheap to run this quick check.
req, err := http.NewRequestWithContext(ctx, http.MethodGet,
must(idp.IssuerURL().Parse("/.well-known/openid-configuration")).String(), nil)
must[*url.URL](t)(idp.IssuerURL().Parse("/.well-known/openid-configuration")).String(), nil)
require.NoError(t, err)

resp, err := http.DefaultClient.Do(req)
Expand All @@ -70,9 +71,10 @@ func TestInstrument(t *testing.T) {
require.Equal(t, count(), 3)
}

func must[V any](v V, err error) V {
if err != nil {
panic(err)
func must[V any](t *testing.T) func(v V, err error) V {
return func(v V, err error) V {
t.Helper()
require.NoError(t, err)
return v
}
return v
}