Merge pull request distribution#1744 from tonyhb/add-config-to-middleware

Richard Scothern · Richard Scothern · commit 596ca8b86acd · 2016-05-25T14:08:09.000-07:00
Pass in `app` as context to apply{N}Middleware
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
@@ -258,7 +258,7 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
 		}
 	}
 
-	app.registry, err = applyRegistryMiddleware(app.Context, app.registry, config.Middleware["registry"])
+	app.registry, err = applyRegistryMiddleware(app, app.registry, config.Middleware["registry"])
 	if err != nil {
 		panic(err)
 	}
@@ -647,7 +647,7 @@ func (app *App) dispatcher(dispatch dispatchFunc) http.Handler {
 				repository,
 				app.eventBridge(context, r))
 
-			context.Repository, err = applyRepoMiddleware(context.Context, context.Repository, app.Config.Middleware["repository"])
+			context.Repository, err = applyRepoMiddleware(app, context.Repository, app.Config.Middleware["repository"])
 			if err != nil {
 				ctxu.GetLogger(context).Errorf("error initializing repository middleware: %v", err)
 				context.Errors = append(context.Errors, errcode.ErrorCodeUnknown.WithDetail(err))

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ func NewApp(ctx context.Context, config configuration.Configuration) App {`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`- app.registry, err = applyRegistryMiddleware(app.Context, app.registry, config.Middleware["registry"])`
	`261`	`+ app.registry, err = applyRegistryMiddleware(app, app.registry, config.Middleware["registry"])`
`262`	`262`	`if err != nil {`
`263`	`263`	`panic(err)`
`264`	`264`	`}`
`@@ -647,7 +647,7 @@ func (app *App) dispatcher(dispatch dispatchFunc) http.Handler {`
`647`	`647`	`repository,`
`648`	`648`	`app.eventBridge(context, r))`
`649`	`649`
`650`		`- context.Repository, err = applyRepoMiddleware(context.Context, context.Repository, app.Config.Middleware["repository"])`
	`650`	`+ context.Repository, err = applyRepoMiddleware(app, context.Repository, app.Config.Middleware["repository"])`
`651`	`651`	`if err != nil {`
`652`	`652`	`ctxu.GetLogger(context).Errorf("error initializing repository middleware: %v", err)`
`653`	`653`	`context.Errors = append(context.Errors, errcode.ErrorCodeUnknown.WithDetail(err))`