Sync against current library state

internal/daemon/controller/controller.go

@@ -36,7 +36,7 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/mlock"
 	"github.com/hashicorp/go-secure-stdlib/pluginutil/v2"
-	"github.com/hashicorp/nodeenrollment/noderegistration"
+	"github.com/hashicorp/nodeenrollment/registration"
 	"github.com/hashicorp/nodeenrollment/rotation"
 	nodeefile "github.com/hashicorp/nodeenrollment/storage/file"
 	ua "go.uber.org/atomic"
@@ -407,5 +407,5 @@ func (c *Controller) WorkerStatusUpdateTimes() *sync.Map {
 }
 
 func (c *Controller) AuthorizeNodeeWorker(keyId string) error {
-	return noderegistration.AuthorizeNode(c.baseContext, c.NodeeFileStorage, keyId)
+	return registration.AuthorizeNode(c.baseContext, c.NodeeFileStorage, keyId)
 }

internal/daemon/controller/handlers/workers/multihop_service.go

@@ -6,8 +6,8 @@ import (
 
 	pbs "github.com/hashicorp/nodeenrollment/multihop"
 	"github.com/hashicorp/nodeenrollment/nodeauth"
-	"github.com/hashicorp/nodeenrollment/noderegistration"
-	"github.com/hashicorp/nodeenrollment/nodetls"
+	"github.com/hashicorp/nodeenrollment/registration"
+	"github.com/hashicorp/nodeenrollment/tls"
 	"github.com/hashicorp/nodeenrollment/types"
 )
 
@@ -33,7 +33,7 @@ func (m *multihopServiceServer) FetchNodeCredentials(ctx context.Context, req *t
 	if err != nil {
 		return nil, fmt.Errorf("%s: error getting current parameters: %w", op, err)
 	}
-	return noderegistration.FetchNodeCredentials(ctx, storage, req, opt...)
+	return registration.FetchNodeCredentials(ctx, storage, req, opt...)
 }
 
 func (m *multihopServiceServer) GenerateServerCertificates(ctx context.Context, req *types.GenerateServerCertificatesRequest) (*types.GenerateServerCertificatesResponse, error) {
@@ -42,5 +42,5 @@ func (m *multihopServiceServer) GenerateServerCertificates(ctx context.Context,
 	if err != nil {
 		return nil, fmt.Errorf("%s: error getting current parameters: %w", op, err)
 	}
-	return nodetls.GenerateServerCertificates(ctx, storage, req, opt...)
+	return tls.GenerateServerCertificates(ctx, storage, req, opt...)
 }