refactor

api/datastore/datastore.go

@@ -5,9 +5,9 @@ import (
 	"net/url"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/iron-io/functions/api/datastore/bolt"
+	"github.com/iron-io/functions/api/datastore/postgres"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore/bolt"
-	"github.com/iron-io/functions/api/server/datastore/postgres"
 )
 
 func New(dbURL string) (models.Datastore, error) {

api/models/config.go

@@ -1,13 +1,6 @@
 package models
 
 type Config struct {
-	DatabaseURL string `json:"db"`
-	API         string `json:"api"`
-	Logging     struct {
-		To     string `json:"to"`
-		Level  string `json:"level"`
-		Prefix string `json:"prefix"`
-	}
 }
 
 func (c *Config) Validate() error {

api/server/apps_create.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,7 +9,6 @@ import (
 )
 
 func handleAppCreate(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	wapp := &models.AppWrapper{}
@@ -33,7 +32,7 @@ func handleAppCreate(c *gin.Context) {
 		return
 	}
 
-	app, err := store.StoreApp(wapp.App)
+	app, err := Api.Datastore.StoreApp(wapp.App)
 	if err != nil {
 		log.WithError(err).Debug(models.ErrAppsCreate)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsCreate))

api/server/apps_delete.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,11 +9,10 @@ import (
 )
 
 func handleAppDelete(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	appName := c.Param("app")
-	err := store.RemoveApp(appName)
+	err := Api.Datastore.RemoveApp(appName)
 
 	if err != nil {
 		log.WithError(err).Debug(models.ErrAppsRemoving)

api/server/apps_get.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,11 +9,10 @@ import (
 )
 
 func handleAppGet(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	appName := c.Param("app")
-	app, err := store.GetApp(appName)
+	app, err := Api.Datastore.GetApp(appName)
 
 	if err != nil {
 		log.WithError(err).Error(models.ErrAppsGet)

api/server/apps_list.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,12 +9,11 @@ import (
 )
 
 func handleAppList(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	filter := &models.AppFilter{}
 
-	apps, err := store.GetApps(filter)
+	apps, err := Api.Datastore.GetApps(filter)
 	if err != nil {
 		log.WithError(err).Debug(models.ErrAppsList)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsList))

api/server/apps_test.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"bytes"
@@ -6,12 +6,13 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/iron-io/functions/api/datastore"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore"
 )
 
 func TestAppCreate(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -51,7 +52,8 @@ func TestAppCreate(t *testing.T) {
 }
 
 func TestAppDelete(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -81,7 +83,8 @@ func TestAppDelete(t *testing.T) {
 }
 
 func TestAppList(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -110,7 +113,8 @@ func TestAppList(t *testing.T) {
 }
 
 func TestAppGet(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -139,7 +143,8 @@ func TestAppGet(t *testing.T) {
 }
 
 func TestAppUpdate(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string

api/server/apps_update.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,7 +9,6 @@ import (
 )
 
 func handleAppUpdate(c *gin.Context) {
-	// store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	app := &models.App{}
@@ -33,7 +32,7 @@ func handleAppUpdate(c *gin.Context) {
 		return
 	}
 
-	// app, err := store.StoreApp(wapp.App)
+	// app, err := Api.Datastore.StoreApp(wapp.App)
 	// if err != nil {
 	// 	log.WithError(err).Debug(models.ErrAppsCreate)
 	// 	c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsCreate))

api/server/helpers.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"encoding/json"
@@ -11,30 +11,15 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore"
 )
 
-func testRouter(ds models.Datastore, config *models.Config) *gin.Engine {
+func testRouter() *gin.Engine {
 	r := gin.Default()
 	r.Use(func(c *gin.Context) {
-		c.Set("store", ds)
 		c.Set("log", logrus.WithFields(logrus.Fields{}))
-		c.Set("config", config)
 		c.Next()
 	})
-	Start(r)
+	bindHandlers(r)
-	return r
-}
-
-func testRouterWithDefault() *gin.Engine {
-	r := gin.Default()
-	r.Use(func(c *gin.Context) {
-		c.Set("store", &datastore.Mock{})
-		c.Set("log", logrus.WithFields(logrus.Fields{}))
-		c.Set("config", &models.Config{})
-		c.Next()
-	})
-	Start(r)
 	return r
 }
 

api/server/ping.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"

api/server/router/router.go

@@ -1,38 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/iron-io/functions/api/models"
-)
-
-func Start(engine *gin.Engine) {
-	engine.GET("/", handlePing)
-	engine.GET("/version", handleVersion)
-
-	v1 := engine.Group("/v1")
-	{
-		v1.GET("/apps", handleAppList)
-		v1.POST("/apps", handleAppCreate)
-
-		v1.GET("/apps/:app", handleAppGet)
-		v1.PUT("/apps/:app", handleAppUpdate)
-		v1.DELETE("/apps/:app", handleAppDelete)
-
-		apps := v1.Group("/apps/:app")
-		{
-			apps.GET("/routes", handleRouteList)
-			apps.POST("/routes", handleRouteCreate)
-			apps.GET("/routes/:route", handleRouteGet)
-			apps.PUT("/routes/:route", handleRouteUpdate)
-			apps.DELETE("/routes/:route", handleRouteDelete)
-		}
-
-	}
-
-	engine.Any("/r/:app/*route", handleRunner)
-	engine.NoRoute(handleRunner)
-}
-
-func simpleError(err error) *models.Error {
-	return &models.Error{&models.ErrorBody{Message: err.Error()}}
-}

api/server/routes_create.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,7 +9,6 @@ import (
 )
 
 func handleRouteCreate(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	var wroute models.RouteWrapper
@@ -35,7 +34,7 @@ func handleRouteCreate(c *gin.Context) {
 		return
 	}
 
-	app, err := store.GetApp(wroute.Route.AppName)
+	app, err := Api.Datastore.GetApp(wroute.Route.AppName)
 	if err != nil {
 		log.WithError(err).Error(models.ErrAppsGet)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsGet))
@@ -49,7 +48,7 @@ func handleRouteCreate(c *gin.Context) {
 			return
 		}
 
-		app, err = store.StoreApp(newapp)
+		app, err = Api.Datastore.StoreApp(newapp)
 		if err != nil {
 			log.WithError(err).Error(models.ErrAppsCreate)
 			c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsCreate))
@@ -57,7 +56,7 @@ func handleRouteCreate(c *gin.Context) {
 		}
 	}
 
-	route, err := store.StoreRoute(wroute.Route)
+	route, err := Api.Datastore.StoreRoute(wroute.Route)
 	if err != nil {
 		log.WithError(err).Error(models.ErrRoutesCreate)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesCreate))

api/server/routes_delete.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,12 +9,11 @@ import (
 )
 
 func handleRouteDelete(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	appName := c.Param("app")
 	routeName := c.Param("route")
-	err := store.RemoveRoute(appName, routeName)
+	err := Api.Datastore.RemoveRoute(appName, routeName)
 
 	if err != nil {
 		log.WithError(err).Debug(models.ErrRoutesRemoving)

api/server/routes_get.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,13 +9,12 @@ import (
 )
 
 func handleRouteGet(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	appName := c.Param("app")
 	routeName := c.Param("route")
 
-	route, err := store.GetRoute(appName, routeName)
+	route, err := Api.Datastore.GetRoute(appName, routeName)
 	if err != nil {
 		log.WithError(err).Error(models.ErrRoutesGet)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesGet))

api/server/routes_list.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,7 +9,6 @@ import (
 )
 
 func handleRouteList(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	appName := c.Param("app")
@@ -18,7 +17,7 @@ func handleRouteList(c *gin.Context) {
 		AppName: appName,
 	}
 
-	routes, err := store.GetRoutes(filter)
+	routes, err := Api.Datastore.GetRoutes(filter)
 	if err != nil {
 		log.WithError(err).Error(models.ErrRoutesGet)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesGet))

api/server/routes_test.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"bytes"
@@ -6,12 +6,13 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/iron-io/functions/api/datastore"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore"
 )
 
 func TestRouteCreate(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -52,7 +53,8 @@ func TestRouteCreate(t *testing.T) {
 }
 
 func TestRouteDelete(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -82,7 +84,8 @@ func TestRouteDelete(t *testing.T) {
 }
 
 func TestRouteList(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -111,7 +114,8 @@ func TestRouteList(t *testing.T) {
 }
 
 func TestRouteGet(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -140,7 +144,8 @@ func TestRouteGet(t *testing.T) {
 }
 
 func TestRouteUpdate(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string

api/server/routes_update.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"
@@ -9,7 +9,6 @@ import (
 )
 
 func handleRouteUpdate(c *gin.Context) {
-	store := c.MustGet("store").(models.Datastore)
 	log := c.MustGet("log").(logrus.FieldLogger)
 
 	var wroute models.RouteWrapper
@@ -36,7 +35,7 @@ func handleRouteUpdate(c *gin.Context) {
 		return
 	}
 
-	route, err := store.StoreRoute(wroute.Route)
+	route, err := Api.Datastore.StoreRoute(wroute.Route)
 	if err != nil {
 		log.WithError(err).Debug(models.ErrAppsCreate)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsCreate))

api/server/runner.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"io/ioutil"
@@ -21,7 +21,6 @@ func handleRunner(c *gin.Context) {
 	}
 
 	log := c.MustGet("log").(logrus.FieldLogger)
-	store := c.MustGet("store").(models.Datastore)
 
 	var err error
 
@@ -64,7 +63,7 @@ func handleRunner(c *gin.Context) {
 
 	log.WithFields(logrus.Fields{"app": appName, "path": route}).Debug("Finding route on datastore")
 
-	routes, err := store.GetRoutes(filter)
+	routes, err := Api.Datastore.GetRoutes(filter)
 	if err != nil {
 		log.WithError(err).Error(models.ErrRoutesList)
 		c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesList))

api/server/runner_test.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"bytes"
@@ -6,12 +6,13 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/iron-io/functions/api/datastore"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore"
 )
 
 func TestRouteRunnerGet(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -43,7 +44,8 @@ func TestRouteRunnerGet(t *testing.T) {
 }
 
 func TestRouteRunnerPost(t *testing.T) {
-	router := testRouter(&datastore.Mock{}, &models.Config{})
+	New(&datastore.Mock{}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path          string
@@ -76,12 +78,13 @@ func TestRouteRunnerPost(t *testing.T) {
 }
 
 func TestRouteRunnerExecution(t *testing.T) {
-	router := testRouter(&datastore.Mock{
+	New(&datastore.Mock{
 		FakeRoutes: []*models.Route{
 			{Path: "/myroute", Image: "iron/hello", Headers: map[string][]string{"X-Function": []string{"Test"}}},
 			{Path: "/myerror", Image: "iron/error", Headers: map[string][]string{"X-Function": []string{"Test"}}},
 		},
 	}, &models.Config{})
+	router := testRouter()
 
 	for i, test := range []struct {
 		path            string

api/server/server.go

@@ -1,27 +1,28 @@
-package api
+package server
 
 import (
-	"fmt"
-	"os"
 	"path"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/iron-io/functions/api/models"
-	"github.com/iron-io/functions/api/server/datastore"
-	"github.com/iron-io/functions/api/server/router"
 )
 
+var Api *Server
+
 type Server struct {
-	router *gin.Engine
+	Router    *gin.Engine
-	cfg    *models.Config
+	Config    *models.Config
+	Datastore models.Datastore
 }
 
-func New(config *models.Config) *Server {
+func New(ds models.Datastore, config *models.Config) *Server {
-	return &Server{
+	Api = &Server{
-		router: gin.Default(),
+		Router:    gin.Default(),
-		cfg:    config,
+		Config:    config,
+		Datastore: ds,
 	}
+	return Api
 }
 
 func extractFields(c *gin.Context) logrus.Fields {
@@ -32,33 +33,46 @@ func extractFields(c *gin.Context) logrus.Fields {
 	return fields
 }
 
-func (s *Server) Start() {
+func (s *Server) Run() {
-	if s.cfg.DatabaseURL == "" {
+	s.Router.Use(func(c *gin.Context) {
-		cwd, _ := os.Getwd()
-		s.cfg.DatabaseURL = fmt.Sprintf("bolt://%s/bolt.db?bucket=funcs", cwd)
-	}
-
-	if s.cfg.API == "" {
-		s.cfg.API = "http://localhost:8080"
-	}
-
-	ds, err := datastore.New(s.cfg.DatabaseURL)
-	if err != nil {
-		logrus.WithError(err).Fatalln("Invalid DB url.")
-	}
-
-	logrus.SetOutput(os.Stdout)
-	logrus.SetLevel(logrus.DebugLevel)
-
-	s.router.Use(func(c *gin.Context) {
-		c.Set("config", s.cfg)
-		c.Set("store", ds)
 		c.Set("log", logrus.WithFields(extractFields(c)))
 		c.Next()
 	})
 
-	router.Start(s.router)
+	bindHandlers(s.Router)
 
 	// Default to :8080
-	s.router.Run()
+	s.Router.Run()
+}
+
+func bindHandlers(engine *gin.Engine) {
+	engine.GET("/", handlePing)
+	engine.GET("/version", handleVersion)
+
+	v1 := engine.Group("/v1")
+	{
+		v1.GET("/apps", handleAppList)
+		v1.POST("/apps", handleAppCreate)
+
+		v1.GET("/apps/:app", handleAppGet)
+		v1.PUT("/apps/:app", handleAppUpdate)
+		v1.DELETE("/apps/:app", handleAppDelete)
+
+		apps := v1.Group("/apps/:app")
+		{
+			apps.GET("/routes", handleRouteList)
+			apps.POST("/routes", handleRouteCreate)
+			apps.GET("/routes/:route", handleRouteGet)
+			apps.PUT("/routes/:route", handleRouteUpdate)
+			apps.DELETE("/routes/:route", handleRouteDelete)
+		}
+
+	}
+
+	engine.Any("/r/:app/*route", handleRunner)
+	engine.NoRoute(handleRunner)
+}
+
+func simpleError(err error) *models.Error {
+	return &models.Error{&models.ErrorBody{Message: err.Error()}}
 }

api/server/version.go

@@ -1,4 +1,4 @@
-package router
+package server
 
 import (
 	"net/http"

main.go

@@ -8,24 +8,45 @@ For keeping a minimum running, perhaps when doing a routing table update, if des
 package main
 
 import (
+	"fmt"
 	"os"
+	"strings"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/iron-io/functions/api/datastore"
 	"github.com/iron-io/functions/api/models"
 	"github.com/iron-io/functions/api/server"
+	"github.com/iron-io/titan/common"
+	"github.com/spf13/viper"
 )
 
 func main() {
 	config := &models.Config{}
-	config.DatabaseURL = os.Getenv("DB")
+
-	config.API = os.Getenv("API")
+	InitConfig()
+	common.SetLogLevel(viper.GetString("log_level"))
 
 	err := config.Validate()
 	if err != nil {
 		log.WithError(err).Fatalln("Invalid config.")
 	}
-	log.Printf("config: %+v", config)
 
-	srv := api.New(config)
+	ds, err := datastore.New(viper.GetString("db"))
-	srv.Start()
+	if err != nil {
+		log.WithError(err).Fatalln("Invalid DB url.")
+	}
+
+	srv := server.New(ds, config)
+	srv.Run()
+}
+
+func InitConfig() {
+	cwd, _ := os.Getwd()
+	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	viper.SetDefault("log_level", "info")
+	viper.SetDefault("db", fmt.Sprintf("bolt://%s/bolt.db?bucket=funcs", cwd))
+	viper.SetConfigName("config")
+	viper.AddConfigPath(".")
+	viper.AutomaticEnv() // picks up env vars automatically
+	viper.ReadInConfig()
 }