diff --git a/api/server/routes_test.go b/api/server/routes_test.go index b1e38bc9c..31a8d2c18 100644 --- a/api/server/routes_test.go +++ b/api/server/routes_test.go @@ -11,7 +11,7 @@ import ( ) func TestRouteCreate(t *testing.T) { - New(&models.Config{}, &datastore.Mock{}, testRunner(t)) + New(&datastore.Mock{}, testRunner(t)) router := testRouter() for i, test := range []struct { @@ -52,7 +52,7 @@ func TestRouteCreate(t *testing.T) { } func TestRouteDelete(t *testing.T) { - New(&models.Config{}, &datastore.Mock{}, testRunner(t)) + New(&datastore.Mock{}, testRunner(t)) router := testRouter() for i, test := range []struct { @@ -83,7 +83,7 @@ func TestRouteDelete(t *testing.T) { } func TestRouteList(t *testing.T) { - New(&models.Config{}, &datastore.Mock{}, testRunner(t)) + New(&datastore.Mock{}, testRunner(t)) router := testRouter() for i, test := range []struct { @@ -113,7 +113,7 @@ func TestRouteList(t *testing.T) { } func TestRouteGet(t *testing.T) { - New(&models.Config{}, &datastore.Mock{}, testRunner(t)) + New(&datastore.Mock{}, testRunner(t)) router := testRouter() for i, test := range []struct { @@ -143,7 +143,7 @@ func TestRouteGet(t *testing.T) { } func TestRouteUpdate(t *testing.T) { - New(&models.Config{}, &datastore.Mock{}, testRunner(t)) + New(&datastore.Mock{}, testRunner(t)) router := testRouter() for i, test := range []struct { diff --git a/api/server/server.go b/api/server/server.go index c1847bf73..f7a5fa039 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -20,16 +20,14 @@ var Api *Server type Server struct { Runner *runner.Runner Router *gin.Engine - Config *models.Config Datastore models.Datastore AppListeners []ifaces.AppListener SpecialHandlers []ifaces.SpecialHandler } -func New(c *models.Config, ds models.Datastore, r *runner.Runner) *Server { +func New(ds models.Datastore, r *runner.Runner) *Server { Api = &Server{ Router: gin.Default(), - Config: c, Datastore: ds, Runner: r, } diff --git a/api/server/server_test.go b/api/server/server_test.go index 1754e1a41..92cd435c1 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -26,7 +26,7 @@ func TestFullStack(t *testing.T) { ds, close := prepareBolt(t) defer close() - New(&models.Config{}, ds, testRunner(t)) + New(ds, testRunner(t)) router := testRouter() for i, test := range []struct { diff --git a/main.go b/main.go index e77e26226..3969aee38 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,6 @@ import ( log "github.com/Sirupsen/logrus" "github.com/iron-io/functions/api/config" "github.com/iron-io/functions/api/datastore" - "github.com/iron-io/functions/api/models" "github.com/iron-io/functions/api/runner" "github.com/iron-io/functions/api/server" "github.com/spf13/viper" @@ -13,15 +12,9 @@ import ( func main() { ctx := context.Background() - c := &models.Config{} config.InitConfig() - err := c.Validate() - if err != nil { - log.WithError(err).Fatalln("Invalid config.") - } - ds, err := datastore.New(viper.GetString("DB")) if err != nil { log.WithError(err).Fatalln("Invalid DB url.") @@ -32,6 +25,6 @@ func main() { log.WithError(err).Fatalln("Failed to create a runner") } - srv := server.New(c, ds, runner) + srv := server.New(ds, runner) srv.Run(ctx) }