diff --git a/go.mod b/go.mod index af6e12e90b..007e1afc1d 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/hashicorp/cap/ldap v0.0.0-20230123181313-9c0fb924b0d9 github.com/hashicorp/go-kms-wrapping/extras/kms/v2 v2.0.0-20221122211539-47c893099f13 github.com/hashicorp/go-version v1.3.0 - github.com/hashicorp/nodeenrollment v0.1.18 + github.com/hashicorp/nodeenrollment v0.1.19 github.com/jimlambrt/gldap v0.1.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a diff --git a/go.sum b/go.sum index 3ec4648b5c..75e4711bc6 100644 --- a/go.sum +++ b/go.sum @@ -757,8 +757,8 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/nodeenrollment v0.1.18 h1:fqFMZ5e2cWupeQDxKledF9DGHsk9GoJl7K2Wrdiys6k= -github.com/hashicorp/nodeenrollment v0.1.18/go.mod h1:N5gYsm8mWiDfIw/j+1IQ6NBO1cWCmhPpvQ9GB1QUnsU= +github.com/hashicorp/nodeenrollment v0.1.19 h1:RZIYFVfjWlK8MZn7owEEmaoDLHMqROL2K9RkJz2Q5cA= +github.com/hashicorp/nodeenrollment v0.1.19/go.mod h1:N5gYsm8mWiDfIw/j+1IQ6NBO1cWCmhPpvQ9GB1QUnsU= github.com/hashicorp/vault/api v1.3.1 h1:pkDkcgTh47PRjY1NEFeofqR4W/HkNUi9qIakESO2aRM= github.com/hashicorp/vault/api v1.3.1/go.mod h1:QeJoWxMFt+MsuWcYhmwRLwKEXrjwAFFywzhptMsTIUw= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= diff --git a/internal/daemon/cluster/connstate.go b/internal/daemon/cluster/connstate.go index 46e088453d..39722cc565 100644 --- a/internal/daemon/cluster/connstate.go +++ b/internal/daemon/cluster/connstate.go @@ -40,7 +40,7 @@ func (w *WorkerConnectionInfo) AsConnectionStateStruct() (*structpb.Struct, erro } type stateProvider interface { - State() *structpb.Struct + ClientState() *structpb.Struct } // GetWorkerInfoFromStateMap returns the WorkerConnectionInfo for the provided @@ -53,7 +53,7 @@ func GetWorkerInfoFromStateMap(ctx context.Context, c net.Conn) (*WorkerConnecti if !ok { return nil, errors.Wrap(ctx, errStateNotFound, op, errors.WithMsg("conn is not a state provider")) } - st := pc.State() + st := pc.ClientState() if st == nil { return nil, errors.Wrap(ctx, errStateNotFound, op, errors.WithMsg("no state attached to connection")) } diff --git a/internal/daemon/cluster/connstate_test.go b/internal/daemon/cluster/connstate_test.go index 47bfd12404..3a5bc6f094 100644 --- a/internal/daemon/cluster/connstate_test.go +++ b/internal/daemon/cluster/connstate_test.go @@ -18,7 +18,7 @@ type testConn struct { st *structpb.Struct } -func (c *testConn) State() *structpb.Struct { +func (c *testConn) ClientState() *structpb.Struct { return c.st } diff --git a/internal/daemon/metric/instrument_handlers.go b/internal/daemon/metric/instrument_handlers.go index 056020e683..5cd206e4b3 100644 --- a/internal/daemon/metric/instrument_handlers.go +++ b/internal/daemon/metric/instrument_handlers.go @@ -133,7 +133,7 @@ func NewConnectionTrackingListener(l net.Listener, ac prometheus.Counter, cc pro type stateProvidingConn interface { net.Conn - State() *structpb.Struct + ClientState() *structpb.Struct } // connectionTrackingListenerStateConn wraps connections that expose