fix: don't enable ingestor

hatchet-dev · Jun 25, 2024 · 84e00e9 · 84e00e9
1 parent 1a88a68
commit 84e00e9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/cmd/hatchet-admin/cli/token.go b/cmd/hatchet-admin/cli/token.go
@@ -63,7 +63,7 @@ func runCreateAPIToken() error {
 
 	cleanup, serverConf, err := configLoader.LoadServerConfig(func(scf *server.ServerConfigFile) {
 		// disable rabbitmq since it's not needed to create the api token
-		scf.MessageQueue.RabbitMQ.Enabled = false
+		scf.MessageQueue.Enabled = false
 	})
 
 	if err != nil {

diff --git a/pkg/config/loader/loader.go b/pkg/config/loader/loader.go
@@ -218,23 +218,25 @@ func GetServerConfigFromConfigfile(dc *database.Config, cf *server.ServerConfigF
 		return nil
 	}
 
-	if cf.MessageQueue.RabbitMQ.Enabled {
+	var ing ingestor.Ingestor
+
+	if cf.MessageQueue.Enabled {
 		cleanup1, mq = rabbitmq.New(
 			rabbitmq.WithURL(cf.MessageQueue.RabbitMQ.URL),
 			rabbitmq.WithLogger(&l),
 		)
-	}
 
-	ingestor, err := ingestor.NewIngestor(
-		ingestor.WithEventRepository(dc.EngineRepository.Event()),
-		ingestor.WithStreamEventsRepository(dc.EngineRepository.StreamEvent()),
-		ingestor.WithLogRepository(dc.EngineRepository.Log()),
-		ingestor.WithMessageQueue(mq),
-		ingestor.WithEntitlementsRepository(dc.EntitlementRepository),
-	)
+		ing, err = ingestor.NewIngestor(
+			ingestor.WithEventRepository(dc.EngineRepository.Event()),
+			ingestor.WithStreamEventsRepository(dc.EngineRepository.StreamEvent()),
+			ingestor.WithLogRepository(dc.EngineRepository.Log()),
+			ingestor.WithMessageQueue(mq),
+			ingestor.WithEntitlementsRepository(dc.EntitlementRepository),
+		)
 
-	if err != nil {
-		return nil, nil, fmt.Errorf("could not create ingestor: %w", err)
+		if err != nil {
+			return nil, nil, fmt.Errorf("could not create ingestor: %w", err)
+		}
 	}
 
 	var alerter errors.Alerter
@@ -453,7 +455,7 @@ func GetServerConfigFromConfigfile(dc *database.Config, cf *server.ServerConfigF
 		TLSConfig:              tls,
 		SessionStore:           ss,
 		Validator:              validator.NewDefaultValidator(),
-		Ingestor:               ingestor,
+		Ingestor:               ing,
 		OpenTelemetry:          cf.OpenTelemetry,
 		VCSProviders:           vcsProviders,
 		InternalClient:         internalClient,

diff --git a/pkg/config/server/server.go b/pkg/config/server/server.go
@@ -255,14 +255,14 @@ type ConfigFileAuthCookie struct {
 }
 
 type MessageQueueConfigFile struct {
+	Enabled bool `mapstructure:"enabled" json:"enabled,omitempty" default:"true"`
+
 	Kind string `mapstructure:"kind" json:"kind,omitempty" validate:"required"`
 
 	RabbitMQ RabbitMQConfigFile `mapstructure:"rabbitmq" json:"rabbitmq,omitempty" validate:"required"`
 }
 
 type RabbitMQConfigFile struct {
-	Enabled bool `mapstructure:"enabled" json:"enabled,omitempty" default:"true"`
-
 	URL string `mapstructure:"url" json:"url,omitempty" validate:"required" default:"amqp://user:password@localhost:5672/"`
 }