fix merge issue

Project-Faster · Sep 16, 2024 · d049503 · d049503
1 parent 051c569
commit d049503
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 568 deletions.
diff --git a/logger/logger_darwin_test.go b/logger/logger_darwin_test.go
diff --git a/shared/configuration/params_validation.go b/shared/configuration/params_validation.go
@@ -1,8 +1,8 @@
 package configuration
 
 import (
-	"github.com/parvit/qpep/shared/errors"
-	"github.com/parvit/qpep/shared/logger"
+	"github.com/Project-Faster/qpep/shared/errors"
+	"github.com/Project-Faster/qpep/shared/logger"
 	"net"
 	"sort"
 	"strconv"

diff --git a/shared/configuration/params_validation_test.go b/shared/configuration/params_validation_test.go
@@ -2,7 +2,7 @@ package configuration
 
 import (
 	"fmt"
-	"github.com/parvit/qpep/shared/errors"
+	"github.com/Project-Faster/qpep/shared/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 	"math/rand"

diff --git a/shared/configuration/qpep_config.go b/shared/configuration/qpep_config.go
@@ -11,7 +11,7 @@ package configuration
 import (
 	"errors"
 	"fmt"
-	"github.com/parvit/qpep/shared/logger"
+	"github.com/Project-Faster/qpep/shared/logger"
 	"gopkg.in/yaml.v3"
 	"io"
 	"os"
@@ -245,9 +245,6 @@ func WriteConfigurationOverrideFile(override QPepConfigType) {
 		}
 	}()
 
-	if len(values) == 0 {
-		return
-	}
 	data, err := yaml.Marshal(override)
 	if err != nil {
 		logger.Error("Could not read expected configuration file: %v", err)

diff --git a/shared/configuration/qpep_config_patch_test.go b/shared/configuration/qpep_config_patch_test.go
@@ -1,6 +1,6 @@
 //go:build !arm64
 
-package shared
+package configuration
 
 import (
 	"errors"
@@ -79,7 +79,7 @@ func (s *QPepConfigSuite) TestWriteConfigurationOverrideFile_PanicError() {
 	})
 	defer guard.Unpatch()
 
-	WriteConfigurationOverrideFile(nil)
+	WriteConfigurationOverrideFile(QPepConfigType{})
 }
 
 func (s *QPepConfigSuite) TestWriteConfigurationOverrideFile_MarshalError() {
@@ -92,9 +92,10 @@ func (s *QPepConfigSuite) TestWriteConfigurationOverrideFile_MarshalError() {
 	})
 	defer guard.Unpatch()
 
-	WriteConfigurationOverrideFile(map[string]string{
-		"test": "10",
-	})
+	config := QPepConfigType{}
+	config.Merge(&DefaultConfig)
+
+	WriteConfigurationOverrideFile(config)
 	_, err := os.Stat(expectUserFile)
 	assert.Nil(s.T(), err)
 }