Set a default value for ATHENS_MONGO_CONNECTION_STRING env var (gomod…

…s#580)

* Set a default value for ATHENS_MONGO_CONNECTION_STRING env var

- ATHENS_MONGO_CONNECTION_STRING will default to mongodb://127.0.0.1:27017 if not set

* Fix Get function call

* Update user of env.MongoConnectionString

.travis.yml

@@ -10,7 +10,6 @@ env:
     - GO_ENV=test
     - MINIO_ACCESS_KEY=minio
     - MINIO_SECRET_KEY=minio123
-    - ATHENS_MONGO_CONNECTION_STRING=mongodb://127.0.0.1:27017
     - CODE_COV=1
     - ATHENS_DIR=${GOPATH}/src/github.com/gomods/athens
     - REGISTRY=gomods/

cmd/olympus/.env

@@ -1,2 +1 @@
-ATHENS_MONGO_CONNECTION_STRING=mongodb://127.0.0.1:27017
 PORT=:3001

cmd/olympus/actions/actions_test.go

@@ -24,10 +24,7 @@ func Test_ActionSuite(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error creating storage (%s)", err)
 	}
-	mURI, err := env.MongoConnectionString()
-	if err != nil {
-		t.Fatalf("error getting mongo uri (%s)", err)
-	}
+	mURI := env.MongoConnectionString()
 	certPath := env.MongoCertPath()
 	eLog, err := mongo.NewLog(mURI, certPath)
 	if err != nil {

cmd/olympus/actions/eventlog.go

@@ -8,21 +8,15 @@ import (
 
 // GetEventLog returns implementation of eventlog.EventLog
 func GetEventLog() (eventlog.Eventlog, error) {
-	connectionString, err := env.MongoConnectionString()
-	if err != nil {
-		return nil, err
-	}
+	connectionString := env.MongoConnectionString()
 	certPath := env.MongoCertPath()
 	l, err := mongo.NewLog(connectionString, certPath)
 	return l, err
 }
 
 // NewCacheMissesLog returns impl. of eventlog.Appender
 func NewCacheMissesLog() (eventlog.Appender, error) {
-	connectionString, err := env.MongoConnectionString()
-	if err != nil {
-		return nil, err
-	}
+	connectionString := env.MongoConnectionString()
 	certPath := env.MongoCertPath()
 	l, err := mongo.NewLogWithCollection(connectionString, certPath, "cachemisseslog")
 	return l, err

cmd/olympus/actions/storage.go

@@ -28,10 +28,7 @@ func GetStorage() (storage.Backend, error) {
 		}
 		return s, nil
 	case "mongo":
-		connectionString, err := env.MongoConnectionString()
-		if err != nil {
-			return nil, err
-		}
+		connectionString := env.MongoConnectionString()
 		certPath := env.MongoCertPath()
 		return mongo.NewStorageWithCert(connectionString, certPath)
 	default:

cmd/proxy/.env

@@ -1,3 +1,2 @@
-ATHENS_MONGO_CONNECTION_STRING=mongodb://127.0.0.1:27017
 ATHENS_STORAGE_TYPE=mongo
 GO_ENV=test

cmd/proxy/actions/storage.go

@@ -25,11 +25,7 @@ func GetStorage() (storage.Backend, error) {
 	case "memory":
 		return mem.NewStorage()
 	case "mongo":
-		connectionString, err := env.MongoConnectionString()
-		if err != nil {
-			return nil, err
-		}
-
+		connectionString := env.MongoConnectionString()
 		certPath := env.MongoCertPath()
 		return mongo.NewStorageWithCert(connectionString, certPath)
 	case "disk":

pkg/config/env/mongo.go

@@ -9,13 +9,8 @@ import (
 )
 
 // MongoConnectionString returns Athens Mongo Storage connection string defined by ATHENS_MONGO_CONNECTION_STRING
-func MongoConnectionString() (string, error) {
-	env, err := envy.MustGet("ATHENS_MONGO_CONNECTION_STRING")
-	if err != nil {
-		return "", fmt.Errorf("missing mongo connection string: %s", err)
-	}
-
-	return env, nil
+func MongoConnectionString() string {
+	return envy.Get("ATHENS_MONGO_CONNECTION_STRING", "mongodb://127.0.0.1:27017")
 }
 
 // MongoCertPath returns Athens Mongo Storage cert path string defined by ATHENS_MONGO_CERT_PATH

pkg/storage/mongo/mongo_test.go

@@ -4,7 +4,7 @@ import "github.com/gomods/athens/pkg/config/env"
 
 func (m *MongoTests) TestNewMongoStorage() {
 	r := m.Require()
-	muri, err := env.MongoConnectionString()
+	muri := env.MongoConnectionString()
 	certPath := env.MongoCertPath()
 	getterSaver, err := NewStorageWithCert(muri, certPath)
 

pkg/storage/mongo/test_suite.go

@@ -28,10 +28,7 @@ func NewTestSuite(model *suite.Model) (storage.TestSuite, error) {
 }
 
 func newTestStore() (*ModuleStore, error) {
-	muri, err := env.MongoConnectionString()
-	if err != nil {
-		return nil, err
-	}
+	muri := env.MongoConnectionString()
 	certPath := env.MongoCertPath()
 	mongoStore, err := NewStorageWithCert(muri, certPath)
 	if err != nil {
@@ -53,10 +50,7 @@ func (ts *TestSuite) StorageHumanReadableName() string {
 
 // Cleanup tears down test
 func (ts *TestSuite) Cleanup() error {
-	muri, err := env.MongoConnectionString()
-	if err != nil {
-		return err
-	}
+	muri := env.MongoConnectionString()
 	timeout := env.MongoConnectionTimeoutSecWithDefault(1)
 	s, err := mgo.DialWithTimeout(muri, timeout)
 	defer s.Close()

scripts/test_unit.sh

@@ -2,10 +2,6 @@
 
 # test_unit.sh
 
-if [ -z ${ATHENS_MONGO_CONNECTION_STRING} ]; then
-    export ATHENS_MONGO_CONNECTION_STRING="mongodb://127.0.0.1:27017"
-fi
-
 if [ -z ${GO_ENV} ]; then
     export GO_ENV="test"
 fi