Maint: do not mock os functions

- Use filepaths with /tmp for tests instead
- Only mock functions where filepath can't be specified such as user.Lookup

internal/configuration/health.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/qdm12/golibs/logging"
-	"github.com/qdm12/golibs/os"
 	"github.com/qdm12/golibs/params"
 )
 
@@ -33,8 +32,8 @@ func (settings *Health) lines() (lines []string) {
 }
 
 // Read is to be used for the healthcheck query mode.
-func (settings *Health) Read(env params.Env, os os.OS, logger logging.Logger) (err error) {
-	reader := newReader(env, os, logger)
+func (settings *Health) Read(env params.Env, logger logging.Logger) (err error) {
+	reader := newReader(env, logger)
 	return settings.read(reader)
 }
 

internal/configuration/reader.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/qdm12/golibs/logging"
-	"github.com/qdm12/golibs/os"
 	"github.com/qdm12/golibs/params"
 	"github.com/qdm12/golibs/verification"
 )
@@ -17,15 +16,13 @@ type reader struct {
 	env    params.Env
 	logger logging.Logger
 	regex  verification.Regex
-	os     os.OS
 }
 
-func newReader(env params.Env, os os.OS, logger logging.Logger) reader {
+func newReader(env params.Env, logger logging.Logger) reader {
 	return reader{
 		env:    env,
 		logger: logger,
 		regex:  verification.NewRegex(),
-		os:     os,
 	}
 }
 

internal/configuration/secrets.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"os"
 	"strings"
 
-	"github.com/qdm12/golibs/os"
 	"github.com/qdm12/golibs/params"
 )
 
@@ -48,7 +48,7 @@ func (r *reader) getFromEnvOrSecretFile(envKey string, compulsory bool, retroKey
 			ErrGetSecretFilepath, secretFilepathEnvKey, err)
 	}
 
-	file, fileErr := r.os.OpenFile(filepath, os.O_RDONLY, 0)
+	file, fileErr := os.OpenFile(filepath, os.O_RDONLY, 0)
 	if os.IsNotExist(fileErr) {
 		if compulsory {
 			return "", envErr
@@ -85,7 +85,7 @@ func (r *reader) getFromFileOrSecretFile(secretName, filepath string) (
 		return b, fmt.Errorf("environment variable %s: %w: %s", key, ErrGetSecretFilepath, err)
 	}
 
-	b, err = readFromFile(r.os.OpenFile, secretFilepath)
+	b, err = readFromFile(secretFilepath)
 	if err != nil && !os.IsNotExist(err) {
 		return b, fmt.Errorf("%w: %s", ErrReadSecretFile, err)
 	} else if err == nil {
@@ -93,7 +93,7 @@ func (r *reader) getFromFileOrSecretFile(secretName, filepath string) (
 	}
 
 	// Secret file does not exist, try the non secret file
-	b, err = readFromFile(r.os.OpenFile, filepath)
+	b, err = readFromFile(filepath)
 	if err != nil && !os.IsNotExist(err) {
 		return nil, fmt.Errorf("%w: %s", ErrReadSecretFile, err)
 	} else if err == nil {
@@ -102,8 +102,8 @@ func (r *reader) getFromFileOrSecretFile(secretName, filepath string) (
 	return nil, fmt.Errorf("%w: %s and %s", ErrFilesDoNotExist, secretFilepath, filepath)
 }
 
-func readFromFile(openFile os.OpenFileFunc, filepath string) (b []byte, err error) {
-	file, err := openFile(filepath, os.O_RDONLY, 0)
+func readFromFile(filepath string) (b []byte, err error) {
+	file, err := os.Open(filepath)
 	if err != nil {
 		return nil, err
 	}

internal/configuration/settings.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/qdm12/golibs/logging"
-	"github.com/qdm12/golibs/os"
 	"github.com/qdm12/golibs/params"
 )
 
@@ -62,8 +61,8 @@ var (
 
 // Read obtains all configuration options for the program and returns an error as soon
 // as an error is encountered reading them.
-func (settings *Settings) Read(env params.Env, os os.OS, logger logging.Logger) (err error) {
-	r := newReader(env, os, logger)
+func (settings *Settings) Read(env params.Env, logger logging.Logger) (err error) {
+	r := newReader(env, logger)
 
 	settings.VersionInformation, err = r.env.OnOff("VERSION_INFORMATION", params.Default("on"))
 	if err != nil {