Skip to content

Commit fdb3231

Browse files
aeneasraeneasr
committed
fix: resolve dependency issues and adopt logrusx logger
1 parent ddacd11 commit fdb3231

24 files changed

+119
-140
lines changed

‎cmd/cli/handler_migrate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) {
2727
var d driver.Driver
2828

2929
if flagx.MustGetBool(cmd, "read-from-env") {
30-
d = driver.NewDefaultDriver(logrusx.New(), false, nil, "", "", "", false)
30+
d = driver.NewDefaultDriver(logrusx.New("",""), false, nil, "", "", "", false)
3131
if len(d.Configuration().DSN()) == 0 {
3232
fmt.Println(cmd.UsageString())
3333
fmt.Println("")
@@ -42,7 +42,7 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) {
4242
return
4343
}
4444
viper.Set(configuration.ViperKeyDSN, args[0])
45-
d = driver.NewDefaultDriver(logrusx.New(), false, nil, "", "", "", false)
45+
d = driver.NewDefaultDriver(logrusx.New("",""), false, nil, "", "", "", false)
4646
}
4747

4848
p := d.Registry().Persister()

‎cmd/serve.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func init() {
7272
serveCmd.PersistentFlags().Bool("dangerous-force-http", false, "DO NOT USE THIS IN PRODUCTION - Disables HTTP/2 over TLS (HTTPS) and serves HTTP instead")
7373
serveCmd.PersistentFlags().StringSlice("dangerous-allow-insecure-redirect-urls", []string{}, "DO NOT USE THIS IN PRODUCTION - Disable HTTPS enforcement for the provided redirect URLs")
7474

75-
disableTelemetryEnv := viperx.GetBool(logrusx.New(), "sqa.opt_out", false, "DISABLE_TELEMETRY")
75+
disableTelemetryEnv := viperx.GetBool(logrusx.New("ORY Hydra", Version), "sqa.opt_out", false, "DISABLE_TELEMETRY")
7676
serveCmd.PersistentFlags().Bool("disable-telemetry", disableTelemetryEnv, "Disable anonymized telemetry reports - for more information please visit https://www.ory.sh/docs/ecosystem/sqa")
7777
serveCmd.PersistentFlags().Bool("sqa-opt-out", disableTelemetryEnv, "Disable anonymized telemetry reports - for more information please visit https://www.ory.sh/docs/ecosystem/sqa")
7878
}

‎cmd/server/handler.go

+15-16
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ import (
3333

3434
"github.com/ory/x/viperx"
3535

36-
"github.com/sirupsen/logrus"
37-
3836
analytics "github.com/ory/analytics-go/v4"
3937

40-
"github.com/ory/hydra/driver"
41-
"github.com/ory/hydra/x"
4238
"github.com/ory/x/flagx"
4339
"github.com/ory/x/logrusx"
4440
"github.com/ory/x/reqlog"
4541

42+
"github.com/ory/hydra/driver"
43+
"github.com/ory/hydra/x"
44+
4645
"github.com/julienschmidt/httprouter"
4746
"github.com/rs/cors"
4847
"github.com/spf13/cobra"
4948
"github.com/urfave/negroni"
5049
"go.opentelemetry.io/otel/plugin/httptrace"
5150

5251
"github.com/ory/graceful"
52+
"github.com/ory/x/healthx"
53+
"github.com/ory/x/metricsx"
54+
5355
"github.com/ory/hydra/client"
5456
"github.com/ory/hydra/consent"
5557
"github.com/ory/hydra/jwk"
5658
"github.com/ory/hydra/oauth2"
57-
"github.com/ory/x/healthx"
58-
"github.com/ory/x/metricsx"
5959
)
6060

6161
var _ = &consent.Handler{}
@@ -83,7 +83,7 @@ func isDSNAllowed(d driver.Driver) {
8383

8484
var schemas = packr.New("schemas", "../../.schema")
8585

86-
func watchAndValidateViper(l *logrus.Logger) {
86+
func watchAndValidateViper(l *logrusx.Logger) {
8787
schema, err := schemas.Find("config.schema.json")
8888
if err != nil {
8989
l.WithError(err).Fatal("Unable to open configuration JSON Schema.")
@@ -93,7 +93,7 @@ func watchAndValidateViper(l *logrus.Logger) {
9393

9494
func RunServeAdmin(version, build, date string) func(cmd *cobra.Command, args []string) {
9595
return func(cmd *cobra.Command, args []string) {
96-
logger := logrusx.New()
96+
logger := logrusx.New("", "")
9797
watchAndValidateViper(logger)
9898
d := driver.NewDefaultDriver(
9999
logger,
@@ -121,7 +121,7 @@ func RunServeAdmin(version, build, date string) func(cmd *cobra.Command, args []
121121

122122
func RunServePublic(version, build, date string) func(cmd *cobra.Command, args []string) {
123123
return func(cmd *cobra.Command, args []string) {
124-
logger := logrusx.New()
124+
logger := logrusx.New("", "")
125125
watchAndValidateViper(logger)
126126
d := driver.NewDefaultDriver(
127127
logger,
@@ -149,7 +149,7 @@ func RunServePublic(version, build, date string) func(cmd *cobra.Command, args [
149149

150150
func RunServeAll(version, build, date string) func(cmd *cobra.Command, args []string) {
151151
return func(cmd *cobra.Command, args []string) {
152-
logger := logrusx.New()
152+
logger := logrusx.New("", "")
153153
watchAndValidateViper(logger)
154154
d := driver.NewDefaultDriver(
155155
logger,
@@ -181,7 +181,7 @@ func RunServeAll(version, build, date string) func(cmd *cobra.Command, args []st
181181
func setTracingLogger(logger *reqlog.Middleware) {
182182
// To avoid cyclic execution
183183
before := logger.Before
184-
logger.Before = func(entry *logrus.Entry, r *http.Request, remoteAddr string) *logrus.Entry {
184+
logger.Before = func(entry *logrusx.Logger, r *http.Request, remoteAddr string) *logrusx.Logger {
185185
fields := before(entry, r, remoteAddr)
186186

187187
_, _, spanCtx := httptrace.Extract(r.Context(), r)
@@ -211,10 +211,9 @@ func setup(d driver.Driver, cmd *cobra.Command) (admin *x.RouterAdmin, public *x
211211
publicmw.Use(tracer)
212212
}
213213

214-
adminLogger := reqlog.NewMiddlewareFromLogger(
215-
d.Registry().Logger().(*logrus.Logger),
216-
fmt.Sprintf("hydra/admin: %s", d.Configuration().IssuerURL().String()),
217-
)
214+
adminLogger := reqlog.
215+
NewMiddlewareFromLogger(d.Registry().Logger(),
216+
fmt.Sprintf("hydra/admin: %s", d.Configuration().IssuerURL().String()))
218217
if d.Configuration().AdminDisableHealthAccessLog() {
219218
adminLogger = adminLogger.ExcludePaths(healthx.AliveCheckPath, healthx.ReadyCheckPath)
220219
}
@@ -224,7 +223,7 @@ func setup(d driver.Driver, cmd *cobra.Command) (admin *x.RouterAdmin, public *x
224223
adminmw.Use(d.Registry().PrometheusManager())
225224

226225
publicLogger := reqlog.NewMiddlewareFromLogger(
227-
d.Registry().Logger().(*logrus.Logger),
226+
d.Registry().Logger(),
228227
fmt.Sprintf("hydra/public: %s", d.Configuration().IssuerURL().String()),
229228
)
230229
if d.Configuration().PublicDisableHealthAccessLog() {

‎consent/strategy_default_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ func TestStrategyLoginConsent(t *testing.T) {
16921692
rr := res.Payload
16931693
assert.False(t, rr.Skip)
16941694
assert.EqualValues(t, "", rr.Subject)
1695-
assert.EqualValues(t, "foouser", rr.OidcContext.IDTokenHintClaims["sub"])
1695+
assert.EqualValues(t, "foouser", rr.OidcContext.IDTokenHintClaims.(map[string]interface{})["sub"])
16961696

16971697
vr, err := apiClient.Admin.AcceptLoginRequest(admin.NewAcceptLoginRequestParams().
16981698
WithLoginChallenge(r.URL.Query().Get("login_challenge")).

‎driver/configuration/provider.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import (
55
"net/url"
66
"time"
77

8-
"github.com/rs/cors"
9-
"github.com/sirupsen/logrus"
10-
8+
"github.com/ory/x/logrusx"
119
"github.com/ory/x/tracing"
10+
"github.com/rs/cors"
1211
)
1312

1413
type Provider interface {
@@ -66,7 +65,7 @@ type Provider interface {
6665
EnforcePKCEForPublicClients() bool
6766
}
6867

69-
func MustValidate(l logrus.FieldLogger, p Provider) {
68+
func MustValidate(l *logrusx.Logger, p Provider) {
7069
if p.ServesHTTPS() {
7170
if p.IssuerURL().String() == "" {
7271
l.Fatalf(`Configuration key "%s" must be set unless flag "--dangerous-force-http" is set. To find out more, use "hydra help serve".`, ViperKeyIssuerURL)

‎driver/configuration/provider_viper.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ import (
77
"strings"
88
"time"
99

10+
"github.com/ory/x/logrusx"
1011
"github.com/rs/cors"
1112

1213
"github.com/ory/viper"
1314

1415
"github.com/ory/x/corsx"
1516
"github.com/ory/x/stringsx"
1617

17-
"github.com/sirupsen/logrus"
18-
19-
"github.com/ory/hydra/x"
2018
"github.com/ory/x/cmdx"
2119
"github.com/ory/x/stringslice"
2220
"github.com/ory/x/tracing"
2321
"github.com/ory/x/urlx"
2422
"github.com/ory/x/viperx"
23+
24+
"github.com/ory/hydra/x"
2525
)
2626

2727
type ViperProvider struct {
28-
l logrus.FieldLogger
28+
l *logrusx.Logger
2929
ss [][]byte
3030
generatedSecret []byte
3131
forcedHTTP bool
@@ -80,7 +80,7 @@ func init() {
8080
viper.AutomaticEnv()
8181
}
8282

83-
func NewViperProvider(l logrus.FieldLogger, forcedHTTP bool, insecureRedirects []string) Provider {
83+
func NewViperProvider(l *logrusx.Logger, forcedHTTP bool, insecureRedirects []string) Provider {
8484
if insecureRedirects == nil {
8585
insecureRedirects = []string{}
8686
}

‎driver/configuration/provider_viper_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"github.com/ory/x/viperx"
1515

1616
"github.com/rs/cors"
17-
"github.com/sirupsen/logrus"
1817
"github.com/stretchr/testify/assert"
1918
"github.com/stretchr/testify/require"
2019

21-
"github.com/ory/hydra/x"
2220
"github.com/ory/viper"
2321
"github.com/ory/x/logrusx"
22+
23+
"github.com/ory/hydra/x"
2424
)
2525

2626
func setupEnv(env map[string]string) func(t *testing.T) (func(), func()) {
@@ -65,7 +65,7 @@ func TestSubjectTypesSupported(t *testing.T) {
6565
t.Run(fmt.Sprintf("case=%d/description=%s", k, tc.d), func(t *testing.T) {
6666
setup, clean := tc.env(t)
6767
setup()
68-
p := NewViperProvider(logrus.New(), false, nil)
68+
p := NewViperProvider(logrusx.New("", ""), false, nil)
6969
viper.Set(ViperKeySubjectIdentifierAlgorithmSalt, "00000000")
7070
assert.EqualValues(t, tc.e, p.SubjectTypesSupported())
7171
clean()
@@ -74,12 +74,12 @@ func TestSubjectTypesSupported(t *testing.T) {
7474
}
7575

7676
func TestWellKnownKeysUnique(t *testing.T) {
77-
p := NewViperProvider(logrus.New(), false, nil)
77+
p := NewViperProvider(logrusx.New("", ""), false, nil)
7878
assert.EqualValues(t, []string{x.OAuth2JWTKeyName, x.OpenIDConnectKeyName}, p.WellKnownKeys(x.OAuth2JWTKeyName, x.OpenIDConnectKeyName, x.OpenIDConnectKeyName))
7979
}
8080

8181
func TestCORSOptions(t *testing.T) {
82-
p := NewViperProvider(logrus.New(), false, nil)
82+
p := NewViperProvider(logrusx.New("", ""), false, nil)
8383
viper.Set("serve.public.cors.enabled", true)
8484

8585
assert.EqualValues(t, cors.Options{
@@ -95,8 +95,8 @@ func TestCORSOptions(t *testing.T) {
9595
}
9696

9797
func TestViperProvider_AdminDisableHealthAccessLog(t *testing.T) {
98-
l := logrusx.New()
99-
l.SetOutput(ioutil.Discard)
98+
l := logrusx.New("", "")
99+
l.Logrus().SetOutput(ioutil.Discard)
100100

101101
p := NewViperProvider(l, false, nil)
102102

@@ -110,8 +110,8 @@ func TestViperProvider_AdminDisableHealthAccessLog(t *testing.T) {
110110
}
111111

112112
func TestViperProvider_PublicDisableHealthAccessLog(t *testing.T) {
113-
l := logrusx.New()
114-
l.SetOutput(ioutil.Discard)
113+
l := logrusx.New("", "")
114+
l.Logrus().SetOutput(ioutil.Discard)
115115

116116
p := NewViperProvider(l, false, nil)
117117

@@ -125,8 +125,8 @@ func TestViperProvider_PublicDisableHealthAccessLog(t *testing.T) {
125125
}
126126

127127
func TestViperProvider_IssuerURL(t *testing.T) {
128-
l := logrusx.New()
129-
l.SetOutput(ioutil.Discard)
128+
l := logrusx.New("", "")
129+
l.Logrus().SetOutput(ioutil.Discard)
130130
viper.Set(ViperKeyIssuerURL, "http://hydra.localhost")
131131
p := NewViperProvider(l, false, nil)
132132
assert.Equal(t, "http://hydra.localhost/", p.IssuerURL().String())
@@ -137,8 +137,8 @@ func TestViperProvider_IssuerURL(t *testing.T) {
137137
}
138138

139139
func TestViperProvider_CookieSameSiteMode(t *testing.T) {
140-
l := logrusx.New()
141-
l.SetOutput(ioutil.Discard)
140+
l := logrusx.New("", "")
141+
l.Logrus().SetOutput(ioutil.Discard)
142142

143143
p := NewViperProvider(l, false, nil)
144144
assert.Equal(t, http.SameSiteDefaultMode, p.CookieSameSiteMode())
@@ -148,7 +148,7 @@ func TestViperProvider_CookieSameSiteMode(t *testing.T) {
148148
}
149149

150150
func TestViperProviderValidates(t *testing.T) {
151-
l := logrusx.New()
151+
l := logrusx.New("", "")
152152
viper.Reset()
153153
viperx.InitializeConfig(
154154
"hydra",

‎driver/driver_default.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package driver
22

33
import (
4-
"github.com/sirupsen/logrus"
4+
"github.com/ory/x/logrusx"
55

66
"github.com/ory/hydra/driver/configuration"
77
)
@@ -11,7 +11,7 @@ type DefaultDriver struct {
1111
r Registry
1212
}
1313

14-
func NewDefaultDriver(l logrus.FieldLogger, forcedHTTP bool, insecureRedirects []string, version, build, date string, validate bool) Driver {
14+
func NewDefaultDriver(l *logrusx.Logger, forcedHTTP bool, insecureRedirects []string, version, build, date string, validate bool) Driver {
1515
c := configuration.NewViperProvider(l, forcedHTTP, insecureRedirects)
1616
if validate {
1717
configuration.MustValidate(l, c)

‎driver/registry.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
package driver
22

33
import (
4+
"github.com/ory/x/logrusx"
45
"github.com/pkg/errors"
5-
"github.com/sirupsen/logrus"
66

77
"github.com/ory/hydra/persistence"
88

9-
"github.com/ory/hydra/metrics/prometheus"
109
"github.com/ory/x/cmdx"
1110
"github.com/ory/x/tracing"
1211

12+
"github.com/ory/hydra/metrics/prometheus"
13+
14+
"github.com/ory/x/dbal"
15+
"github.com/ory/x/healthx"
16+
1317
"github.com/ory/hydra/client"
1418
"github.com/ory/hydra/consent"
1519
"github.com/ory/hydra/driver/configuration"
1620
"github.com/ory/hydra/jwk"
1721
"github.com/ory/hydra/oauth2"
1822
"github.com/ory/hydra/x"
19-
"github.com/ory/x/dbal"
20-
"github.com/ory/x/healthx"
2123
)
2224

2325
type Registry interface {
@@ -26,7 +28,7 @@ type Registry interface {
2628
Init() error
2729

2830
WithConfig(c configuration.Provider) Registry
29-
WithLogger(l logrus.FieldLogger) Registry
31+
WithLogger(l *logrusx.Logger) Registry
3032

3133
WithBuildInfo(version, hash, date string) Registry
3234
BuildVersion() string

0 commit comments

Comments
 (0)