Update 1.3 code for new ACLs

hashicorp · Oct 15, 2018 · 65a0e52 · 65a0e52
1 parent 97e3cdd
commit 65a0e52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -516,12 +516,10 @@ func (a *Agent) listenAndServeGRPC() error {
 	}
 
 	a.xdsServer = &xds.Server{
-		Logger: a.logger,
-		CfgMgr: a.proxyConfig,
-		Authz:  a,
-		ResolveToken: func(id string) (acl.ACL, error) {
-			return a.resolveToken(id)
-		},
+		Logger:       a.logger,
+		CfgMgr:       a.proxyConfig,
+		Authz:        a,
+		ResolveToken: a.resolveToken,
 	}
 	var err error
 	a.grpcServer, err = a.xdsServer.GRPCServer(a.config.CertFile, a.config.KeyFile)

diff --git a/agent/xds/server.go b/agent/xds/server.go
@@ -62,7 +62,7 @@ const (
 // entirely agent-local and all uses private methods this allows a simple shim
 // to be written in the agent package to allow resolving without tightly
 // coupling this to the agent.
-type ACLResolverFunc func(id string) (acl.ACL, error)
+type ACLResolverFunc func(id string) (acl.Authorizer, error)
 
 // ConnectAuthz is the interface the agent needs to expose to be able to re-use
 // the authorization logic between both APIs.