From 2c2a5c2cd0f50646d6240f8df729cb0dc1438f63 Mon Sep 17 00:00:00 2001 From: Steven Hartland Date: Fri, 1 Jul 2022 16:04:19 +0100 Subject: [PATCH] chore: remove go1.7 and below support (#623) Remove go1.7 support which hasn't been maintained for a long time now. --- redis/conn.go | 2 +- redis/go17.go | 29 ----------------------------- redis/go18.go | 9 --------- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 redis/go17.go delete mode 100644 redis/go18.go diff --git a/redis/conn.go b/redis/conn.go index 3695b843..753644b1 100644 --- a/redis/conn.go +++ b/redis/conn.go @@ -246,7 +246,7 @@ func DialContext(ctx context.Context, network, address string, options ...DialOp if do.tlsConfig == nil { tlsConfig = &tls.Config{InsecureSkipVerify: do.skipVerify} } else { - tlsConfig = cloneTLSConfig(do.tlsConfig) + tlsConfig = do.tlsConfig.Clone() } if tlsConfig.ServerName == "" { host, _, err := net.SplitHostPort(address) diff --git a/redis/go17.go b/redis/go17.go deleted file mode 100644 index 5f363791..00000000 --- a/redis/go17.go +++ /dev/null @@ -1,29 +0,0 @@ -// +build go1.7,!go1.8 - -package redis - -import "crypto/tls" - -func cloneTLSConfig(cfg *tls.Config) *tls.Config { - return &tls.Config{ - Rand: cfg.Rand, - Time: cfg.Time, - Certificates: cfg.Certificates, - NameToCertificate: cfg.NameToCertificate, - GetCertificate: cfg.GetCertificate, - RootCAs: cfg.RootCAs, - NextProtos: cfg.NextProtos, - ServerName: cfg.ServerName, - ClientAuth: cfg.ClientAuth, - ClientCAs: cfg.ClientCAs, - InsecureSkipVerify: cfg.InsecureSkipVerify, - CipherSuites: cfg.CipherSuites, - PreferServerCipherSuites: cfg.PreferServerCipherSuites, - ClientSessionCache: cfg.ClientSessionCache, - MinVersion: cfg.MinVersion, - MaxVersion: cfg.MaxVersion, - CurvePreferences: cfg.CurvePreferences, - DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled, - Renegotiation: cfg.Renegotiation, - } -} diff --git a/redis/go18.go b/redis/go18.go deleted file mode 100644 index 558363be..00000000 --- a/redis/go18.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build go1.8 - -package redis - -import "crypto/tls" - -func cloneTLSConfig(cfg *tls.Config) *tls.Config { - return cfg.Clone() -}