CLEANUP/MINOR: restructure redirect creation for clarity

* Split host and ssl redirects conceptually, as they do distinct
  things.  The ssl redirect does not look at the host setting
  when redirecting.

Author: BuJo

pkg/haproxy/rules/reqRequestRedirect.go

@@ -26,21 +26,39 @@ func (r RequestRedirect) Create(client api.HAProxyClient, frontend *models.Front
 	if frontend.Mode == "tcp" {
 		return errors.New("request redirection cannot be configured in TCP mode")
 	}
-	var rule string
+	var httpRule models.HTTPRequestRule
 	if r.SSLRedirect {
-		rule = fmt.Sprintf("https://%%[hdr(host),field(1,:)]:%d%%[capture.req.uri]", r.RedirectPort)
+		httpRule = r.sslRedirect()
 	} else {
-		scheme := "http"
-		if r.SSLRequest {
-			scheme = "https"
-		}
-		rule = fmt.Sprintf(scheme+"://%s%%[capture.req.uri]", r.Host)
+		httpRule = r.hostRedirect()
 	}
+
+	return client.FrontendHTTPRequestRuleCreate(0, frontend.Name, httpRule, ingressACL)
+}
+
+func (r RequestRedirect) sslRedirect() models.HTTPRequestRule {
+	rule := fmt.Sprintf("https://%%[hdr(host),field(1,:)]:%d%%[capture.req.uri]", r.RedirectPort)
 	httpRule := models.HTTPRequestRule{
 		Type:       "redirect",
 		RedirCode:  utils.PtrInt64(r.RedirectCode),
 		RedirValue: rule,
 		RedirType:  "location",
 	}
-	return client.FrontendHTTPRequestRuleCreate(0, frontend.Name, httpRule, ingressACL)
+
+	return httpRule
+}
+
+func (r RequestRedirect) hostRedirect() models.HTTPRequestRule {
+	scheme := "http"
+	if r.SSLRequest {
+		scheme = "https"
+	}
+	rule := fmt.Sprintf(scheme+"://%s%%[capture.req.uri]", r.Host)
+	httpRule := models.HTTPRequestRule{
+		Type:       "redirect",
+		RedirCode:  utils.PtrInt64(r.RedirectCode),
+		RedirValue: rule,
+		RedirType:  "location",
+	}
+	return httpRule
 }