From fae2d93525a381b7b494baf10d6deb4afd9a9966 Mon Sep 17 00:00:00 2001
From: Manuel Zapf <manuel@containo.us>
Date: Thu, 16 Jul 2020 17:18:03 +0200
Subject: [PATCH] Get Entrypoints Port Address without protocol for redirect

---
 .../fixtures/redirection_with_protocol.json   | 30 +++++++++++++++++++
 pkg/provider/traefik/internal.go              |  2 +-
 pkg/provider/traefik/internal_test.go         | 22 ++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkg/provider/traefik/fixtures/redirection_with_protocol.json

diff --git a/pkg/provider/traefik/fixtures/redirection_with_protocol.json b/pkg/provider/traefik/fixtures/redirection_with_protocol.json
new file mode 100644
index 000000000..4ffbb756c
--- /dev/null
+++ b/pkg/provider/traefik/fixtures/redirection_with_protocol.json
@@ -0,0 +1,30 @@
+{
+  "http": {
+    "routers": {
+      "web-to-websecure": {
+        "entryPoints": [
+          "web"
+        ],
+        "middlewares": [
+          "redirect-web-to-websecure"
+        ],
+        "service": "noop@internal",
+        "rule": "HostRegexp(`{host:.+}`)"
+      }
+    },
+    "middlewares": {
+      "redirect-web-to-websecure": {
+        "redirectScheme": {
+          "scheme": "https",
+          "port": "443",
+          "permanent": true
+        }
+      }
+    },
+    "services": {
+      "noop": {}
+    }
+  },
+  "tcp": {},
+  "tls": {}
+}
\ No newline at end of file
diff --git a/pkg/provider/traefik/internal.go b/pkg/provider/traefik/internal.go
index a63a2f49b..4c341f56b 100644
--- a/pkg/provider/traefik/internal.go
+++ b/pkg/provider/traefik/internal.go
@@ -142,7 +142,7 @@ func (i *Provider) getEntryPointPort(name string, def *static.Redirections) (str
 		return "", fmt.Errorf("'to' entry point field references a non-existing entry point: %s", def.EntryPoint.To)
 	}
 
-	_, port, err := net.SplitHostPort(dst.Address)
+	_, port, err := net.SplitHostPort(dst.GetAddress())
 	if err != nil {
 		return "", fmt.Errorf("invalid entry point %q address %q: %w",
 			name, i.staticCfg.EntryPoints[def.EntryPoint.To].Address, err)
diff --git a/pkg/provider/traefik/internal_test.go b/pkg/provider/traefik/internal_test.go
index dd6ef8c6a..b9e0af9c4 100644
--- a/pkg/provider/traefik/internal_test.go
+++ b/pkg/provider/traefik/internal_test.go
@@ -232,6 +232,28 @@ func Test_createConfiguration(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc: "redirection_with_protocol.json",
+			staticCfg: static.Configuration{
+				EntryPoints: map[string]*static.EntryPoint{
+					"web": {
+						Address: ":80",
+						HTTP: static.HTTPConfig{
+							Redirections: &static.Redirections{
+								EntryPoint: &static.RedirectEntryPoint{
+									To:        "websecure",
+									Scheme:    "https",
+									Permanent: true,
+								},
+							},
+						},
+					},
+					"websecure": {
+						Address: ":443/tcp",
+					},
+				},
+			},
+		},
 	}
 
 	for _, test := range testCases {