diff --git a/cmd/gitness/wire_gen.go b/cmd/gitness/wire_gen.go index d92d499c2..7f21e8da1 100644 --- a/cmd/gitness/wire_gen.go +++ b/cmd/gitness/wire_gen.go @@ -138,13 +138,11 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro logStore := logs.ProvideLogStore(db, config) logStream := livelog.ProvideLogStream(config) logsController := logs2.ProvideController(db, authorizer, executionStore, repoStore, pipelineStore, stageStore, stepStore, logStore, logStream) - pubsubConfig := pubsub.ProvideConfig(config) - pubSub := pubsub.ProvidePubSub(pubsubConfig, universalClient) - eventsEvents := events.ProvideEventsStreaming(pubSub) + eventsStreamer := events.ProvideEventsStreaming(pubSub) secretStore := database.ProvideSecretStore(db) connectorStore := database.ProvideConnectorStore(db) templateStore := database.ProvideTemplateStore(db) - spaceController := space.ProvideController(db, provider, eventsEvents, pathUID, authorizer, pathStore, pipelineStore, secretStore, connectorStore, templateStore, spaceStore, repoStore, principalStore, repoController, membershipStore) + spaceController := space.ProvideController(db, provider, eventsStreamer, pathUID, authorizer, pathStore, pipelineStore, secretStore, connectorStore, templateStore, spaceStore, repoStore, principalStore, repoController, membershipStore) pipelineController := pipeline.ProvideController(db, pathUID, pathStore, repoStore, authorizer, pipelineStore) encrypter, err := encrypt.ProvideEncrypter(config) if err != nil { @@ -210,7 +208,7 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro webHandler := router.ProvideWebHandler(config) routerRouter := router.ProvideRouter(config, apiHandler, gitHandler, webHandler) serverServer := server2.ProvideServer(config, routerRouter) - executionManager := manager.ProvideExecutionManager(config, executionStore, pipelineStore, provider, eventsEvents, fileService, logStore, logStream, repoStore, schedulerScheduler, secretStore, stageStore, stepStore, principalStore) + executionManager := manager.ProvideExecutionManager(config, executionStore, pipelineStore, provider, eventsStreamer, fileService, logStore, logStream, repoStore, schedulerScheduler, secretStore, stageStore, stepStore, principalStore) client := manager.ProvideExecutionClient(executionManager, config) runtimeRunner, err := runner.ProvideExecutionRunner(config, client, executionManager) if err != nil { diff --git a/internal/api/controller/space/controller.go b/internal/api/controller/space/controller.go index 8d9dd449a..6b35a95fe 100644 --- a/internal/api/controller/space/controller.go +++ b/internal/api/controller/space/controller.go @@ -18,7 +18,7 @@ import ( type Controller struct { db *sqlx.DB urlProvider *url.Provider - eventsStream events.Events + eventsStream events.EventsStreamer uidCheck check.PathUID authorizer authz.Authorizer pathStore store.PathStore @@ -33,7 +33,7 @@ type Controller struct { membershipStore store.MembershipStore } -func NewController(db *sqlx.DB, urlProvider *url.Provider, eventsStream events.Events, +func NewController(db *sqlx.DB, urlProvider *url.Provider, eventsStream events.EventsStreamer, uidCheck check.PathUID, authorizer authz.Authorizer, pathStore store.PathStore, pipelineStore store.PipelineStore, secretStore store.SecretStore, connectorStore store.ConnectorStore, templateStore store.TemplateStore, spaceStore store.SpaceStore, diff --git a/internal/api/controller/space/wire.go b/internal/api/controller/space/wire.go index 6fa3022d5..ea39967a2 100644 --- a/internal/api/controller/space/wire.go +++ b/internal/api/controller/space/wire.go @@ -21,7 +21,7 @@ var WireSet = wire.NewSet( ProvideController, ) -func ProvideController(db *sqlx.DB, urlProvider *url.Provider, eventsStream events.Events, +func ProvideController(db *sqlx.DB, urlProvider *url.Provider, eventsStream events.EventsStreamer, uidCheck check.PathUID, authorizer authz.Authorizer, pathStore store.PathStore, pipelineStore store.PipelineStore, secretStore store.SecretStore, connectorStore store.ConnectorStore, templateStore store.TemplateStore, diff --git a/internal/pipeline/events/events.go b/internal/pipeline/events/events.go index a3408e914..0afa78d65 100644 --- a/internal/pipeline/events/events.go +++ b/internal/pipeline/events/events.go @@ -19,7 +19,7 @@ type Event struct { Data json.RawMessage `json:"data"` } -type Events interface { +type EventsStreamer interface { // Publish publishes an event to a given space ID. Publish(ctx context.Context, spaceID int64, event *Event) error @@ -35,7 +35,7 @@ type event struct { topic string } -func New(pubsub pubsub.PubSub, topic string) Events { +func New(pubsub pubsub.PubSub, topic string) EventsStreamer { return &event{ pubsub: pubsub, topic: topic, diff --git a/internal/pipeline/events/wire.go b/internal/pipeline/events/wire.go index 6879e8782..a848fc4bb 100644 --- a/internal/pipeline/events/wire.go +++ b/internal/pipeline/events/wire.go @@ -15,7 +15,7 @@ var WireSet = wire.NewSet( ProvideEventsStreaming, ) -func ProvideEventsStreaming(pubsub pubsub.PubSub) Events { +func ProvideEventsStreaming(pubsub pubsub.PubSub) EventsStreamer { return &event{ pubsub: pubsub, topic: "events", diff --git a/internal/pipeline/manager/manager.go b/internal/pipeline/manager/manager.go index 1500c0f5a..182529fdf 100644 --- a/internal/pipeline/manager/manager.go +++ b/internal/pipeline/manager/manager.go @@ -99,7 +99,7 @@ type Manager struct { Pipelines store.PipelineStore urlProvider *urlprovider.Provider // Converter store.ConvertService - Events events.Events + Events events.EventsStreamer // Globals store.GlobalSecretStore Logs store.LogStore Logz livelog.LogStream @@ -120,7 +120,7 @@ func New( executionStore store.ExecutionStore, pipelineStore store.PipelineStore, urlProvider *urlprovider.Provider, - events events.Events, + events events.EventsStreamer, fileService file.FileService, logStore store.LogStore, logStream livelog.LogStream, diff --git a/internal/pipeline/manager/setup.go b/internal/pipeline/manager/setup.go index 457878fc0..16126498c 100644 --- a/internal/pipeline/manager/setup.go +++ b/internal/pipeline/manager/setup.go @@ -21,7 +21,7 @@ import ( type setup struct { Executions store.ExecutionStore - Events events.Events + Events events.EventsStreamer Repos store.RepoStore Steps store.StepStore Stages store.StageStore diff --git a/internal/pipeline/manager/teardown.go b/internal/pipeline/manager/teardown.go index 25cbb180c..63d827686 100644 --- a/internal/pipeline/manager/teardown.go +++ b/internal/pipeline/manager/teardown.go @@ -21,7 +21,7 @@ import ( type teardown struct { Executions store.ExecutionStore - Events events.Events + Events events.EventsStreamer Logs livelog.LogStream Scheduler scheduler.Scheduler Repos store.RepoStore diff --git a/internal/pipeline/manager/updater.go b/internal/pipeline/manager/updater.go index 13d068486..0b9f801ba 100644 --- a/internal/pipeline/manager/updater.go +++ b/internal/pipeline/manager/updater.go @@ -18,7 +18,7 @@ import ( type updater struct { Executions store.ExecutionStore Repos store.RepoStore - Events events.Events + Events events.EventsStreamer Steps store.StepStore Stages store.StageStore } diff --git a/internal/pipeline/manager/wire.go b/internal/pipeline/manager/wire.go index 4849ea89c..f097fd710 100644 --- a/internal/pipeline/manager/wire.go +++ b/internal/pipeline/manager/wire.go @@ -29,7 +29,7 @@ func ProvideExecutionManager( executionStore store.ExecutionStore, pipelineStore store.PipelineStore, urlProvider *url.Provider, - events events.Events, + events events.EventsStreamer, fileService file.FileService, logStore store.LogStore, logStream livelog.LogStream, diff --git a/internal/writer/writeflush.go b/internal/writer/writeflush.go index c2e37eea0..141e10a9a 100644 --- a/internal/writer/writeflush.go +++ b/internal/writer/writeflush.go @@ -1,3 +1,7 @@ +// Copyright 2022 Harness Inc. All rights reserved. +// Use of this source code is governed by the Polyform Free Trial License +// that can be found in the LICENSE.md file for this repository. + package writer import "io"