Merge branch 'ashmckenzie/dry-up-main' into 'master'

New config.LoadConfigFromFile() function

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141577



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Gavin Hinfey <ghinfey@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

workhorse/internal/config/config.go

@@ -162,6 +162,20 @@ func NewDefaultConfig() *Config {
 	}
 }
 
+func LoadConfigFromFile(file *string) (*Config, error) {
+	tomlData := ""
+
+	if *file != "" {
+		buf, err := os.ReadFile(*file)
+		if err != nil {
+			return nil, fmt.Errorf("file: %v", err)
+		}
+		tomlData = string(buf)
+	}
+
+	return LoadConfig(tomlData)
+}
+
 func LoadConfig(data string) (*Config, error) {
 	cfg := NewDefaultConfig()
 

workhorse/internal/config/config_test.go

 package config
 
 import (
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -196,3 +197,30 @@ func TestDefaultConfig(t *testing.T) {
 
 	require.Equal(t, uint64(250000), cfg.ImageResizerConfig.MaxFilesize)
 }
+
+func TestLoadConfigFromFile(t *testing.T) {
+	config := `
+[image_resizer]
+max_filesize = 350000
+`
+
+	fileName := createTempFile(t, []byte(config))
+
+	cfg, err := LoadConfigFromFile(&fileName)
+	require.NoError(t, err)
+
+	require.Equal(t, uint64(350000), cfg.ImageResizerConfig.MaxFilesize)
+}
+
+func createTempFile(t *testing.T, contents []byte) string {
+	t.Helper()
+
+	tmpFile, err := os.CreateTemp(t.TempDir(), "config.toml")
+	require.NoError(t, err)
+	defer tmpFile.Close()
+
+	_, err = tmpFile.Write(contents)
+	require.NoError(t, err)
+
+	return tmpFile.Name()
+}

workhorse/main.go

@@ -138,16 +138,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error
 		cfg.CableBackend = cfg.Backend
 	}
 
-	tomlData := ""
-	if *configFile != "" {
-		buf, err := os.ReadFile(*configFile)
-		if err != nil {
-			return nil, nil, fmt.Errorf("configFile: %v", err)
-		}
-		tomlData = string(buf)
-	}
-
-	cfgFromFile, err := config.LoadConfig(tomlData)
+	cfgFromFile, err := config.LoadConfigFromFile(configFile)
 	if err != nil {
 		return nil, nil, fmt.Errorf("configFile: %v", err)
 	}