[MM-57743] Enable errcheck linter (#26723)

server/config/file_test.go

@@ -37,7 +37,8 @@ func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) {
 		cfgData, err := marshalConfig(cfg)
 		require.NoError(t, err)
 
-		os.WriteFile(f.Name(), cfgData, 0644)
+		err = os.WriteFile(f.Name(), cfgData, 0644)
+		require.NoError(t, err)
 
 		name = f.Name()
 	}
@@ -94,7 +95,8 @@ func assertFileNotEqualsConfig(t *testing.T, expectedCfg *model.Config, path str
 }
 
 func TestFileStoreNew(t *testing.T) {
-	utils.TranslationsPreInit()
+	err := utils.TranslationsPreInit()
+	require.NoError(t, err)
 
 	t.Run("absolute path, initialization required", func(t *testing.T) {
 		path, tearDown := setupConfigFile(t, testConfig)
@@ -221,7 +223,8 @@ func TestFileStoreNew(t *testing.T) {
 		cfgData, err := marshalConfig(testConfig)
 		require.NoError(t, err)
 
-		os.WriteFile(path, cfgData, 0644)
+		err = os.WriteFile(path, cfgData, 0644)
+		require.NoError(t, err)
 
 		fs, err := NewFileStore(path, false)
 		require.NoError(t, err)
@@ -811,7 +814,8 @@ func TestFileStoreLoad(t *testing.T) {
 		cfgData, err := marshalConfig(invalidConfig)
 		require.NoError(t, err)
 
-		os.WriteFile(path, cfgData, 0644)
+		err = os.WriteFile(path, cfgData, 0644)
+		require.NoError(t, err)
 
 		err = fs.Load()
 		if assert.Error(t, err) {

server/config/utils.go

@@ -104,14 +104,11 @@ func fixConfig(cfg *model.Config) {
 		}
 	}
 
-	FixInvalidLocales(cfg)
+	fixInvalidLocales(cfg)
 }
 
-// FixInvalidLocales checks and corrects the given config for invalid locale-related settings.
-//
-// Ideally, this function would be completely internal, but it's currently exposed to allow the cli
-// to test the config change before allowing the save.
-func FixInvalidLocales(cfg *model.Config) bool {
+// fixInvalidLocales checks and corrects the given config for invalid locale-related settings.
+func fixInvalidLocales(cfg *model.Config) bool {
 	var changed bool
 
 	locales := i18n.GetSupportedLocales()

server/config/utils_test.go

@@ -80,7 +80,9 @@ func TestDesanitize(t *testing.T) {
 }
 
 func TestFixInvalidLocales(t *testing.T) {
-	utils.TranslationsPreInit()
+	// utils.TranslationsPreInit errors when TestFixInvalidLocales is run as part of testing the package,
+	// but doesn't error when the test is run individually.
+	_ = utils.TranslationsPreInit()
 
 	cfg := &model.Config{}
 	cfg.SetDefaults()
@@ -89,39 +91,39 @@ func TestFixInvalidLocales(t *testing.T) {
 	*cfg.LocalizationSettings.DefaultClientLocale = "en"
 	*cfg.LocalizationSettings.AvailableLocales = ""
 
-	changed := FixInvalidLocales(cfg)
+	changed := fixInvalidLocales(cfg)
 	assert.False(t, changed)
 
 	*cfg.LocalizationSettings.DefaultServerLocale = "junk"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "en", *cfg.LocalizationSettings.DefaultServerLocale)
 
 	*cfg.LocalizationSettings.DefaultServerLocale = ""
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "en", *cfg.LocalizationSettings.DefaultServerLocale)
 
 	*cfg.LocalizationSettings.AvailableLocales = "en"
 	*cfg.LocalizationSettings.DefaultServerLocale = "de"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.False(t, changed)
 	assert.NotContains(t, *cfg.LocalizationSettings.AvailableLocales, *cfg.LocalizationSettings.DefaultServerLocale, "DefaultServerLocale should not be added to AvailableLocales")
 
 	*cfg.LocalizationSettings.AvailableLocales = ""
 	*cfg.LocalizationSettings.DefaultClientLocale = "junk"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "en", *cfg.LocalizationSettings.DefaultClientLocale)
 
 	*cfg.LocalizationSettings.DefaultClientLocale = ""
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "en", *cfg.LocalizationSettings.DefaultClientLocale)
 
 	*cfg.LocalizationSettings.AvailableLocales = "en"
 	*cfg.LocalizationSettings.DefaultClientLocale = "de"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Contains(t, *cfg.LocalizationSettings.AvailableLocales, *cfg.LocalizationSettings.DefaultServerLocale, "DefaultClientLocale should have been added to AvailableLocales")
 
@@ -129,19 +131,19 @@ func TestFixInvalidLocales(t *testing.T) {
 	*cfg.LocalizationSettings.DefaultServerLocale = "en"
 	*cfg.LocalizationSettings.DefaultClientLocale = "en"
 	*cfg.LocalizationSettings.AvailableLocales = "junk"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "", *cfg.LocalizationSettings.AvailableLocales)
 
 	*cfg.LocalizationSettings.AvailableLocales = "en,de,junk"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.Equal(t, "", *cfg.LocalizationSettings.AvailableLocales)
 
 	*cfg.LocalizationSettings.DefaultServerLocale = "fr"
 	*cfg.LocalizationSettings.DefaultClientLocale = "de"
 	*cfg.LocalizationSettings.AvailableLocales = "en"
-	changed = FixInvalidLocales(cfg)
+	changed = fixInvalidLocales(cfg)
 	assert.True(t, changed)
 	assert.NotContains(t, *cfg.LocalizationSettings.AvailableLocales, *cfg.LocalizationSettings.DefaultServerLocale, "DefaultServerLocale should not be added to AvailableLocales")
 	assert.Contains(t, *cfg.LocalizationSettings.AvailableLocales, *cfg.LocalizationSettings.DefaultClientLocale, "DefaultClientLocale should have been added to AvailableLocales")