Use build tags to manage go-bindata

Signed-off-by: Carlos Martín <[email protected]>

Author: carlosms

.gitignore

@@ -6,6 +6,7 @@
 
 # builds
 /build
+server/assets/asset.go
 
 # testing, logs, caches...
 /coverage

Makefile

@@ -18,13 +18,24 @@ GODEP := dep
 GOLINT := golint
 GOVET := go vet
 BINDATA := go-bindata
-DIFF := diff
 YARN := yarn --cwd $(FRONTEND_PATH)
 REMOVE := rm -rf
 MOVE := mv
 MKDIR := mkdir -p
 COMPOSE := docker-compose
 
+# To be used as -tags
+GO_BINDATA_TAG := bindata
+
+# Override Makefile.main defaults for arguments to be used in `go` commands.
+GO_BUILD_ARGS := -ldflags "$(LD_FLAGS)" -tags "$(GO_BINDATA_TAG)"
+
+# Environment and arguments to use in `go run` calls.
+GO_RUN_ENV := GITBASEPG_ENV=dev
+GO_RUN_ARGS += -tags "$(GO_BINDATA_TAG)"
+
+GORUN = $(GOCMD) run $(GO_RUN_ARGS)
+
 # Default rule
 all:
 
@@ -55,7 +66,6 @@ lint: back-lint front-lint
 
 validate-commit: | \
 	back-dependencies \
-	back-ensure-assets-proxy \
 	front-fix-lint-errors \
 	no-changes-in-commit
 
@@ -67,9 +77,9 @@ clean: front-clean
 build-path:
 	$(MKDIR) $(BUILD_PATH)
 
-## Compiles the assets, and serve the tool through its API
+# Compiles the assets, and serves the tool through its API
 
-serve: | front-dependencies front-build back-start
+serve: | front-dependencies front-build back-build back-start
 
 compose-serve-latest:
 	$(COMPOSE) pull && \
@@ -87,10 +97,6 @@ require-repos-folder:
 	$(MKDIR) $(GITBASEPG_REPOS_FOLDER)
 
 # Backend
-
-assets := ./server/assets/asset.go
-assets_back := $(assets).bak
-
 back-dependencies:
 	$(GODEP) ensure
 
@@ -108,10 +114,7 @@ $(GO_LINTABLE_PACKAGES):
 	$(GOVET) $@
 
 back-start:
-	GITBASEPG_ENV=dev go run cmd/gitbase-playground/main.go
-
-back-ensure-assets-proxy:
-	$(DIFF) $(assets) $(assets_back) || exit 1
+	$(GO_RUN_ENV) $(GORUN) cmd/gitbase-playground/main.go
 
 # Frontend
 

server/assets/asset.go

@@ -1,3 +1,5 @@
+// +build bindata
+
 package handler
 
 import (
@@ -59,15 +61,15 @@ func (s *Static) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		s.ServeIndexHTML(nil)(w, r)
+		s.serveIndexHTML(nil)(w, r)
 		return
 	}
 
 	s.serveAsset(w, r, filepath, b)
 }
 
-// ServeIndexHTML serves index.html file
-func (s *Static) ServeIndexHTML(initialState interface{}) http.HandlerFunc {
+// serveIndexHTML serves index.html file
+func (s *Static) serveIndexHTML(initialState interface{}) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		filepath := path.Join(s.dir, indexFileName)
 		b, err := assets.Asset(filepath)

server/handler/static_files.go

@@ -0,0 +1,25 @@
+// +build !bindata
+
+package handler
+
+import (
+	"net/http"
+)
+
+// Static without the 'bindata' tag contains a placeholder handler
+// that returns 'not implemented'
+type Static struct{}
+
+// NewStatic creates new Static
+func NewStatic(dir, serverURL string, selectLimit int, footerHTML string) *Static {
+	return &Static{}
+}
+
+// ServeHTTP serves any static file from static directory or fallbacks on index.hml
+func (s *Static) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	http.Error(w,
+		"Frontend assets are only available when using 'make build' or 'make serve'",
+		http.StatusNotImplemented)
+
+	return
+}