From e875ac38a301cf0683da28be655498dc0909e462 Mon Sep 17 00:00:00 2001
From: Filipe Varela <filipe@monzo.com>
Date: Thu, 8 Jun 2017 09:26:53 +0100
Subject: [PATCH] Makes naming consistent with 'logical'

---
 physical/cassandra.go | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/physical/cassandra.go b/physical/cassandra.go
index e907709521..2f069c851d 100644
--- a/physical/cassandra.go
+++ b/physical/cassandra.go
@@ -160,24 +160,29 @@ func setupCassandraTLS(conf map[string]string, cluster *gocql.ClusterConfig) err
 		}
 	}
 
-	if insecureSkipVerifyStr, ok := conf["insecure_skip_verify"]; ok {
-		insecureSkipVerify, err := strconv.Atoi(insecureSkipVerifyStr)
+	if tlsSkipVerifyStr, ok := conf["tls_skip_verify"]; ok {
+		tlsSkipVerify, err := strconv.Atoi(tlsSkipVerifyStr)
 		if err != nil {
-			return fmt.Errorf("'insecure_tls_verify' must be an integer (0 or 1)")
+			return fmt.Errorf("'tls_skip_verify' must be an integer (0 or 1)")
 		}
-		if insecureSkipVerify == 0 {
+		if tlsSkipVerify == 0 {
 			tlsConfig.InsecureSkipVerify = false
 		} else {
 			tlsConfig.InsecureSkipVerify = true
 		}
 	}
 
-	if tlsMinVersionStr, ok := conf["tls_min_version"]; ok {
-		tlsMinVersion, err := strconv.Atoi(tlsMinVersionStr)
-		if err != nil {
-			return fmt.Errorf("'tls_min_version' must be an integer")
+	if tlsMinVersion, ok := conf["tls_min_version"]; ok {
+		switch tlsMinVersion {
+		case "tls10":
+			tlsConfig.MinVersion = tls.VersionTLS10
+		case "tls11":
+			tlsConfig.MinVersion = tls.VersionTLS11
+		case "tls12":
+			tlsConfig.MinVersion = tls.VersionTLS12
+		default:
+			return fmt.Errorf("'tls_min_version' must be one of `tls10`, `tls11` or `tls12`")
 		}
-		tlsConfig.MinVersion = uint16(tlsMinVersion)
 	}
 
 	cluster.SslOpts = &gocql.SslOptions{