Uses Go1.16 embed feature (amir20#1092)

* Uses Go1.16 embed feature

* Fixes tests

* Removes packr and fixes tests

Author: amir20

.editorconfig

@@ -13,5 +13,8 @@ max_line_length = 120
 indent_style = tab
 indent_size = 4
 
+[Makefile]
+indent_style = tab
+
 [package.json]
 indent_size = 1

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run Go Tests with Coverage
-        run: go test -cover ./...
+        run: make test SKIP_ASSET=1
   int-test:
     name: Integration Tests
     runs-on: ubuntu-latest

Makefile

@@ -1,6 +1,27 @@
 TAG := $(shell git describe --tags)
 PLATFROMS := linux/amd64,linux/arm/v7,linux/arm64/v8
 
+
 .PHONY: publish
 publish:
 	docker buildx build --build-arg TAG=$(TAG) --platform $(PLATFROMS) -t amir20/dozzle:latest -t amir20/dozzle:$(TAG) --push .
+
+.PHONY: clean
+clean:
+	@rm -rf static dozzle
+
+static: $(shell find assets -type f)
+ifdef SKIP_ASSET
+	@echo 'Skipping yarn build'
+	@mkdir -p static
+	@touch static/index.html
+else
+	yarn build
+endif
+
+.PHONY: test
+test: static
+	go test -cover ./...
+
+build: static
+	CGO_ENABLED=0 go build -ldflags "-s -w"

go.mod

@@ -10,24 +10,19 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/gobuffalo/envy v1.9.0 // indirect
-	github.com/gobuffalo/packd v1.0.0 // indirect
-	github.com/gobuffalo/packr v1.30.1
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/gorilla/mux v1.8.0
-	github.com/magefile/mage v1.11.0 // indirect
 	github.com/magiconair/properties v1.8.4
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pelletier/go-toml v1.8.1 // indirect
-	github.com/rogpeppe/go-internal v1.7.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.5.1 // indirect
+	github.com/spf13/afero v1.6.0
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5
@@ -44,4 +39,4 @@ require (
 	gotest.tools/v3 v3.0.3 // indirect
 )
 
-go 1.14
+go 1.16

go.sum

@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	"embed"
+	"io/fs"
 	"net/url"
 	"os"
 	"os/signal"
@@ -11,7 +13,6 @@ import (
 	"github.com/amir20/dozzle/docker"
 	"github.com/amir20/dozzle/web"
 
-	"github.com/gobuffalo/packr"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -26,9 +27,11 @@ var (
 	version  = "dev"
 )
 
+//go:embed static
+var content embed.FS
+
 type handler struct {
 	client docker.Client
-	box    packr.Box
 }
 
 func init() {
@@ -80,15 +83,19 @@ func main() {
 		log.Fatalf("Could not connect to Docker Engine: %v", err)
 	}
 
-	box := packr.NewBox("./static")
-
 	config := web.Config{
 		Addr:     addr,
 		Base:     base,
 		Version:  version,
 		TailSize: tailSize,
 	}
-	srv := web.CreateServer(dockerClient, box, config)
+
+	static, err := fs.Sub(content, "static")
+	if err != nil {
+		log.Fatalf("Could not open embedded static folder: %v", err)
+	}
+
+	srv := web.CreateServer(dockerClient, static, config)
 
 	go func() {
 		log.Infof("Accepting connections on %s", srv.Addr)

main.go

@@ -3,15 +3,14 @@
  "version": "3.2.3",
  "description": "Realtime log viewer for docker containers. ",
  "scripts": {
-  "prestart": "yarn clean",
   "watch": "npm-run-all -p watch:*",
   "watch:assets": "webpack --mode=development --watch",
   "watch:server": "reflex -c .reflex",
   "dev": "npm-run-all -p dev-server watch:server",
   "dev-server": "webpack serve --mode=development",
   "prebuild": "yarn clean",
   "build": "yarn webpack --mode=production",
-  "clean": "rm -rf static/ a_main-packr.go",
+  "clean": "rm -rf static",
   "release": "release-it",
   "test": "TZ=UTC jest",
   "integration": "docker-compose -f integration/docker-compose.test.yml up --build --force-recreate --exit-code-from integration",

package.json

@@ -4,10 +4,13 @@ import (
 	"bufio"
 	"compress/gzip"
 	"context"
+
 	"encoding/json"
 	"fmt"
 	"html/template"
 	"io"
+	"io/fs"
+	"io/ioutil"
 	"net/http"
 	_ "net/http/pprof"
 	"runtime"
@@ -17,7 +20,7 @@ import (
 
 	"github.com/amir20/dozzle/docker"
 	"github.com/dustin/go-humanize"
-	"github.com/gobuffalo/packr"
+
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 )
@@ -31,17 +34,18 @@ type Config struct {
 }
 
 type handler struct {
-	client docker.Client
-	box    packr.Box
-	config *Config
+	client     docker.Client
+	content    fs.FS
+	config     *Config
+	fileServer http.Handler
 }
 
 // CreateServer creates a service for http handler
-func CreateServer(c docker.Client, b packr.Box, config Config) *http.Server {
+func CreateServer(c docker.Client, content fs.FS, config Config) *http.Server {
 	handler := &handler{
-		client: c,
-		box:    b,
-		config: &config,
+		client:  c,
+		content: content,
+		config:  &config,
 	}
 	return &http.Server{Addr: config.Addr, Handler: createRouter(handler)}
 }
@@ -66,7 +70,13 @@ func createRouter(h *handler) *mux.Router {
 		s.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
 	}
 
-	s.PathPrefix("/").Handler(http.StripPrefix(base, http.HandlerFunc(h.index)))
+	if base != "/" {
+		s.PathPrefix("/").Handler(http.StripPrefix(base+"/", http.HandlerFunc(h.index)))
+	} else {
+		s.PathPrefix("/").Handler(http.StripPrefix(base, http.HandlerFunc(h.index)))
+	}
+
+	h.fileServer = http.FileServer(http.FS(h.content))
 
 	return r
 }
@@ -79,15 +89,19 @@ func setCSPHeaders(next http.Handler) http.Handler {
 }
 
 func (h *handler) index(w http.ResponseWriter, req *http.Request) {
-	fileServer := http.FileServer(h.box)
-	if h.box.Has(req.URL.Path) && req.URL.Path != "" && req.URL.Path != "/" {
-		fileServer.ServeHTTP(w, req)
+	_, err := h.content.Open(req.URL.Path)
+	if err == nil && req.URL.Path != "" && req.URL.Path != "/" {
+		h.fileServer.ServeHTTP(w, req)
 	} else {
-		text, err := h.box.FindString("index.html")
+		file, err := h.content.Open("index.html")
+		if err != nil {
+			panic(err)
+		}
+		bytes, err := ioutil.ReadAll(file)
 		if err != nil {
 			panic(err)
 		}
-		tmpl, err := template.New("index.html").Parse(text)
+		tmpl, err := template.New("index.html").Parse(string(bytes))
 		if err != nil {
 			panic(err)
 		}

web/routes.go

@@ -15,9 +15,10 @@ import (
 
 	"github.com/amir20/dozzle/docker"
 	"github.com/beme/abide"
-	"github.com/gobuffalo/packr"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/spf13/afero"
 )
 
 type MockedClient struct {
@@ -238,10 +239,13 @@ func Test_handler_streamEvents_error_request(t *testing.T) {
 
 func Test_createRoutes_index(t *testing.T) {
 	mockedClient := new(MockedClient)
-	box := packr.NewBox("./virtual")
-	require.NoError(t, box.AddString("index.html", "index page"), "AddString should have no error.")
-
-	handler := createRouter(&handler{mockedClient, box, &Config{Base: "/"}})
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
+	handler := createRouter(&handler{
+		client:  mockedClient,
+		content: afero.NewIOFS(fs),
+		config:  &Config{Base: "/"},
+	})
 	req, err := http.NewRequest("GET", "/", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -252,9 +256,14 @@ func Test_createRoutes_index(t *testing.T) {
 
 func Test_createRoutes_redirect(t *testing.T) {
 	mockedClient := new(MockedClient)
-	box := packr.NewBox("./virtual")
-
-	handler := createRouter(&handler{mockedClient, box, &Config{Base: "/foobar"}})
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
+
+	handler := createRouter(&handler{
+		client:  mockedClient,
+		content: afero.NewIOFS(fs),
+		config:  &Config{Base: "/foobar"},
+	})
 	req, err := http.NewRequest("GET", "/foobar", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -265,10 +274,14 @@ func Test_createRoutes_redirect(t *testing.T) {
 
 func Test_createRoutes_foobar(t *testing.T) {
 	mockedClient := new(MockedClient)
-	box := packr.NewBox("./virtual")
-	require.NoError(t, box.AddString("index.html", "foo page"), "AddString should have no error.")
-
-	handler := createRouter(&handler{mockedClient, box, &Config{Base: "/foobar"}})
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("foo page"), 0644), "WriteFile should have no error.")
+
+	handler := createRouter(&handler{
+		client:  mockedClient,
+		content: afero.NewIOFS(fs),
+		config:  &Config{Base: "/foobar"},
+	})
 	req, err := http.NewRequest("GET", "/foobar/", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -279,10 +292,16 @@ func Test_createRoutes_foobar(t *testing.T) {
 
 func Test_createRoutes_foobar_file(t *testing.T) {
 	mockedClient := new(MockedClient)
-	box := packr.NewBox("./virtual")
-	require.NoError(t, box.AddString("/test", "test page"), "AddString should have no error.")
-
-	handler := createRouter(&handler{mockedClient, box, &Config{Base: "/foobar"}})
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
+	require.NoError(t, afero.WriteFile(fs, "test", []byte("test page"), 0644), "WriteFile should have no error.")
+
+	handler := createRouter(&handler{
+		client:     mockedClient,
+		content:    afero.NewIOFS(fs),
+		config:     &Config{Base: "/foobar"},
+		fileServer: nil,
+	})
 	req, err := http.NewRequest("GET", "/foobar/test", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -293,9 +312,14 @@ func Test_createRoutes_foobar_file(t *testing.T) {
 
 func Test_createRoutes_version(t *testing.T) {
 	mockedClient := new(MockedClient)
-	box := packr.NewBox("./virtual")
-
-	handler := createRouter(&handler{mockedClient, box, &Config{Base: "/", Version: "dev"}})
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
+
+	handler := createRouter(&handler{
+		client:  mockedClient,
+		content: afero.NewIOFS(fs),
+		config:  &Config{Base: "/", Version: "dev"},
+	})
 	req, err := http.NewRequest("GET", "/version", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()