Remove elazarl/go-bindata-assetfs in favor of the built-in embed (#183)

- https://pkg.go.dev/embed - https://go.dev/blog/go1.16
jmartin82 · Sep 6, 2024 · 230b671 · 230b671
1 parent e9640eb
commit 230b671
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 430 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.18
 
 require (
 	github.com/basgys/goxml2json v1.1.0
-	github.com/elazarl/go-bindata-assetfs v1.0.0
 	github.com/fatih/color v1.16.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428

diff --git a/go.sum b/go.sum
@@ -5,8 +5,6 @@ github.com/bitly/go-simplejson v0.5.1/go.mod h1:YOPVLzCfwK14b4Sff3oP1AmGhI9T9Vsg
 github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE=
 github.com/corpix/uarand v0.2.0/go.mod h1:/3Z1QIqWkDIhf6XWn/08/uMHoQ8JUoTIKc2iPchBOmM=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
-github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=

diff --git a/internal/console/bindata.go b/internal/console/bindata.go
diff --git a/internal/console/dispatcher.go b/internal/console/dispatcher.go
@@ -1,9 +1,9 @@
 package console
 
 import (
+	"embed"
 	"errors"
 	"fmt"
-	assetfs "github.com/elazarl/go-bindata-assetfs"
 	"github.com/jmartin82/mmock/v3/internal/config"
 	"github.com/jmartin82/mmock/v3/internal/config/logger"
 	"github.com/jmartin82/mmock/v3/internal/statistics"
@@ -17,6 +17,9 @@ import (
 	"strings"
 )
 
+//go:embed tmpl
+var assetFS embed.FS
+
 var log = logger.Log
 
 var pagePattern = regexp.MustCompile(`^[1-9]([0-9]+)?$`)
@@ -73,7 +76,7 @@ func (di *Dispatcher) Start() {
 	e.GET("/echo", di.webSocketHandler)
 
 	//HTTP
-	statics := http.FileServer(&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "tmpl"})
+	statics := http.FileServer(http.FS(assetFS))
 	e.GET("/js/*", echo.WrapHandler(statics))
 	e.GET("/css/*", echo.WrapHandler(statics))
 	e.GET("/swagger.json", di.swaggerHandler)

diff --git a/tmpl/css/style.css → internal/console/tmpl/css/style.css b/tmpl/css/style.css → internal/console/tmpl/css/style.css
diff --git a/tmpl/index.html → internal/console/tmpl/index.html b/tmpl/index.html → internal/console/tmpl/index.html
diff --git a/tmpl/js/mapping.js → internal/console/tmpl/js/mapping.js b/tmpl/js/mapping.js → internal/console/tmpl/js/mapping.js
diff --git a/tmpl/js/request_logger.js → internal/console/tmpl/js/request_logger.js b/tmpl/js/request_logger.js → internal/console/tmpl/js/request_logger.js
diff --git a/tmpl/js/sorting.js → internal/console/tmpl/js/sorting.js b/tmpl/js/sorting.js → internal/console/tmpl/js/sorting.js
diff --git a/tmpl/js/util.js → internal/console/tmpl/js/util.js b/tmpl/js/util.js → internal/console/tmpl/js/util.js
diff --git a/tmpl/swagger.json → internal/console/tmpl/swagger.json b/tmpl/swagger.json → internal/console/tmpl/swagger.json
diff --git a/makefile b/makefile
@@ -1,4 +1,4 @@
-.PHONY: build doc fmt lint dev test vet bindata
+.PHONY: build doc fmt lint dev test vet
 
 PKG_NAME=mmock
 NS = jordimartin
@@ -7,14 +7,10 @@ VERSION ?= latest
 export GO111MODULE=on
 
 
-build: bindata \
-	vet \
+build: vet \
 	test
 	go build  -v -o ./bin/$(PKG_NAME) cmd/mmock/main.go
 
-bindata:
-	go-bindata -pkg console -o internal/console/bindata.go tmpl/*
-
 doc:
 	godoc -http=:6060