chore(config): upgrade to gosettings v0.4.0

- drop qdm12/govalid dependency
- upgrade qdm12/ss-server to v0.6.0
- do not unset sensitive config settings (makes no sense to me)

internal/httpserver/settings_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/qdm12/govalid/address"
+	"github.com/qdm12/gosettings/validate"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -98,68 +98,6 @@ func Test_Settings_Copy(t *testing.T) {
 	}
 }
 
-func Test_Settings_MergeWith(t *testing.T) {
-	t.Parallel()
-
-	someHandler := http.NewServeMux()
-	someLogger := &testLogger{}
-
-	testCases := map[string]struct {
-		settings Settings
-		other    Settings
-		expected Settings
-	}{
-		"merge empty with empty": {},
-		"merge empty with filled": {
-			other: Settings{
-				Address:           ":8001",
-				Handler:           someHandler,
-				Logger:            someLogger,
-				ReadHeaderTimeout: time.Second,
-				ReadTimeout:       time.Second,
-				ShutdownTimeout:   time.Second,
-			},
-			expected: Settings{
-				Address:           ":8001",
-				Handler:           someHandler,
-				Logger:            someLogger,
-				ReadHeaderTimeout: time.Second,
-				ReadTimeout:       time.Second,
-				ShutdownTimeout:   time.Second,
-			},
-		},
-		"merge filled with empty": {
-			settings: Settings{
-				Address:           ":8001",
-				Handler:           someHandler,
-				Logger:            someLogger,
-				ReadHeaderTimeout: time.Second,
-				ReadTimeout:       time.Second,
-				ShutdownTimeout:   time.Second,
-			},
-			expected: Settings{
-				Address:           ":8001",
-				Handler:           someHandler,
-				Logger:            someLogger,
-				ReadHeaderTimeout: time.Second,
-				ReadTimeout:       time.Second,
-				ShutdownTimeout:   time.Second,
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			testCase.settings.MergeWith(testCase.other)
-
-			assert.Equal(t, testCase.expected, testCase.settings)
-		})
-	}
-}
-
 func Test_Settings_OverrideWith(t *testing.T) {
 	t.Parallel()
 
@@ -257,12 +195,12 @@ func Test_Settings_Validate(t *testing.T) {
 		errWrapped error
 		errMessage string
 	}{
-		"bad address": {
+		"bad_address": {
 			settings: Settings{
-				Address: "noport",
+				Address: "address:notanint",
 			},
-			errWrapped: address.ErrValueNotValid,
-			errMessage: "value is not valid: address noport: missing port in address",
+			errWrapped: validate.ErrPortNotAnInteger,
+			errMessage: "port value is not an integer: notanint",
 		},
 		"nil handler": {
 			settings: Settings{
@@ -332,7 +270,7 @@ func Test_Settings_Validate(t *testing.T) {
 			err := testCase.settings.Validate()
 
 			assert.ErrorIs(t, err, testCase.errWrapped)
-			if err != nil {
+			if testCase.errMessage != "" {
 				assert.EqualError(t, err, testCase.errMessage)
 			}
 		})