Fix tls/password usage when selecting a db, add new acceptance test

Author: yannh

acceptance-tests/acceptance.bats

@@ -16,6 +16,11 @@
  [ "$status" -eq 0 ]
 }
 
+@test "Pass when using a non-default db, and a password" {
+ run tests/select-db-with-password.sh
+ [ "$status" -eq 0 ]
+}
+
 # https://github.com/yannh/redis-dump-go/issues/11
 # https://github.com/yannh/redis-dump-go/issues/18
 @test "Pass when importing a ZSET with 1M entries" {

acceptance-tests/entrypoint.sh

@@ -7,4 +7,4 @@ echo "-> Waiting for Redis to start..."
 timeout 30 sh -c 'until redis-cli -h redis -p 6379 PING >/dev/null; do sleep 1; done'
 
 echo "-> Running acceptance tests..."
-bats --tap acceptance.bats
+bats --tap acceptance.bats --verbose-run

docker-compose.yml

@@ -5,6 +5,16 @@ services:
  image: "redis:alpine"
  ports:
  - "6379:6379"
+ redis_secure:
+ image: "redis:alpine"
+ volumes:
+ - ./acceptance-tests/redis-confs:/usr/local/etc/redis
+ ports:
+ - target: 6380
+ published: 6380
+ protocol: tcp
+ mode: host
+ entrypoint: ["/usr/local/bin/redis-server", "/usr/local/etc/redis/with_password.conf"]
  tests:
  image: "alpine:latest"
  volumes:
@@ -13,5 +23,6 @@ services:
  - ./bin/redis-dump-go:/redis-dump-go
  depends_on:
  - "redis"
+ - "redis_secure"
  working_dir: /acceptance-tests
  entrypoint: ["/acceptance-tests/entrypoint.sh"]

pkg/redisdump/redisdump.go

@@ -263,8 +263,17 @@ func parseKeyspaceInfo(keyspaceInfo string) ([]uint8, error) {
 return dbs, nil
 }
 
-func getDBIndexes(redisURL string) ([]uint8, error) {
-client, err := radix.NewPool("tcp", redisURL, 1)
+func getDBIndexes(redisURL string, redisPassword string, tlsHandler *TlsHandler) ([]uint8, error) {
+customConnFunc := func(network, addr string) (radix.Conn, error) {
+dialOpts, err := redisDialOpts(redisPassword, tlsHandler, nil)
+if err != nil {
+return nil, err
+}
+
+return radix.Dial(network, addr, dialOpts...)
+}
+
+client, err := radix.NewPool("tcp", redisURL, 1, radix.PoolConnFunc(customConnFunc))
 if err != nil {
 return nil, err
 }
@@ -331,7 +340,7 @@ func RedisURL(redisHost string, redisPort string) string {
 return fmt.Sprintf("redis://%s:%s", redisHost, redisPort)
 }
 
-func redisDialOpts(redisPassword string, tlsHandler *TlsHandler, db uint8) ([]radix.DialOpt, error) {
+func redisDialOpts(redisPassword string, tlsHandler *TlsHandler, db *uint8) ([]radix.DialOpt, error) {
 dialOpts := []radix.DialOpt{
 radix.DialTimeout(5 * time.Minute),
 }
@@ -346,7 +355,9 @@ func redisDialOpts(redisPassword string, tlsHandler *TlsHandler, db uint8) ([]ra
 dialOpts = append(dialOpts, radix.DialUseTLS(tlsCfg))
 }
 
-dialOpts = append(dialOpts, radix.DialSelectDB(int(db)))
+if db != nil {
+dialOpts = append(dialOpts, radix.DialSelectDB(int(*db)))
+}
 
 return dialOpts, nil
 }
@@ -371,7 +382,7 @@ func DumpDB(redisHost string, redisPort int, redisPassword string, tlsHandler *T
 
 redisURL := RedisURL(redisHost, fmt.Sprint(redisPort))
 customConnFunc := func(network, addr string) (radix.Conn, error) {
-dialOpts, err := redisDialOpts(redisPassword, tlsHandler, *db)
+dialOpts, err := redisDialOpts(redisPassword, tlsHandler, db)
 if err != nil {
 return nil, err
 }
@@ -411,7 +422,7 @@ func DumpDB(redisHost string, redisPort int, redisPassword string, tlsHandler *T
 // are regularly sent to the channel progressNotifications
 func DumpServer(redisHost string, redisPort int, redisPassword string, tlsHandler *TlsHandler, filter string, nWorkers int, withTTL bool, batchSize int, noscan bool, logger *log.Logger, serializer func([]string) string, progress chan<- ProgressNotification) error {
 url := RedisURL(redisHost, fmt.Sprint(redisPort))
-dbs, err := getDBIndexes(url)
+dbs, err := getDBIndexes(url, redisPassword, tlsHandler)
 if err != nil {
 return err
 }

pkg/redisdump/redisdump_test.go

@@ -261,7 +261,7 @@ func TestRedisDialOpts(t *testing.T) {
 nil,
 },
 } {
-dOpts, err := redisDialOpts(testCase.redisPassword, testCase.tlsHandler, testCase.db)
+dOpts, err := redisDialOpts(testCase.redisPassword, testCase.tlsHandler, &testCase.db)
 if err != testCase.err {
 t.Errorf("expected error to be %+v, got %+v", testCase.err, err)
 }