From 7033028a0b50d44e54d892a4803a97a639ff5109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 22 Feb 2024 12:37:34 +0100 Subject: [PATCH] Worker: use explicit type when writing config file Instead of passing an arbitrary string ("Configuration" or "Credentials"), use an explicit type for this. This will make it possible to have the config-writing functions behave slightly differently depending on which configuration type is being written. No functional changes. --- internal/worker/config.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/worker/config.go b/internal/worker/config.go index 2bd2d33f..7d1d8b00 100644 --- a/internal/worker/config.go +++ b/internal/worker/config.go @@ -31,6 +31,13 @@ var ( configFilename = "flamenco-worker.yaml" ) +type configFileType string + +var ( + configFileTypeConfiguration configFileType = "Configuration" + configFileTypeCredentials configFileType = "Credentials" +) + var defaultConfig = WorkerConfig{ ConfiguredManager: "", // Auto-detect by default. TaskTypes: []string{"blender", "ffmpeg", "file-management", "misc"}, @@ -102,7 +109,7 @@ func (fcw *FileConfigWrangler) WorkerConfig() (WorkerConfig, error) { } func (fcw *FileConfigWrangler) SaveConfig() error { - err := fcw.writeConfig(configFilename, "Configuration", fcw.wc) + err := fcw.writeConfig(configFilename, configFileTypeConfiguration, fcw.wc) if err != nil { return fmt.Errorf("writing to %s: %w", configFilename, err) } @@ -135,7 +142,7 @@ func (fcw *FileConfigWrangler) SaveCredentials(creds WorkerCredentials) error { return err } - err = fcw.writeConfig(filepath, "Credentials", creds) + err = fcw.writeConfig(filepath, configFileTypeCredentials, creds) if err != nil { return fmt.Errorf("writing to %s: %w", filepath, err) } @@ -158,7 +165,7 @@ func (fcw FileConfigWrangler) DefaultConfig() WorkerConfig { } // WriteConfig stores a struct as YAML file. -func (fcw FileConfigWrangler) writeConfig(filename string, filetype string, config interface{}) error { +func (fcw FileConfigWrangler) writeConfig(filename string, filetype configFileType, config interface{}) error { data, err := yaml.Marshal(config) if err != nil { return err