more concise

drewda · drewda · commit 1a936f570d88 · 2025-04-25T14:47:12.000-07:00
diff --git a/request/http.go b/request/http.go
@@ -27,12 +27,9 @@ func (r *Http) SetSecret(secret dmfr.Secret) error {
 }
 
 func removeDefaultPortFromHost(req *http.Request) {
-	if req.URL.Scheme == "https" && strings.HasSuffix(req.URL.Host, ":443") {
-		host := strings.TrimSuffix(req.URL.Host, ":443")
-		req.Host = host
-	} else if req.URL.Scheme == "http" && strings.HasSuffix(req.URL.Host, ":80") {
-		host := strings.TrimSuffix(req.URL.Host, ":80")
-		req.Host = host
+	if (req.URL.Scheme == "https" && strings.HasSuffix(req.URL.Host, ":443")) ||
+		(req.URL.Scheme == "http" && strings.HasSuffix(req.URL.Host, ":80")) {
+		req.Host = strings.Split(req.URL.Host, ":")[0]
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,9 @@ func (r *Http) SetSecret(secret dmfr.Secret) error {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func removeDefaultPortFromHost(req *http.Request) {`
`30`		`- if req.URL.Scheme == "https" && strings.HasSuffix(req.URL.Host, ":443") {`
`31`		`- host := strings.TrimSuffix(req.URL.Host, ":443")`
`32`		`- req.Host = host`
`33`		`- } else if req.URL.Scheme == "http" && strings.HasSuffix(req.URL.Host, ":80") {`
`34`		`- host := strings.TrimSuffix(req.URL.Host, ":80")`
`35`		`- req.Host = host`
	`30`	`+ if (req.URL.Scheme == "https" && strings.HasSuffix(req.URL.Host, ":443")) \|\|`
	`31`	`+ (req.URL.Scheme == "http" && strings.HasSuffix(req.URL.Host, ":80")) {`
	`32`	`+ req.Host = strings.Split(req.URL.Host, ":")[0]`
`36`	`33`	`}`
`37`	`34`	`}`
`38`	`35`