Embed migrations and static files.

Author: brocaar

Makefile

@@ -17,13 +17,12 @@ test:
 		golint $$pkg ; \
 	done
 	@go vet $(PKGS)
-	@go test -cover -v $(PKGS)
+	@go test -p 1 -cover -v $(PKGS)
 
 package: clean build
 	@echo "Creating package"
 	@mkdir -p builds/$(VERSION)
 	@cp -R bin/ builds/$(VERSION)/bin
-	@cp -R migrations/ builds/$(VERSION)/migrations
 	@cd builds/$(VERSION)/ && tar -pczf ../loraserver_$(VERSION)_linux_amd64.tar.gz .
 	@rm -rf builds/$(VERSION)
 

README.md

@@ -41,11 +41,12 @@ Note: This project is under development. Please test and give feedback but know
 * Install Redis (used to store node sessions).
 
 * Start the ``loraserver`` service. The ``--help`` argument will show you all the available
-  config options. 
+  config options. With ``--db-automigrate`` the database schema will be created / updated
+  automatically.
 
-* Use the web-interface to create an application and node. You should now be able to
-  use OTAA to activate your node. Alternatively, use the web-interface to activate your
-  node (Session / ABP button).
+* Use the web-interface (by default http://localhost:8000/) to create an application and
+  node. You should now be able to use OTAA to activate your node. Alternatively, use the
+  web-interface to activate your node (Session / ABP button).
 
 * See https://github.com/brocaar/loratestapp for an example application implementation.
 

base_test.go

@@ -5,11 +5,12 @@ import (
 	golog "log"
 	"os"
 
-	"github.com/DavidHuie/gomigrate"
 	log "github.com/Sirupsen/logrus"
+	"github.com/brocaar/loraserver/migrations"
 	"github.com/brocaar/lorawan"
 	"github.com/garyburd/redigo/redis"
 	"github.com/jmoiron/sqlx"
+	"github.com/rubenv/sql-migrate"
 )
 
 func init() {
@@ -47,14 +48,15 @@ func mustFlushRedis(p *redis.Pool) {
 }
 
 func mustResetDB(db *sqlx.DB) {
-	m, err := gomigrate.NewMigrator(db.DB, gomigrate.Postgres{}, "./migrations")
-	if err != nil {
-		log.Fatal(err)
+	m := &migrate.AssetMigrationSource{
+		Asset:    migrations.Asset,
+		AssetDir: migrations.AssetDir,
+		Dir:      "",
 	}
-	if err := m.RollbackAll(); err != nil {
+	if _, err := migrate.Exec(db.DB, "postgres", m, migrate.Down); err != nil {
 		log.Fatal(err)
 	}
-	if err := m.Migrate(); err != nil {
+	if _, err := migrate.Exec(db.DB, "postgres", m, migrate.Up); err != nil {
 		log.Fatal(err)
 	}
 }

cmd/loraserver/main.go

@@ -1,29 +1,29 @@
+//go:generate go-bindata -prefix ../../migrations/ -pkg migrations -o ../../migrations/migrations.go ../../migrations/
+//go:generate go-bindata -prefix ../../static/ -pkg static -o ../../static/static.go ../../static/...
+
 package main
 
 import (
-	"io/ioutil"
-	golog "log"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"github.com/DavidHuie/gomigrate"
 	log "github.com/Sirupsen/logrus"
 	"github.com/brocaar/loraserver"
 	application "github.com/brocaar/loraserver/application/mqttpubsub"
 	gateway "github.com/brocaar/loraserver/gateway/mqttpubsub"
+	"github.com/brocaar/loraserver/migrations"
+	"github.com/brocaar/loraserver/static"
 	"github.com/brocaar/lorawan"
 	"github.com/codegangsta/cli"
+	"github.com/elazarl/go-bindata-assetfs"
 	_ "github.com/lib/pq"
+	"github.com/rubenv/sql-migrate"
 )
 
 var version string // set by the compiler
 
-func init() {
-	golog.SetOutput(ioutil.Discard)
-}
-
 func run(c *cli.Context) {
 	// parse the NetID
 	var netID lorawan.NetID
@@ -57,13 +57,16 @@ func run(c *cli.Context) {
 	// auto-migrate the database
 	if c.Bool("db-automigrate") {
 		log.Info("applying database migrations")
-		migrator, err := gomigrate.NewMigrator(db.DB, gomigrate.Postgres{}, c.String("db-migrations-path"))
-		if err != nil {
-			log.Fatalf("could not create the migrator: %s", err)
+		m := &migrate.AssetMigrationSource{
+			Asset:    migrations.Asset,
+			AssetDir: migrations.AssetDir,
+			Dir:      "",
 		}
-		if err = migrator.Migrate(); err != nil {
-			log.Fatalf("could run the migrations: %s", err)
+		n, err := migrate.Exec(db.DB, "postgres", m, migrate.Up)
+		if err != nil {
+			log.Fatalf("migrations failed: %s", err)
 		}
+		log.WithField("count", n).Info("migrations applied")
 	}
 
 	ctx := loraserver.Context{
@@ -91,7 +94,12 @@ func run(c *cli.Context) {
 
 	// setup static file server (for the gui)
 	log.WithField("path", "/").Info("registering gui handler")
-	http.Handle("/", http.FileServer(http.Dir("static")))
+	http.Handle("/", http.FileServer(&assetfs.AssetFS{
+		Asset:     static.Asset,
+		AssetDir:  static.AssetDir,
+		AssetInfo: static.AssetInfo,
+		Prefix:    "",
+	}))
 
 	// start the http server
 	go func() {
@@ -119,11 +127,6 @@ func main() {
 			EnvVar: "DB_AUTOMIGRATE",
 		},
 		cli.StringFlag{
-			Name:   "db-migrations-path",
-			Value:  "./migrations",
-			Usage:  "path to the directory containing the database migrations",
-			EnvVar: "DB_MIGRATIONS_PATH",
-		}, cli.StringFlag{
 			Name:   "net-id",
 			Usage:  "network identifier (NetID, 3 bytes) encoded as HEX (e.g. 010203)",
 			EnvVar: "NET_ID",

migrations/0001_initial_up.sql migrations/0001_initial.sql

@@ -1,3 +1,4 @@
+-- +migrate Up
 create table application (
 	app_eui bytea primary key,
 	name character varying (100) not null
@@ -11,3 +12,11 @@ create table node (
 );
 
 create index node_app_eui on node (app_eui);
+
+
+-- +migrate Down
+drop index node_app_eui;
+
+drop table node;
+
+drop table application;