Basic Authentication - #399

Code review points part #4.

Fix validation logic.

See <#399> for further information.

pkg/options/auth.go

@@ -45,21 +45,31 @@ type AuthOptions struct {
 	AuthUpstream AuthUpstream `json:"auth-upstream,omitempty" yaml:"auth-upstream,omitempty"`
 }
 
+func (o AuthOptions) Validate() error {
+	return validation.ValidateStruct(&o,
+		validation.Field(&o.Scheme, validation.In("basic")),
+		validation.Field(&o.AuthUpstream),
+	)
+}
+
 type AuthUpstream struct {
 	Host AuthUpstreamHost `json:"host,omitempty" yaml:"host,omitempty"`
 }
 
+func (o AuthUpstream) Validate() error {
+	return validation.ValidateStruct(&o,
+		validation.Field(&o.Host),
+	)
+}
+
 type AuthUpstreamHost struct {
 	Hostname string `json:"hostname,omitempty" yaml:"hostname,omitempty"`
 	Port     uint32 `json:"port,omitempty" yaml:"port,omitempty"`
 }
 
-func (o AuthOptions) Validate() error {
-	// Nothing to validate yet
-	// return nil
+func (o AuthUpstreamHost) Validate() error {
 	return validation.ValidateStruct(&o,
-		validation.Field(&o.Scheme, validation.In("basic")),
-		validation.Field(&o.AuthUpstream.Host.Hostname, is.Host),
-		validation.Field(&o.AuthUpstream.Host.Port, is.Port),
+		validation.Field(&o.Hostname, is.Host),
+		// validation.Field(&o.Port, is.Port), // Do not attempt to validate, otherwise this error, `port: must be either a string or byte slice` occurs.
 	)
 }