From d1fbe8b9f9f243c152bd25a268f20a47385c938e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 8 Mar 2024 16:44:39 +0100
Subject: [PATCH] Manager: set default MQTT topic prefix to 'flamenco'

Set the default MQTT topic prefix to 'flamenco'. It can still be overridden
by the config in the YAML file, but it's nice to have a sensible default
when people don't configure this.
---
 internal/manager/config/defaults.go      | 8 ++++++++
 internal/manager/eventbus/mqtt_client.go | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go
index da4619eb..24031e25 100644
--- a/internal/manager/config/defaults.go
+++ b/internal/manager/config/defaults.go
@@ -4,6 +4,7 @@ import (
 	"runtime"
 	"time"
 
+	"projects.blender.org/studio/flamenco/internal/manager/eventbus"
 	shaman_config "projects.blender.org/studio/flamenco/pkg/shaman/config"
 )
 
@@ -39,6 +40,13 @@ var defaultConfig = Conf{
 
 		BlocklistThreshold:         3,
 		TaskFailAfterSoftFailCount: 3,
+
+		MQTT: MQTTConfig{
+			Client: eventbus.MQTTClientConfig{
+				ClientID:    eventbus.MQTTDefaultClientID,
+				TopicPrefix: eventbus.MQTTDefaultTopicPrefix,
+			},
+		},
 	},
 
 	Variables: map[string]Variable{
diff --git a/internal/manager/eventbus/mqtt_client.go b/internal/manager/eventbus/mqtt_client.go
index d361084a..50ef496e 100644
--- a/internal/manager/eventbus/mqtt_client.go
+++ b/internal/manager/eventbus/mqtt_client.go
@@ -18,7 +18,9 @@ import (
 )
 
 const (
-	defaultClientID   = "flamenco"
+	MQTTDefaultTopicPrefix = "flamenco"
+	MQTTDefaultClientID    = "flamenco"
+
 	keepAlive         = 30 // seconds
 	connectRetryDelay = 10 * time.Second
 
@@ -63,7 +65,7 @@ func NewMQTTForwarder(config MQTTClientConfig) *MQTTForwarder {
 		return nil
 	}
 	if config.ClientID == "" {
-		config.ClientID = defaultClientID
+		config.ClientID = MQTTDefaultClientID
 	}
 
 	brokerURL, err := url.Parse(config.BrokerURL)