Merge pull request #1290 from 18F/pdb/rm_redis_service

Remove redis service pieces

Author: jcscottiii

Gopkg.lock

@@ -39,8 +39,8 @@ navigate to `http://localhost:8001` and see the testing server.
 ## Full Setup
 
 After running the Full Setup instructions, you will have a
-local Cloud Foundry deployment (with UAA), the dashboard, a redis service
-instance, mailcatcher for testing e-mails, and npm watch running so that you can
+local Cloud Foundry deployment (with UAA), the dashboard,
+mailcatcher for testing e-mails, and npm watch running so that you can
 automatically recompile your frontend changes.
 
 ### Full Setup: Requirements

devtools/docker-setup.md

@@ -7,8 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/url"
-	"os"
 
 	"github.com/cloudfoundry-community/go-cfenv"
 	"github.com/gorilla/sessions"
@@ -179,70 +177,3 @@ func (s *Settings) InitSettings(envVars *env.VarSet, app *cfenv.App) (retErr err
 	s.TICSecret = envVars.String(TICSecretEnvVar, "")
 	return nil
 }
-
-func getRedisSettings(env *cfenv.App) (string, string, error) {
-	var err error
-	// Try to read directly from REDIS_URI first.
-	uri := os.Getenv("REDIS_URI")
-	if uri == "" {
-		// If no direct REDIS_URI, parse VCAP_SERVICES
-		uri, err = getRedisService(env)
-	}
-	// If nothing worked so far, default to localhost
-	if uri == "" || err != nil {
-		uri = "redis://localhost:6379"
-	}
-
-	u, err := url.Parse(uri)
-	if err != nil {
-		return "", "", err
-	}
-
-	password := ""
-	if u.User != nil {
-		password, _ = u.User.Password()
-	}
-
-	return u.Host, password, nil
-}
-
-func getRedisService(env *cfenv.App) (string, error) {
-	if env == nil {
-		return "", errors.New("Empty Cloud Foundry environment")
-	}
-	services, err := env.Services.WithTag("redis")
-	if err != nil {
-		return "", err
-	}
-	if len(services) == 0 {
-		return "", errors.New(`Could not find service with tag "redis"`)
-	}
-	uri, ok := services[0].Credentials["uri"].(string)
-	if !ok {
-		if uri, err = getRedisURIFromParts(services[0]); err == nil {
-			return uri, nil
-		}
-		return "", errors.New("Could not parse redis uri")
-	}
-	return uri, nil
-}
-
-// TODO: Delete after east-west is retired
-func getRedisURIFromParts(service cfenv.Service) (string, error) {
-	host, ok := service.Credentials["hostname"].(string)
-	if !ok {
-		return "", errors.New(`Could not find "host" key`)
-	}
-
-	port, ok := service.Credentials["port"].(string)
-	if !ok {
-		return "", errors.New(`Could not find "port" key`)
-	}
-
-	password, ok := service.Credentials["password"].(string)
-	if !ok {
-		return "", errors.New(`Could not find "password" key`)
-	}
-
-	return fmt.Sprintf("redis://:%s@%s:%s", password, host, port), nil
-}

glide.lock

@@ -52,7 +52,7 @@ func skipIfNoDocker(t *testing.T) {
 	}
 }
 
-// CreateTestMailCatcher creates a actual redis instance with docker.
+// CreateTestMailCatcher creates a actual MailCatcher instance with docker.
 // Useful for unit tests.
 func CreateTestMailCatcher(t *testing.T) (string, string, string, func()) {
 	skipIfNoDocker(t)

glide.yaml

@@ -3,7 +3,6 @@ buildpack: go_buildpack
 memory: 256M
 services:
 - dashboard-ups
-- dashboard-redis
 env:
   SECURE_COOKIES: true
   GA_TRACKING_ID: UA-48605964-34