Remove environment.Environment struct

This commit completely removes the environment struct as it is no longer
used.

internal/config/legacy/stringparser/parse.go

@@ -4,14 +4,13 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/FAU-CDI/wisski-distillery/pkg/environment"
 	"github.com/pkg/errors"
 )
 
 var errUnknownParser = errors.New("unknown parser")
 
 // Parse parses the provided value with the parser.
-func Parse(env environment.Environment, name, value string, vField reflect.Value) error {
+func Parse(name, value string, vField reflect.Value) error {
 
 	// use the validator
 	parser, ok := knownParsers[strings.ToLower(name)]
@@ -20,7 +19,7 @@ func Parse(env environment.Environment, name, value string, vField reflect.Value
 	}
 
 	// get the parsed value
-	checked, err := parser(env, value)
+	checked, err := parser(value)
 	if err != nil {
 		return err
 	}
@@ -58,8 +57,8 @@ var knownParsers map[string]Parser[any] = map[string]Parser[any]{
 }
 
 func asGenericParser[T any](parser Parser[T]) Parser[any] {
-	return func(env environment.Environment, s string) (value any, err error) {
-		value, err = parser(env, s)
+	return func(s string) (value any, err error) {
+		value, err = parser(s)
 		return
 	}
 }

internal/config/legacy/stringparser/stringparser.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/FAU-CDI/wisski-distillery/pkg/environment"
 	"github.com/FAU-CDI/wisski-distillery/pkg/fsx"
 	"github.com/pkg/errors"
 )
@@ -20,10 +19,10 @@ import (
 // Parsers can be found in this package as functions called Parse*.
 // They are refered to by their name, e.g. ParseNonempty can be refered to by the name 'Nonempty'.
 // See [Parse].
-type Parser[T any] func(env environment.Environment, s string) (T, error)
+type Parser[T any] func(s string) (T, error)
 
 // ParseAbspath checks that s is an absolute path and returns it as-is
-func ParseAbspath(env environment.Environment, s string) (string, error) {
+func ParseAbspath(s string) (string, error) {
 	if !fsx.IsDirectory(s) {
 		return "", errors.Errorf("%q does not exist or is not a directory", s)
 	}
@@ -31,7 +30,7 @@ func ParseAbspath(env environment.Environment, s string) (string, error) {
 }
 
 // ParseFile checks that s is a valid file and returns it as-is
-func ParseFile(env environment.Environment, s string) (string, error) {
+func ParseFile(s string) (string, error) {
 	if !fsx.IsFile(s) {
 		return "", errors.Errorf("%q does not exist or is not a regular file", s)
 	}
@@ -41,7 +40,7 @@ func ParseFile(env environment.Environment, s string) (string, error) {
 var errEmptyString = errors.New("value is empty")
 
 // ParseNonEmpty checks that s is a non-empty string and returns it as-is
-func ParseNonEmpty(env environment.Environment, s string) (string, error) {
+func ParseNonEmpty(s string) (string, error) {
 	if s == "" {
 		return "", errEmptyString
 	}
@@ -51,7 +50,7 @@ func ParseNonEmpty(env environment.Environment, s string) (string, error) {
 var regexpDomain = regexp.MustCompile(`^([a-zA-Z0-9][-a-zA-Z0-9]*\.)*[a-zA-Z0-9][-a-zA-Z0-9]*$`) // TODO: Make this regexp nicer!
 
 // ParseValidDomain checks that s is a valid domain and returns it in lowercase
-func ParseValidDomain(env environment.Environment, s string) (string, error) {
+func ParseValidDomain(s string) (string, error) {
 	if !regexpDomain.MatchString(s) {
 		return "", errors.Errorf("%q is not a valid domain", s)
 	}
@@ -59,7 +58,7 @@ func ParseValidDomain(env environment.Environment, s string) (string, error) {
 }
 
 // ParseValidDomains checks that s is a comma-seperated list of valid domains and returns them in lower case
-func ParseValidDomains(env environment.Environment, s string) ([]string, error) {
+func ParseValidDomains(s string) ([]string, error) {
 	if len(s) == 0 {
 		return []string{}, nil
 	}
@@ -73,19 +72,19 @@ func ParseValidDomains(env environment.Environment, s string) ([]string, error)
 }
 
 // ParseNumber parses s as a decimal integer
-func ParseNumber(env environment.Environment, s string) (int, error) {
+func ParseNumber(s string) (int, error) {
 	value, err := strconv.ParseInt(s, 10, 64)
 	return int(value), err
 }
 
 // ParsePort parses s as a port
-func ParsePort(env environment.Environment, s string) (uint16, error) {
+func ParsePort(s string) (uint16, error) {
 	value, err := strconv.ParseUint(s, 10, 16)
 	return uint16(value), err
 }
 
 // ParseHttpsURL parses a string into a url that starts with 'https://'
-func ParseHttpsURL(env environment.Environment, s string) (*url.URL, error) {
+func ParseHttpsURL(s string) (*url.URL, error) {
 	url, err := url.Parse(s)
 	if err != nil {
 		return nil, errors.Wrapf(err, "%q is not a valid URL", s)
@@ -99,7 +98,7 @@ func ParseHttpsURL(env environment.Environment, s string) (*url.URL, error) {
 var regexpEmail = regexp.MustCompile(`^([-a-zA-Z0-9]+)\@([a-zA-Z0-9][-a-zA-Z0-9]*\.)*[a-zA-Z0-9][-a-zA-Z0-9]*$`) // TODO: Make this regexp nicer!
 
 // ParseEmail checks that s represents an email, and then returns it as is.
-func ParseEmail(env environment.Environment, s string) (string, error) {
+func ParseEmail(s string) (string, error) {
 	if s == "" { // no email provided
 		return "", nil
 	}
@@ -112,7 +111,7 @@ func ParseEmail(env environment.Environment, s string) (string, error) {
 var regexpSlug = regexp.MustCompile(`^[a-zA-Z0-9][-a-zA-Z0-9]*$`) // TODO: Make this regexp nicer!
 
 // ParseSlug parses s as a slug and returns it as is.
-func ParseSlug(env environment.Environment, s string) (string, error) {
+func ParseSlug(s string) (string, error) {
 	if !regexpSlug.MatchString(s) {
 		return "", errors.Errorf("%q is not a valid slug", s)
 	}
@@ -120,6 +119,6 @@ func ParseSlug(env environment.Environment, s string) (string, error) {
 }
 
 // ParseDuration parses a time.Duration
-func ParseDuration(env environment.Environment, s string) (time.Duration, error) {
+func ParseDuration(s string) (time.Duration, error) {
 	return time.ParseDuration(s)
 }