updated dependency visitation

xmidt-org · Mar 13, 2023 · abe71c0 · abe71c0
1 parent 29c14c9
commit abe71c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/arrangehttp/client.go b/arrangehttp/client.go
@@ -203,13 +203,13 @@ func (c *Client) unmarshal(u arrange.Unmarshaler) (cf ClientFactory, err error)
 
 // configure applies the dependencies (if any) and the options and middleware supplied
 // on this instance to the given *http.Client
-func (c *Client) configure(in ClientIn, client *http.Client, deps []reflect.Value) (err error) {
+func (c *Client) configure(in ClientIn, client *http.Client, deps ...reflect.Value) (err error) {
  var (
  middleware roundtrip.Chain
  options arrange.Invoke
  )
 
- arrange.VisitDependencies(
+ arrange.VisitDependencyValues(
  func(d arrange.Dependency) bool {
  if d.Injected() {
  arrange.TryConvert(
@@ -277,7 +277,7 @@ func (c *Client) provide(deps []reflect.Value) (client *http.Client, err error)
  return
  }
 
- err = c.configure(in, client, deps[1:])
+ err = c.configure(in, client, deps[1:]...)
  if err != nil {
  return
  }

diff --git a/arrangehttp/server.go b/arrangehttp/server.go
@@ -232,13 +232,13 @@ func (s *Server) unmarshal(u arrange.Unmarshaler) (sf ServerFactory, err error)
 // on this instance to the give *http.Server and supporting objects.
 //
 //nolint:funlen // this function is necessarily longer than normal given the try cases
-func (s *Server) configure(in ServerIn, server *http.Server, deps []reflect.Value) (lc ListenerChain, err error) {
+func (s *Server) configure(in ServerIn, server *http.Server, deps ...reflect.Value) (lc ListenerChain, err error) {
  var (
  middleware alice.Chain
  options arrange.Invoke
  )
 
- arrange.VisitDependencies(
+ arrange.VisitDependencyValues(
  func(d arrange.Dependency) bool {
  if d.Injected() {
  arrange.TryConvert(
@@ -320,7 +320,7 @@ func (s *Server) provide(deps []reflect.Value) (router *mux.Router, err error) {
  }
 
  var lc ListenerChain
- lc, err = s.configure(in, server, deps[1:])
+ lc, err = s.configure(in, server, deps[1:]...)
  if err != nil {
  return
  }