Add DefaultDeps parameter to NewRouterEndpoint

uber · Dec 15, 2018 · cdf4871 · cdf4871
1 parent e9ce049
commit cdf4871
Show file tree

Hide file tree

Showing 35 changed files with 321 additions and 154 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/endpoint.tmpl b/codegen/templates/endpoint.tmpl
@@ -67,7 +67,7 @@ func New{{$handlerName}}(deps *module.Dependencies) *{{$handlerName}} {
 		Dependencies: deps,
 	}
 	handler.endpoint = zanzibar.NewRouterEndpoint(
-		deps.Default.ContextExtractor, deps.Default.Scope, deps.Default.Logger, deps.Default.Tracer,
+		deps.Default.ContextExtractor, deps.Default,
 		"{{$endpointId}}", "{{$handleId}}",
 		{{ if len $middlewares | ne 0 -}}
 		zanzibar.NewStack([]zanzibar.MiddlewareHandle{

diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_helloworld.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_helloworld.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_getprofile.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_getprofile.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_ping.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_ping.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_sillynoop.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_sillynoop.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaders.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaders.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheadersnoreq.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheadersnoreq.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaderstype.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaderstype.go
diff --git a/examples/example-gateway/build/endpoints/contacts/contacts_contacts_method_savecontacts.go b/examples/example-gateway/build/endpoints/contacts/contacts_contacts_method_savecontacts.go
diff --git a/...es/example-gateway/build/endpoints/googlenow/googlenow_googlenow_method_addcredentials.go b/...es/example-gateway/build/endpoints/googlenow/googlenow_googlenow_method_addcredentials.go
diff --git a/.../example-gateway/build/endpoints/googlenow/googlenow_googlenow_method_checkcredentials.go b/.../example-gateway/build/endpoints/googlenow/googlenow_googlenow_method_checkcredentials.go
diff --git a/examples/example-gateway/build/endpoints/multi/multi_serviceafront_method_hello.go b/examples/example-gateway/build/endpoints/multi/multi_serviceafront_method_hello.go
diff --git a/examples/example-gateway/build/endpoints/multi/multi_servicebfront_method_hello.go b/examples/example-gateway/build/endpoints/multi/multi_servicebfront_method_hello.go
diff --git a/examples/example-gateway/build/endpoints/panic/panic_servicecfront_method_hello.go b/examples/example-gateway/build/endpoints/panic/panic_servicecfront_method_hello.go
diff --git a/runtime/gateway.go b/runtime/gateway.go
@@ -273,8 +273,15 @@ func (gateway *Gateway) registerPredefined() {
 	gateway.HTTPRouter.Handle("GET", "/debug/loglevel", gateway.atomLevel)
 	gateway.HTTPRouter.Handle("PUT", "/debug/loglevel", gateway.atomLevel)
 
+	deps := &DefaultDependencies{
+		Scope:         gateway.RootScope,
+		ContextLogger: gateway.ContextLogger,
+		Logger:        gateway.Logger,
+		Tracer:        gateway.Tracer,
+	}
+
 	tracer := NewRouterEndpoint(
-		gateway.ContextExtractor, gateway.RootScope, gateway.Logger, gateway.Tracer,
+		gateway.ContextExtractor, deps,
 		"health", "health",
 		gateway.handleHealthRequest,
 	)

diff --git a/runtime/middlewares_test.go b/runtime/middlewares_test.go
@@ -68,13 +68,18 @@ func TestHandlers(t *testing.T) {
 
 	bgateway := gateway.(*benchGateway.BenchGateway)
 
+	deps := &zanzibar.DefaultDependencies{
+		Scope:         bgateway.ActualGateway.RootScope,
+		Logger:        bgateway.ActualGateway.Logger,
+		ContextLogger: bgateway.ActualGateway.ContextLogger,
+		Tracer:        bgateway.ActualGateway.Tracer,
+	}
+
 	err = bgateway.ActualGateway.HTTPRouter.Handle(
 		"GET", "/foo",
 		http.HandlerFunc(zanzibar.NewRouterEndpoint(
 			bgateway.ActualGateway.ContextExtractor,
-			bgateway.ActualGateway.RootScope,
-			bgateway.ActualGateway.Logger,
-			bgateway.ActualGateway.Tracer,
+			deps,
 			"foo", "foo",
 			middlewareStack.Handle,
 		).HandleRequest),
@@ -156,14 +161,18 @@ func TestMiddlewareRequestAbort(t *testing.T) {
 	defer gateway.Close()
 
 	bgateway := gateway.(*benchGateway.BenchGateway)
+	deps := &zanzibar.DefaultDependencies{
+		Scope:         bgateway.ActualGateway.RootScope,
+		Logger:        bgateway.ActualGateway.Logger,
+		ContextLogger: bgateway.ActualGateway.ContextLogger,
+		Tracer:        bgateway.ActualGateway.Tracer,
+	}
 
 	err = bgateway.ActualGateway.HTTPRouter.Handle(
 		"GET", "/foo",
 		http.HandlerFunc(zanzibar.NewRouterEndpoint(
 			bgateway.ActualGateway.ContextExtractor,
-			bgateway.ActualGateway.RootScope,
-			bgateway.ActualGateway.Logger,
-			bgateway.ActualGateway.Tracer,
+			deps,
 			"foo", "foo",
 			middlewareStack.Handle,
 		).HandleRequest),
@@ -214,13 +223,18 @@ func TestMiddlewareResponseAbort(t *testing.T) {
 
 	bgateway := gateway.(*benchGateway.BenchGateway)
 
+	deps := &zanzibar.DefaultDependencies{
+		Scope:         bgateway.ActualGateway.RootScope,
+		Logger:        bgateway.ActualGateway.Logger,
+		ContextLogger: bgateway.ActualGateway.ContextLogger,
+		Tracer:        bgateway.ActualGateway.Tracer,
+	}
+
 	err = bgateway.ActualGateway.HTTPRouter.Handle(
 		"GET", "/foo",
 		http.HandlerFunc(zanzibar.NewRouterEndpoint(
 			bgateway.ActualGateway.ContextExtractor,
-			bgateway.ActualGateway.RootScope,
-			bgateway.ActualGateway.Logger,
-			bgateway.ActualGateway.Tracer,
+			deps,
 			"foo", "foo",
 			middlewareStack.Handle,
 		).HandleRequest),
@@ -275,14 +289,18 @@ func TestMiddlewareSharedStates(t *testing.T) {
 	defer gateway.Close()
 
 	bgateway := gateway.(*benchGateway.BenchGateway)
+	deps := &zanzibar.DefaultDependencies{
+		Scope:         bgateway.ActualGateway.RootScope,
+		Logger:        bgateway.ActualGateway.Logger,
+		ContextLogger: bgateway.ActualGateway.ContextLogger,
+		Tracer:        bgateway.ActualGateway.Tracer,
+	}
 
 	err = bgateway.ActualGateway.HTTPRouter.Handle(
 		"GET", "/foo",
 		http.HandlerFunc(zanzibar.NewRouterEndpoint(
 			bgateway.ActualGateway.ContextExtractor,
-			bgateway.ActualGateway.RootScope,
-			bgateway.ActualGateway.Logger,
-			bgateway.ActualGateway.Tracer,
+			deps,
 			"foo", "foo",
 			middlewareStack.Handle,
 		).HandleRequest),