From: Tom Clegg <tom@curii.com>
Date: Thu, 30 Jun 2022 20:26:59 +0000 (-0400)
Subject: 16552: Fix rebase error.
X-Git-Tag: 2.5.0~116^2~12
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e158fecc41b58f357345ac3114592a429218dc3a

16552: Fix rebase error.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/service/tls.go b/lib/service/tls.go
index 21cd3e2ac2..234ee57878 100644
--- a/lib/service/tls.go
+++ b/lib/service/tls.go
@@ -75,9 +75,6 @@ func makeFileLoaderConfig(cluster *arvados.Cluster, logger logrus.FieldLogger) (
 
 	key := strings.TrimPrefix(cluster.TLS.Key, "file://")
 	cert := strings.TrimPrefix(cluster.TLS.Certificate, "file://")
-	if !strings.HasPrefix(key, "file://") || !strings.HasPrefix(cert, "file://") {
-	}
-	key, cert = key[7:], cert[7:]
 
 	update := func() error {
 		cert, err := tls.LoadX509KeyPair(cert, key)