pass tls config options to redis cluster init

TykTechnologies · Mar 21, 2018 · 329c7fb · 329c7fb
1 parent 1c90a43
commit 329c7fb
Show file tree

Hide file tree

Showing 40 changed files with 6,662 additions and 302 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/config/config.go b/config/config.go
@@ -32,16 +32,18 @@ type DBAppConfOptionsConfig struct {
 }
 
 type StorageOptionsConf struct {
-	Type          string            `json:"type"`
-	Host          string            `json:"host"`
-	Port          int               `json:"port"`
-	Hosts         map[string]string `json:"hosts"`
-	Username      string            `json:"username"`
-	Password      string            `json:"password"`
-	Database      int               `json:"database"`
-	MaxIdle       int               `json:"optimisation_max_idle"`
-	MaxActive     int               `json:"optimisation_max_active"`
-	EnableCluster bool              `json:"enable_cluster"`
+	Type                  string            `json:"type"`
+	Host                  string            `json:"host"`
+	Port                  int               `json:"port"`
+	Hosts                 map[string]string `json:"hosts"`
+	Username              string            `json:"username"`
+	Password              string            `json:"password"`
+	Database              int               `json:"database"`
+	MaxIdle               int               `json:"optimisation_max_idle"`
+	MaxActive             int               `json:"optimisation_max_active"`
+	EnableCluster         bool              `json:"enable_cluster"`
+	UseSSL                bool              `json:"use_ssl"`
+	SSLInsecureSkipVerify bool              `json:"ssl_insecure_skip_verify"`
 }
 
 type NormalisedURLConfig struct {

diff --git a/lint/schema.go b/lint/schema.go
@@ -15,6 +15,12 @@ const confSchema = `{
 			"enable_cluster": {
 				"type": "boolean"
 			},
+			"use_ssl":{
+				"type": "boolean"
+			},
+			"ssl_insecure_skip_verify":{
+				"type": "boolean"
+			},
 			"host": {
 				"type": "string",
 				"format": "host-no-port"

diff --git a/storage/redis_cluster.go b/storage/redis_cluster.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
-	"github.com/lonelycode/redigocluster/rediscluster"
 	"github.com/satori/go.uuid"
 
+	"github.com/TykTechnologies/redigocluster/rediscluster"
 	"github.com/TykTechnologies/tyk/config"
 )
 
@@ -115,12 +115,14 @@ func NewRedisClusterPool(isCache bool) *rediscluster.RedisCluster {
 	}
 
 	poolConf := rediscluster.PoolConfig{
-		MaxIdle:     maxIdle,
-		MaxActive:   maxActive,
-		IdleTimeout: 240 * time.Second,
-		Database:    cfg.Database,
-		Password:    cfg.Password,
-		IsCluster:   cfg.EnableCluster,
+		MaxIdle:       maxIdle,
+		MaxActive:     maxActive,
+		IdleTimeout:   240 * time.Second,
+		Database:      cfg.Database,
+		Password:      cfg.Password,
+		IsCluster:     cfg.EnableCluster,
+		UseTLS:        cfg.UseSSL,
+		TLSSkipVerify: cfg.SSLInsecureSkipVerify,
 	}
 
 	seed_redii := []map[string]string{}

diff --git a/vendor/github.com/TykTechnologies/gojsonschema/LICENSE-APACHE-2.0.txt b/vendor/github.com/TykTechnologies/gojsonschema/LICENSE-APACHE-2.0.txt