add support password for scout redis config (#15)

* add support password for scout redis

README.md

@@ -17,7 +17,7 @@ USAGE:
    scout [global options] command [command options] [arguments...]
 
 VERSION:
-   v1.5.0
+   v1.6.0
 
 COMMANDS:
      help, h  Shows a list of commands or help for one command
@@ -43,6 +43,7 @@ redis:
   host: "localhost:9000"
   namespace: "test"
   queue: "background"
+  password: "someoptionalpassword"  # optional key
 aws:
   access_key: "super"
   secret_key: "secret"

config.go

@@ -20,6 +20,7 @@ type RedisConfig struct {
 	Host      string `yaml:"host"`
 	Namespace string `yaml:"namespace"`
 	Queue     string `yaml:"queue"`
+	Password  string `yaml:"password"`
 }
 
 // AWSConfig is a nested config that contains the necessary parameters to

config_test.go

@@ -62,6 +62,7 @@ func (c *ConfigTestSuite) TestConfig_Valid() {
 	// More to convince myself that the yaml package works than anything
 	c.assert.Equal(config.Redis.Host, "localhost:9000")
 	c.assert.Equal(config.Redis.Queue, "background")
+	c.assert.Equal(config.Redis.Password, "")
 	c.assert.Equal(config.AWS.Region, "us_best")
 	c.assert.Equal(config.Queue.Name, "myapp_queue")
 	c.assert.Equal(config.Queue.Topics["foo_topic"], "FooWorker")
@@ -85,3 +86,19 @@ func (c *ConfigTestSuite) TestConfig_Sparse() {
 	c.assert.Equal(config.AWS.Region, "us_best")
 	c.assert.Equal(len(config.Queue.Topics), 0)
 }
+
+var redisAuthConfig = `
+redis:
+  host: localhost:9000
+  password: jsdf3-402341234
+`
+
+// It's ok for stuff to be missing, we'll check that elsewhere
+func (c *ConfigTestSuite) TestConfig_RedisPass() {
+	c.WriteTemp(redisAuthConfig)
+	config, err := ReadConfig(c.tempfile.Name())
+	c.assert.NoError(err)
+
+	c.assert.Equal(config.Redis.Password, "jsdf3-402341234")
+	c.assert.Equal(config.Redis.Host, "localhost:9000")
+}

main.go

@@ -25,7 +25,7 @@ func init() {
 Poll SQS queues specified in a config and enqueue Sidekiq jobs with the queue items.
 It gracefully stops when sent SIGTERM.`
 
-	app.Version = "v1.5.0"
+	app.Version = "v1.6.0"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{

worker_client.go

@@ -27,13 +27,19 @@ func NewRedisWorkerClient(redis RedisConfig) (WorkerClient, error) {
 		return nil, errors.New("Sidekiq queue required")
 	}
 
-	workers.Configure(map[string]string{
+	workerConfig := map[string]string{
 		"server":    redis.Host,
 		"database":  "0",
 		"pool":      "20",
 		"process":   "1",
 		"namespace": redis.Namespace,
-	})
+	}
+
+	if redis.Password != "" {
+		workerConfig["password"] = redis.Password
+	}
+
+	workers.Configure(workerConfig)
 
 	return &redisWorkerClient{queue: redis.Queue}, nil
 }

worker_client_test.go

@@ -18,6 +18,7 @@ var config = RedisConfig{
 	Host:      "localhost:6379",
 	Namespace: "integration",
 	Queue:     "testq",
+	Password:  "",
 }
 
 func TestWorker_Init(t *testing.T) {
@@ -53,6 +54,18 @@ func TestWorker_Init(t *testing.T) {
 		},
 	)
 	require.NoError(t, err)
+
+	// use auth, this doesn't error
+	_, err = NewRedisWorkerClient(
+		RedisConfig{
+			Host:      "localhost:6379",
+			Namespace: "",
+			Queue:     "testq",
+			Password:  "1234",
+		},
+	)
+	require.NoError(t, err)
+
 }
 
 func TestWorker_Push(t *testing.T) {