Merge branch 'caddy-v2'

crypto_test.go

@@ -10,7 +10,7 @@ import (
 func TestRedisStorage_EncryptDecryptStorageData(t *testing.T) {
 	testDate := time.Now()
 	rd := new(RedisStorage)
-	rd.getConfigValue()
+	rd.GetConfigValue()
 
 	sd := &StorageData{
 		Value:    []byte("crt data"),

storageredis.go

@@ -244,16 +244,16 @@ func (rd *RedisStorage) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 func (rd *RedisStorage) Provision(ctx caddy.Context) error {
 	rd.Logger = ctx.Logger(rd).Sugar()
-	rd.getConfigValue()
+	rd.GetConfigValue()
 	rd.Logger.Info("TLS Storage are using Redis, on " + rd.Address)
-	if err := rd.buildRedisClient(); err != nil {
+	if err := rd.BuildRedisClient(); err != nil {
 		return err
 	}
 	return nil
 }
 
-// getConfigValue get Config value from env, if already been set by Caddyfile, don't overwrite
-func (rd *RedisStorage) getConfigValue() {
+// GetConfigValue get Config value from env, if already been set by Caddyfile, don't overwrite
+func (rd *RedisStorage) GetConfigValue() {
 	if host := os.Getenv(EnvNameRedisHost); host != "" && rd.Host == "" {
 		rd.Host = host
 	} else {
@@ -344,7 +344,7 @@ func (rd *RedisStorage) prefixKey(key string) string {
 }
 
 // GetRedisStorage build RedisStorage with it's client
-func (rd *RedisStorage) buildRedisClient() error {
+func (rd *RedisStorage) BuildRedisClient() error {
 	redisClient := redis.NewClient(&redis.Options{
 		Addr:         rd.Address,
 		Password:     rd.Password,

storageredis_test.go

@@ -18,8 +18,8 @@ func setupRedisEnv(t *testing.T) *RedisStorage {
 	os.Setenv(EnvNameRedisDB, "9")
 
 	rd := new(RedisStorage)
-	rd.getConfigValue()
-	err := rd.buildRedisClient()
+	rd.GetConfigValue()
+	err := rd.BuildRedisClient()
 
 	// skip test if no redis storage
 	if err != nil {