remove lock

arrays_test.go

@@ -197,7 +197,7 @@ func TestArrayContainsIgnoreCase(t *testing.T) {
 		},
 		{
 			keys:   []string{"asiakas", "bar"},
-			value:  "IN-asiaskasfoo",
+			value:  "IN-asiakasfoo",
 			result: true,
 			name:   "asiakas in value",
 		},

request_test.go

@@ -68,11 +68,13 @@ func TestMakeRequestMock(t *testing.T) {
 		MaxRetries: 1,
 	}
 
+	helloWorld := `{"hello":"world"}`
+
 	client := &MockClient{
 		DoFunc: func(req *http.Request) (*http.Response, error) {
 			return &http.Response{
 				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader(`{"hello":"world"}`)),
+				Body:       io.NopCloser(strings.NewReader(helloWorld)),
 			}, nil
 		},
 	}
@@ -90,6 +92,6 @@ func TestMakeRequestMock(t *testing.T) {
 		backoff,
 	)
 	require.NoError(t, err)
-	assert.Equal(t, `{"hello":"world"}`, body.Body)
+	assert.Equal(t, helloWorld, string(body.Body))
 	assert.Equal(t, 200, body.StatusCode)
 }

utils.go

@@ -11,7 +11,6 @@ import (
 	"reflect"
 	"runtime"
 	"strings"
-	"sync"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/getsentry/sentry-go"
@@ -103,22 +102,16 @@ func RemoveDot(input string) string {
 	return input
 }
 
-type ConfigLock struct {
-	lock sync.Mutex
-}
-
 // LoadAndListenConfig loads config file to struct and listen changes in it.
-func LoadAndListenConfig(path string, l *ConfigLock, obj interface{}, onUpdate func(oldObj interface{})) error {
+func LoadAndListenConfig(path string, obj interface{}, onUpdate func(oldObj interface{})) error {
 	v := viper.New()
 	v.SetConfigFile(path)
 	if err := v.ReadInConfig(); err != nil {
 		return fmt.Errorf("unable to read config: %w", err)
 	}
-	l.lock.Lock()
 	if err := v.Unmarshal(&obj); err != nil {
 		return fmt.Errorf("unable to marshal config: %w", err)
 	}
-	l.lock.Unlock()
 	log.Info().
 		Str("path", v.ConfigFileUsed()).
 		Msg("config loaded")
@@ -127,13 +120,11 @@ func LoadAndListenConfig(path string, l *ConfigLock, obj interface{}, onUpdate f
 			Str("path", e.Name).
 			Msg("config reloaded")
 		oldObj := reflect.Indirect(reflect.ValueOf(obj)).Interface()
-		l.lock.Lock()
 		if err := v.Unmarshal(&obj); err != nil {
 			log.Fatal().
 				Str("path", e.Name).
 				Msgf("unable to marshal config: %v", err)
 		}
-		l.lock.Unlock()
 		if onUpdate != nil {
 			onUpdate(oldObj)
 		}

utils_test.go

@@ -72,12 +72,12 @@ type Config struct {
 }
 
 func TestLoadAndListenConfig_NonExistingFile(t *testing.T) {
-	err := LoadAndListenConfig("invalid.yaml", &ConfigLock{}, &Config{}, nil)
+	err := LoadAndListenConfig("invalid.yaml", &Config{}, nil)
 	assert.ErrorContains(t, err, "no such file or directory")
 }
 
 func TestLoadAndListenConfig_InvalidSyntax(t *testing.T) {
-	err := LoadAndListenConfig("testdata/invalid.yaml", &ConfigLock{}, &Config{}, nil)
+	err := LoadAndListenConfig("testdata/invalid.yaml", &Config{}, nil)
 	assert.ErrorContains(t, err, "invalid syntax")
 }
 
@@ -115,16 +115,13 @@ func TestLoadAndListenConfigOnUpdate(t *testing.T) {
 	require.NoError(t, err)
 
 	realConf := &Config{}
-	l := &ConfigLock{}
 	values := &UpdateValues{}
 	notifyFn, waitForUpdate := updateCallbacks()
-	err = LoadAndListenConfig(filePath, l, realConf, func(oldConf interface{}) {
+	err = LoadAndListenConfig(filePath, realConf, func(oldConf interface{}) {
 		values.Set(1, oldConf, notifyFn)
 	})
 	require.NoError(t, err)
-	l.lock.Lock()
 	assert.Equal(t, 0, realConf.Index)
-	l.lock.Unlock()
 	assert.Equal(t, 0, values.GetOldValue())
 	assert.Equal(t, 0, values.GetUpdateCalls())
 
@@ -136,9 +133,7 @@ func TestLoadAndListenConfigOnUpdate(t *testing.T) {
 	require.NoError(t, err)
 
 	waitForUpdate(t)
-	l.lock.Lock()
 	assert.Equal(t, 1, realConf.Index)
-	l.lock.Unlock()
 	assert.Equal(t, 0, values.GetOldValue())
 	assert.Equal(t, 1, values.GetUpdateCalls())
 
@@ -150,9 +145,7 @@ func TestLoadAndListenConfigOnUpdate(t *testing.T) {
 	require.NoError(t, err)
 
 	waitForUpdate(t)
-	l.lock.Lock()
 	assert.Equal(t, 2, realConf.Index)
-	l.lock.Unlock()
 	assert.Equal(t, 1, values.GetOldValue())
 	assert.Equal(t, 2, values.GetUpdateCalls())
 }