Move part of events from internal to pkg

Signed-off-by: Radoslav Dimitrov <[email protected]>

internal/controlplane/handlers_entities_test.go

@@ -13,12 +13,12 @@ import (
 
 	"github.com/mindersec/minder/internal/db"
 	"github.com/mindersec/minder/internal/engine/engcontext"
-	mockevents "github.com/mindersec/minder/internal/events/mock"
 	mockgh "github.com/mindersec/minder/internal/providers/github/mock"
 	"github.com/mindersec/minder/internal/providers/manager"
 	mockmanager "github.com/mindersec/minder/internal/providers/manager/mock"
 	rf "github.com/mindersec/minder/internal/repositories/mock/fixtures"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	mockevents "github.com/mindersec/minder/pkg/events/mock"
 )
 
 func TestServer_ReconcileEntityRegistration(t *testing.T) {

internal/controlplane/handlers_oauth_test.go

@@ -38,7 +38,6 @@ import (
 	"github.com/mindersec/minder/internal/db"
 	"github.com/mindersec/minder/internal/engine/engcontext"
 	mockprops "github.com/mindersec/minder/internal/entities/properties/service/mock"
-	"github.com/mindersec/minder/internal/events"
 	"github.com/mindersec/minder/internal/providers"
 	"github.com/mindersec/minder/internal/providers/dockerhub"
 	mockclients "github.com/mindersec/minder/internal/providers/github/clients/mock"
@@ -51,6 +50,7 @@ import (
 	"github.com/mindersec/minder/internal/providers/session"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	"github.com/mindersec/minder/pkg/events"
 	provinfv1 "github.com/mindersec/minder/pkg/providers/v1"
 )
 
@@ -378,7 +378,7 @@ func TestGetAuthorizationURL(t *testing.T) {
 			store := mockdb.NewMockStore(ctrl)
 			tc.buildStubs(store)
 
-			evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+			evt, err := events.New(context.Background(), &serverconfig.EventConfig{
 				Driver:    "go-channel",
 				GoChannel: serverconfig.GoChannelEventConfig{},
 			})
@@ -890,7 +890,7 @@ func TestHandleGitHubAppCallback(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+			evt, err := events.New(context.Background(), &serverconfig.EventConfig{
 				Driver:    "go-channel",
 				GoChannel: serverconfig.GoChannelEventConfig{},
 			})
@@ -1046,7 +1046,7 @@ func TestVerifyProviderCredential(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+			evt, err := events.New(context.Background(), &serverconfig.EventConfig{
 				Driver:    "go-channel",
 				GoChannel: serverconfig.GoChannelEventConfig{},
 			})

internal/controlplane/handlers_user_test.go

@@ -29,14 +29,14 @@ import (
 	"github.com/mindersec/minder/internal/authz/mock"
 	mockcrypto "github.com/mindersec/minder/internal/crypto/mock"
 	"github.com/mindersec/minder/internal/db"
-	"github.com/mindersec/minder/internal/events"
 	"github.com/mindersec/minder/internal/flags"
 	"github.com/mindersec/minder/internal/marketplaces"
 	"github.com/mindersec/minder/internal/projects"
 	"github.com/mindersec/minder/internal/providers"
 	mockprov "github.com/mindersec/minder/internal/providers/github/service/mock"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 const (
@@ -439,7 +439,7 @@ func TestDeleteUser_gRPC(t *testing.T) {
 			}))
 			defer testServer.Close()
 
-			evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+			evt, err := pkgevents.New(context.Background(), &serverconfig.EventConfig{
 				Driver:    "go-channel",
 				GoChannel: serverconfig.GoChannelEventConfig{},
 			})

internal/controlplane/server.go

@@ -47,7 +47,6 @@ import (
 	"github.com/mindersec/minder/internal/crypto"
 	"github.com/mindersec/minder/internal/db"
 	propSvc "github.com/mindersec/minder/internal/entities/properties/service"
-	"github.com/mindersec/minder/internal/events"
 	"github.com/mindersec/minder/internal/history"
 	"github.com/mindersec/minder/internal/invites"
 	"github.com/mindersec/minder/internal/logger"
@@ -64,6 +63,7 @@ import (
 	"github.com/mindersec/minder/internal/util"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
@@ -81,7 +81,7 @@ var (
 type Server struct {
 	store        db.Store
 	cfg          *serverconfig.Config
-	evt          events.Publisher
+	evt          pkgevents.Publisher
 	mt           metrics.Metrics
 	grpcServer   *grpc.Server
 	jwt          jwt.Validator
@@ -126,7 +126,7 @@ type Server struct {
 // NewServer creates a new server instance
 func NewServer(
 	store db.Store,
-	evt events.Publisher,
+	evt pkgevents.Publisher,
 	cfg *serverconfig.Config,
 	serverMetrics metrics.Metrics,
 	jwtValidator jwt.Validator,

internal/controlplane/server_test.go

@@ -33,13 +33,13 @@ import (
 	"github.com/mindersec/minder/internal/controlplane/metrics"
 	"github.com/mindersec/minder/internal/crypto"
 	mock_service "github.com/mindersec/minder/internal/entities/properties/service/mock"
-	"github.com/mindersec/minder/internal/events"
 	"github.com/mindersec/minder/internal/providers"
 	ghclient "github.com/mindersec/minder/internal/providers/github/clients"
 	ghService "github.com/mindersec/minder/internal/providers/github/service"
 	mock_reposvc "github.com/mindersec/minder/internal/repositories/mock"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 const bufSize = 1024 * 1024
@@ -78,7 +78,7 @@ func newDefaultServer(
 ) *Server {
 	t.Helper()
 
-	evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+	evt, err := pkgevents.New(context.Background(), &serverconfig.EventConfig{
 		Driver:    "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{},
 	})

internal/eea/eea.go

@@ -24,20 +24,21 @@ import (
 	"github.com/mindersec/minder/internal/providers/manager"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 // EEA is the Event Execution Aggregator
 type EEA struct {
 	querier db.Store
-	evt     events.Publisher
+	evt     pkgevents.Publisher
 	cfg     *serverconfig.AggregatorConfig
 
 	entityFetcher service.PropertiesService
 	provMan       manager.ProviderManager
 }
 
 // NewEEA creates a new EEA
-func NewEEA(querier db.Store, evt events.Publisher, cfg *serverconfig.AggregatorConfig,
+func NewEEA(querier db.Store, evt pkgevents.Publisher, cfg *serverconfig.AggregatorConfig,
 	ef service.PropertiesService, provMan manager.ProviderManager) *EEA {
 	return &EEA{
 		querier:       querier,
@@ -49,7 +50,7 @@ func NewEEA(querier db.Store, evt events.Publisher, cfg *serverconfig.Aggregator
 }
 
 // Register implements the Consumer interface.
-func (e *EEA) Register(r events.Registrar) {
+func (e *EEA) Register(r pkgevents.Registrar) {
 	r.Register(events.TopicQueueEntityFlush, e.FlushMessageHandler)
 }
 

internal/eea/eea_test.go

@@ -31,6 +31,7 @@ import (
 	mockmanager "github.com/mindersec/minder/internal/providers/manager/mock"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 const (
@@ -55,7 +56,7 @@ func TestAggregator(t *testing.T) {
 
 	projectID, repoID := createNeededEntities(ctx, t, testQueries)
 
-	evt, err := events.Setup(ctx, &serverconfig.EventConfig{
+	evt, err := pkgevents.New(ctx, &serverconfig.EventConfig{
 		Driver: "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{
 			BufferSize:                     concurrentEvents,
@@ -345,7 +346,7 @@ func TestFlushAll(t *testing.T) {
 			propsvc := propsvcmock.NewMockPropertiesService(ctrl)
 			provman := mockmanager.NewMockProviderManager(ctrl)
 
-			evt, err := events.Setup(ctx, &serverconfig.EventConfig{
+			evt, err := pkgevents.New(ctx, &serverconfig.EventConfig{
 				Driver:    "go-channel",
 				GoChannel: serverconfig.GoChannelEventConfig{},
 			})
@@ -394,7 +395,7 @@ func TestFlushAllListFlushIsEmpty(t *testing.T) {
 	require.NoError(t, err, "expected no error when creating embedded store")
 	t.Cleanup(td)
 
-	evt, err := events.Setup(ctx, &serverconfig.EventConfig{
+	evt, err := pkgevents.New(ctx, &serverconfig.EventConfig{
 		Driver:    "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{},
 	})
@@ -433,7 +434,7 @@ func TestFlushAllListFlushFails(t *testing.T) {
 
 	flushedMessages := newTestPubSub()
 
-	evt, err := events.Setup(ctx, &serverconfig.EventConfig{
+	evt, err := pkgevents.New(ctx, &serverconfig.EventConfig{
 		Driver:    "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{},
 	})
@@ -483,7 +484,7 @@ func TestFlushAllListFlushListsARepoThatGetsDeletedLater(t *testing.T) {
 
 	flushedMessages := newTestPubSub()
 
-	evt, err := events.Setup(ctx, &serverconfig.EventConfig{
+	evt, err := pkgevents.New(ctx, &serverconfig.EventConfig{
 		Driver:    "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{},
 	})

internal/email/awsses/awsses.go

@@ -17,7 +17,7 @@ import (
 	"github.com/rs/zerolog"
 
 	"github.com/mindersec/minder/internal/email"
-	"github.com/mindersec/minder/internal/events"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 const (
@@ -47,7 +47,7 @@ func New(ctx context.Context, sender, region string) (*awsSES, error) {
 }
 
 // Register implements the Consumer interface.
-func (a *awsSES) Register(reg events.Registrar) {
+func (a *awsSES) Register(reg pkgevents.Registrar) {
 	reg.Register(email.TopicQueueInviteEmail, func(msg *message.Message) error {
 		var e email.MailEventPayload
 

internal/email/noop/noop.go

@@ -12,7 +12,7 @@ import (
 	"github.com/rs/zerolog"
 
 	"github.com/mindersec/minder/internal/email"
-	"github.com/mindersec/minder/internal/events"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 type noop struct {
@@ -24,7 +24,7 @@ func New() *noop {
 }
 
 // Register implements the Consumer interface.
-func (_ *noop) Register(reg events.Registrar) {
+func (_ *noop) Register(reg pkgevents.Registrar) {
 	reg.Register(email.TopicQueueInviteEmail, func(msg *message.Message) error {
 		var e email.MailEventPayload
 

internal/engine/entities/entity_event.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/mindersec/minder/internal/events"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 // EntityInfoWrapper is a helper struct to gather information
@@ -180,7 +181,7 @@ func (eiw *EntityInfoWrapper) BuildMessage() (*message.Message, error) {
 }
 
 // Publish builds a message.Message and publishes it to the event bus
-func (eiw *EntityInfoWrapper) Publish(evt events.Publisher) error {
+func (eiw *EntityInfoWrapper) Publish(evt pkgevents.Publisher) error {
 	msg, err := eiw.BuildMessage()
 	if err != nil {
 		return err

internal/engine/handler.go

@@ -18,6 +18,7 @@ import (
 	"github.com/mindersec/minder/internal/events"
 	minderlogger "github.com/mindersec/minder/internal/logger"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 const (
@@ -32,7 +33,7 @@ const (
 // ExecutorEventHandler is responsible for consuming entity events, passing
 // entities to the executor, and then publishing the results.
 type ExecutorEventHandler struct {
-	evt                    events.Publisher
+	evt                    pkgevents.Publisher
 	handlerMiddleware      []message.HandlerMiddleware
 	wgEntityEventExecution *sync.WaitGroup
 	executor               Executor
@@ -46,7 +47,7 @@ type ExecutorEventHandler struct {
 // NewExecutorEventHandler creates the event handler for the executor
 func NewExecutorEventHandler(
 	ctx context.Context,
-	evt events.Publisher,
+	evt pkgevents.Publisher,
 	handlerMiddleware []message.HandlerMiddleware,
 	executor Executor,
 ) *ExecutorEventHandler {
@@ -70,7 +71,7 @@ func NewExecutorEventHandler(
 }
 
 // Register implements the Consumer interface.
-func (e *ExecutorEventHandler) Register(r events.Registrar) {
+func (e *ExecutorEventHandler) Register(r pkgevents.Registrar) {
 	r.Register(events.TopicQueueEntityEvaluate, e.HandleEntityEvent, e.handlerMiddleware...)
 }
 

internal/engine/handler_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/mindersec/minder/internal/util/testqueue"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	serverconfig "github.com/mindersec/minder/pkg/config/server"
+	pkgevents "github.com/mindersec/minder/pkg/events"
 )
 
 func TestExecutorEventHandler_handleEntityEvent(t *testing.T) {
@@ -38,7 +39,7 @@ func TestExecutorEventHandler_handleEntityEvent(t *testing.T) {
 
 	// -- end expectations
 
-	evt, err := events.Setup(context.Background(), &serverconfig.EventConfig{
+	evt, err := pkgevents.New(context.Background(), &serverconfig.EventConfig{
 		Driver: "go-channel",
 		GoChannel: serverconfig.GoChannelEventConfig{
 			BlockPublishUntilSubscriberAck: true,