remove oidc instrument

Emyrk · Emyrk · commit 77230f1fcc41 · 2024-01-09T14:08:37.000-06:00
diff --git a/cli/server.go b/cli/server.go
@@ -103,7 +103,7 @@ import (
 	"github.com/coder/wgtunnel/tunnelsdk"
 )
 
-func createOIDCConfig(ctx context.Context, instrument *promoauth.Factory, vals *codersdk.DeploymentValues) (*coderd.OIDCConfig, error) {
+func createOIDCConfig(ctx context.Context, vals *codersdk.DeploymentValues) (*coderd.OIDCConfig, error) {
 	if vals.OIDC.ClientID == "" {
 		return nil, xerrors.Errorf("OIDC client ID must be set!")
 	}
@@ -160,7 +160,7 @@ func createOIDCConfig(ctx context.Context, instrument *promoauth.Factory, vals *
 	}
 
 	return &coderd.OIDCConfig{
-		OAuth2Config: instrument.New("oidc-login", useCfg),
+		OAuth2Config: useCfg,
 		Provider:     oidcProvider,
 		Verifier: oidcProvider.Verifier(&oidc.Config{
 			ClientID: vals.OIDC.ClientID.String(),
@@ -642,7 +642,13 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 					logger.Warn(ctx, "coder will not check email_verified for OIDC logins")
 				}
 
-				oc, err := createOIDCConfig(ctx, oauthInstrument, vals)
+				// This OIDC config is **not** being instrumented with the
+				// oauth2 instrument wrapper. If we implement the missing
+				// oidc methods, then we can instrument it.
+				// Missing:
+				//	- Userinfo
+				//	- Verify
+				oc, err := createOIDCConfig(ctx, vals)
 				if err != nil {
 					return xerrors.Errorf("create oidc config: %w", err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ import (`
`103`	`103`	`"github.com/coder/wgtunnel/tunnelsdk"`
`104`	`104`	`)`
`105`	`105`
`106`		`-func createOIDCConfig(ctx context.Context, instrument promoauth.Factory, vals codersdk.DeploymentValues) (*coderd.OIDCConfig, error) {`
	`106`	`+func createOIDCConfig(ctx context.Context, vals codersdk.DeploymentValues) (coderd.OIDCConfig, error) {`
`107`	`107`	`if vals.OIDC.ClientID == "" {`
`108`	`108`	`return nil, xerrors.Errorf("OIDC client ID must be set!")`
`109`	`109`	`}`
`@@ -160,7 +160,7 @@ func createOIDCConfig(ctx context.Context, instrument promoauth.Factory, vals `
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`return &coderd.OIDCConfig{`
`163`		`- OAuth2Config: instrument.New("oidc-login", useCfg),`
	`163`	`+ OAuth2Config: useCfg,`
`164`	`164`	`Provider: oidcProvider,`
`165`	`165`	`Verifier: oidcProvider.Verifier(&oidc.Config{`
`166`	`166`	`ClientID: vals.OIDC.ClientID.String(),`
`@@ -642,7 +642,13 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`642`	`642`	`logger.Warn(ctx, "coder will not check email_verified for OIDC logins")`
`643`	`643`	`}`
`644`	`644`
`645`		`- oc, err := createOIDCConfig(ctx, oauthInstrument, vals)`
	`645`	`+ // This OIDC config is not being instrumented with the`
	`646`	`+ // oauth2 instrument wrapper. If we implement the missing`
	`647`	`+ // oidc methods, then we can instrument it.`
	`648`	`+ // Missing:`
	`649`	`+ // - Userinfo`
	`650`	`+ // - Verify`
	`651`	`+ oc, err := createOIDCConfig(ctx, vals)`
`646`	`652`	`if err != nil {`
`647`	`653`	`return xerrors.Errorf("create oidc config: %w", err)`
`648`	`654`	`}`