Don't return errors.Wrap() directly if the error could be nil

lippserd · lippserd · commit f1bb16e66450 · 2024-10-22T16:24:04.000+02:00
diff --git a/config/config.go b/config/config.go
@@ -70,7 +70,11 @@ func FromEnv(v Validator, options EnvOptions) error {
 		return errors.Wrap(err, "can't parse environment variables")
 	}
 
-	return errors.Wrap(v.Validate(), "invalid configuration")
+	if err := v.Validate(); err != nil {
+		return errors.Wrap(err, "invalid configuration")
+	}
+
+	return nil
 }
 
 // ParseFlags parses CLI flags and stores the result

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,11 @@ func FromEnv(v Validator, options EnvOptions) error {`
`70`	`70`	`return errors.Wrap(err, "can't parse environment variables")`
`71`	`71`	`}`
`72`	`72`
`73`		`- return errors.Wrap(v.Validate(), "invalid configuration")`
	`73`	`+ if err := v.Validate(); err != nil {`
	`74`	`+ return errors.Wrap(err, "invalid configuration")`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ return nil`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`// ParseFlags parses CLI flags and stores the result`