diff options
| author | mo khan <mo@mokhan.ca> | 2025-05-15 09:11:16 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2025-05-15 09:11:16 -0600 |
| commit | 3d01a69471fc4f0ae9f2f4145620b6aea50f2216 (patch) | |
| tree | f85607ebfb2575bce94b5618250ebd957f965f6e /app/controllers | |
| parent | 7c75fac3360b8bc3df630b5f8e12b2ff927a2d23 (diff) | |
| parent | 564e140de454c78d7e6d34044bb78f53bd0b2bf3 (diff) | |
Merge branch 'envoy-start' into 'main'
Enable Envoy to run consistently locally and in Docker
See merge request gitlab-org/software-supply-chain-security/authorization/sparkled!6
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/sessions/controller_test.go | 6 | ||||
| -rw-r--r-- | app/controllers/sessions/service_test.go | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/app/controllers/sessions/controller_test.go b/app/controllers/sessions/controller_test.go index b3e1d56..3e7f662 100644 --- a/app/controllers/sessions/controller_test.go +++ b/app/controllers/sessions/controller_test.go @@ -24,14 +24,12 @@ func TestSessions(t *testing.T) { clientID := srv.MockOIDC.Config().ClientID clientSecret := srv.MockOIDC.Config().ClientSecret - cfg, err := oidc.New( - t.Context(), - srv.Issuer(), + cfg := oidc.New( + srv.Provider, clientID, clientSecret, "callback_url", ) - require.NoError(t, err) controller := New(cfg, http.DefaultClient) mux := http.NewServeMux() controller.MountTo(mux) diff --git a/app/controllers/sessions/service_test.go b/app/controllers/sessions/service_test.go index 4bea1dd..05baa2f 100644 --- a/app/controllers/sessions/service_test.go +++ b/app/controllers/sessions/service_test.go @@ -20,14 +20,12 @@ func TestService(t *testing.T) { clientID := srv.MockOIDC.Config().ClientID clientSecret := srv.MockOIDC.Config().ClientSecret - cfg, err := oidc.New( - t.Context(), - srv.Issuer(), + cfg := oidc.New( + srv.Provider, clientID, clientSecret, "/session/callback", ) - require.NoError(t, err) svc := NewService(cfg, http.DefaultClient) t.Run("Exchange", func(t *testing.T) { |