From e158fecc41b58f357345ac3114592a429218dc3a Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 30 Jun 2022 16:26:59 -0400 Subject: [PATCH] 16552: Fix rebase error. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/service/tls.go | 3 --- 1 file changed, 3 deletions(-) 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) -- 2.30.2