From d1e77f132ff7a6713fb83992d560633779956714 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Wed, 26 Apr 2017 23:52:03 -0300 Subject: [PATCH] Remove helper required in go < 1.8 --- core/pkg/ingress/annotations/authreq/main.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/core/pkg/ingress/annotations/authreq/main.go b/core/pkg/ingress/annotations/authreq/main.go index 016cc26247..8b156766e1 100644 --- a/core/pkg/ingress/annotations/authreq/main.go +++ b/core/pkg/ingress/annotations/authreq/main.go @@ -131,22 +131,10 @@ func (a authReq) Parse(ing *extensions.Ingress) (interface{}, error) { return &External{ URL: str, - Host: stripPort(ur.Host), + Host: ur.Hostname(), SigninURL: signin, Method: m, SendBody: sb, ResponseHeaders: h, }, nil } - -// TODO: Remove after upgrade to Go 1.8 -func stripPort(hostport string) string { - colon := strings.IndexByte(hostport, ':') - if colon == -1 { - return hostport - } - if i := strings.IndexByte(hostport, ']'); i != -1 { - return strings.TrimPrefix(hostport[:i], "[") - } - return hostport[:colon] -}