refactor: rename config structs and interfaces

ory · Jan 13, 2021 · 4a2f419 · 4a2f419
1 parent cd0e0eb
commit 4a2f419
Show file tree

Hide file tree

Showing 86 changed files with 385 additions and 385 deletions.
diff --git a/cmd/cliclient/migrate.go b/cmd/cliclient/migrate.go
@@ -31,7 +31,7 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) {
 			cmd.Context(),
 			configx.WithFlags(cmd.Flags()),
 			configx.SkipValidation())
-		if len(d.Configuration(cmd.Context()).DSN()) == 0 {
+		if len(d.Config(cmd.Context()).DSN()) == 0 {
 			fmt.Println(cmd.UsageString())
 			fmt.Println("")
 			fmt.Println("When using flag -e, environment variable DSN must be set")

diff --git a/cmd/daemon/serve.go b/cmd/daemon/serve.go
@@ -67,7 +67,7 @@ func ServePublic(r driver.Registry, wg *sync.WaitGroup, cmd *cobra.Command, args
 	defer wg.Done()
 	modifiers := newOptions(opts)
 
-	c := r.Configuration(cmd.Context())
+	c := r.Config(cmd.Context())
 	l := r.Logger()
 	n := negroni.New()
 	for _, mw := range modifiers.mwf {
@@ -97,7 +97,7 @@ func ServePublic(r driver.Registry, wg *sync.WaitGroup, cmd *cobra.Command, args
 	}
 
 	var handler http.Handler = n
-	options, enabled := r.Configuration(cmd.Context()).CORS("public")
+	options, enabled := r.Config(cmd.Context()).CORS("public")
 	if enabled {
 		handler = cors.New(options).Handler(handler)
 	}
@@ -118,7 +118,7 @@ func ServeAdmin(r driver.Registry, wg *sync.WaitGroup, cmd *cobra.Command, args
 	defer wg.Done()
 	modifiers := newOptions(opts)
 
-	c := r.Configuration(cmd.Context())
+	c := r.Config(cmd.Context())
 	l := r.Logger()
 	n := negroni.New()
 	for _, mw := range modifiers.mwf {
@@ -154,17 +154,17 @@ func sqa(cmd *cobra.Command, d driver.Registry) *metricsx.Service {
 	return metricsx.New(
 		cmd,
 		d.Logger(),
-		d.Configuration(cmd.Context()).Source(),
+		d.Config(cmd.Context()).Source(),
 		&metricsx.Options{
 			Service: "ory-kratos",
 			ClusterID: metricsx.Hash(
 				strings.Join([]string{
-					d.Configuration(cmd.Context()).DSN(),
-					d.Configuration(cmd.Context()).SelfPublicURL().String(),
-					d.Configuration(cmd.Context()).SelfAdminURL().String(),
+					d.Config(cmd.Context()).DSN(),
+					d.Config(cmd.Context()).SelfPublicURL().String(),
+					d.Config(cmd.Context()).SelfAdminURL().String(),
 				}, "|"),
 			),
-			IsDevelopment: d.Configuration(cmd.Context()).IsInsecureDevMode(),
+			IsDevelopment: d.Config(cmd.Context()).IsInsecureDevMode(),
 			WriteKey:      "qQlI6q8Q4WvkzTjKQSor4sHYOikHIvvi",
 			WhitelistedPaths: []string{
 				"/",

diff --git a/cmd/hashers/argon2/calibrate.go b/cmd/hashers/argon2/calibrate.go
@@ -17,15 +17,15 @@ import (
 
 type (
 	argon2Config struct {
-		c config.HasherArgon2Config
+		c config.Argon2
 	}
 )
 
-func (c *argon2Config) Configuration(_ context.Context) *config.Provider {
+func (c *argon2Config) Config(_ context.Context) *config.Config {
 	panic("not supposed to be called")
 }
 
-func (c *argon2Config) HasherArgon2() *config.HasherArgon2Config {
+func (c *argon2Config) HasherArgon2() *config.Argon2 {
 	return &c.c
 }
 
@@ -56,7 +56,7 @@ func newCalibrateCmd() *cobra.Command {
 	)
 
 	aconfig := &argon2Config{
-		c: config.HasherArgon2Config{},
+		c: config.Argon2{},
 	}
 
 	cmd := &cobra.Command{

diff --git a/cmd/serve/root.go b/cmd/serve/root.go
@@ -31,7 +31,7 @@ var serveCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		d := driver.New(cmd.Context(), configx.WithFlags(cmd.Flags()))
 
-		if d.Configuration(cmd.Context()).IsInsecureDevMode() {
+		if d.Config(cmd.Context()).IsInsecureDevMode() {
 			d.Logger().Warn(`
 
 YOU ARE RUNNING ORY KRATOS IN DEV MODE.
@@ -41,7 +41,7 @@ DON'T DO THIS IN PRODUCTION!
 `)
 		}
 
-		configVersion := d.Configuration(cmd.Context()).ConfigVersion()
+		configVersion := d.Config(cmd.Context()).ConfigVersion()
 		if configVersion == config.UnknownVersion {
 			d.Logger().Warn("The config has no version specified. Add the version to improve your development experience.")
 		} else if config.Version != "" &&

diff --git a/corp/context.go b/corp/context.go
@@ -17,6 +17,6 @@ func ContextualizeMiddleware(_ context.Context) func(rw http.ResponseWriter, r *
 	}
 }
 
-func ContextualizeConfig(ctx context.Context, fb *config.Provider) *config.Provider {
+func ContextualizeConfig(ctx context.Context, fb *config.Config) *config.Config {
 	return fb
 }
diff --git a/courier/courier.go b/courier/courier.go
@@ -27,14 +27,14 @@ type (
 	Courier struct {
 		Dialer *gomail.Dialer
 		d      smtpDependencies
-		c      *config.Provider
+		c      *config.Config
 	}
 	Provider interface {
 		Courier() *Courier
 	}
 )
 
-func NewSMTP(d smtpDependencies, c *config.Provider) *Courier {
+func NewSMTP(d smtpDependencies, c *config.Config) *Courier {
 	uri := c.CourierSMTPURL()
 	password, _ := uri.User.Password()
 	port, _ := strconv.ParseInt(uri.Port(), 10, 64)

diff --git a/courier/template/recovery_invalid.go b/courier/template/recovery_invalid.go
@@ -8,15 +8,15 @@ import (
 
 type (
 	RecoveryInvalid struct {
-		c *config.Provider
+		c *config.Config
 		m *RecoveryInvalidModel
 	}
 	RecoveryInvalidModel struct {
 		To string
 	}
 )
 
-func NewRecoveryInvalid(c *config.Provider, m *RecoveryInvalidModel) *RecoveryInvalid {
+func NewRecoveryInvalid(c *config.Config, m *RecoveryInvalidModel) *RecoveryInvalid {
 	return &RecoveryInvalid{c: c, m: m}
 }
 

diff --git a/courier/template/recovery_valid.go b/courier/template/recovery_valid.go
@@ -8,7 +8,7 @@ import (
 
 type (
 	RecoveryValid struct {
-		c *config.Provider
+		c *config.Config
 		m *RecoveryValidModel
 	}
 	RecoveryValidModel struct {
@@ -17,7 +17,7 @@ type (
 	}
 )
 
-func NewRecoveryValid(c *config.Provider, m *RecoveryValidModel) *RecoveryValid {
+func NewRecoveryValid(c *config.Config, m *RecoveryValidModel) *RecoveryValid {
 	return &RecoveryValid{c: c, m: m}
 }
 

diff --git a/courier/template/stub.go b/courier/template/stub.go
@@ -7,7 +7,7 @@ import (
 )
 
 type TestStub struct {
-	c *config.Provider
+	c *config.Config
 	m *TestStubModel
 }
 
@@ -17,7 +17,7 @@ type TestStubModel struct {
 	Body    string
 }
 
-func NewTestStub(c *config.Provider, m *TestStubModel) *TestStub {
+func NewTestStub(c *config.Config, m *TestStubModel) *TestStub {
 	return &TestStub{c: c, m: m}
 }
 

diff --git a/courier/template/verification_invalid.go b/courier/template/verification_invalid.go
@@ -8,15 +8,15 @@ import (
 
 type (
 	VerificationInvalid struct {
-		c *config.Provider
+		c *config.Config
 		m *VerificationInvalidModel
 	}
 	VerificationInvalidModel struct {
 		To string
 	}
 )
 
-func NewVerificationInvalid(c *config.Provider, m *VerificationInvalidModel) *VerificationInvalid {
+func NewVerificationInvalid(c *config.Config, m *VerificationInvalidModel) *VerificationInvalid {
 	return &VerificationInvalid{c: c, m: m}
 }
 

diff --git a/courier/template/verification_valid.go b/courier/template/verification_valid.go
@@ -8,7 +8,7 @@ import (
 
 type (
 	VerificationValid struct {
-		c *config.Provider
+		c *config.Config
 		m *VerificationValidModel
 	}
 	VerificationValidModel struct {
@@ -17,7 +17,7 @@ type (
 	}
 )
 
-func NewVerificationValid(c *config.Provider, m *VerificationValidModel) *VerificationValid {
+func NewVerificationValid(c *config.Config, m *VerificationValidModel) *VerificationValid {
 	return &VerificationValid{c: c, m: m}
 }