diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ad11f0..f55c28d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,17 +21,15 @@ workflows: jobs: build: docker: - - image: circleci/golang:1.15 + - image: circleci/golang:1.16 working_directory: /go/src/github.com/xddxdd/bird-lg-go steps: - checkout - - run: go get -v -t -d ./... - - run: go get -u github.com/kevinburke/go-bindata/... - - run: cd frontend && go generate - - run: go test -v ./... + - run: GO111MODULE=auto go get -v -t -d ./... + - run: GO111MODULE=auto go test -v ./... deploy: docker: - - image: circleci/golang:1.15 + - image: circleci/golang:1.16 working_directory: /go/src/github.com/xddxdd/bird-lg-go parameters: image_arch: diff --git a/README.md b/README.md index 70d1458..087e281 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ Or, you can manually do the building steps: ```bash # Build frontend binary cd frontend -go get -u github.com/kevinburke/go-bindata/... -go generate go build -ldflags "-w -s" -o frontend cd .. @@ -44,8 +42,6 @@ go build -ldflags "-w -s" -o proxy cd .. ``` -- If you get `undefined: MustAssetString`, you need to uninstall an older version of go-bindata from your machine: see [#11](https://github.com/xddxdd/bird-lg-go/issues/11) - ## Build Docker Images Run `make dockerfile` and you'll get a bunch of Dockerfiles for different architectures: diff --git a/frontend/Makefile b/frontend/Makefile index 867738e..2822519 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -1,5 +1,3 @@ .PHONY: all all: - go get -u github.com/kevinburke/go-bindata/... - go generate go build -ldflags "-w -s" -o frontend diff --git a/frontend/bindata/robots.txt b/frontend/assets/robots.txt similarity index 100% rename from frontend/bindata/robots.txt rename to frontend/assets/robots.txt diff --git a/frontend/bindata/templates/bgpmap.tpl b/frontend/assets/templates/bgpmap.tpl similarity index 100% rename from frontend/bindata/templates/bgpmap.tpl rename to frontend/assets/templates/bgpmap.tpl diff --git a/frontend/bindata/templates/bird.tpl b/frontend/assets/templates/bird.tpl similarity index 100% rename from frontend/bindata/templates/bird.tpl rename to frontend/assets/templates/bird.tpl diff --git a/frontend/bindata/templates/page.tpl b/frontend/assets/templates/page.tpl similarity index 100% rename from frontend/bindata/templates/page.tpl rename to frontend/assets/templates/page.tpl diff --git a/frontend/bindata/templates/summary.tpl b/frontend/assets/templates/summary.tpl similarity index 100% rename from frontend/bindata/templates/summary.tpl rename to frontend/assets/templates/summary.tpl diff --git a/frontend/bindata/templates/whois.tpl b/frontend/assets/templates/whois.tpl similarity index 100% rename from frontend/bindata/templates/whois.tpl rename to frontend/assets/templates/whois.tpl diff --git a/frontend/go.mod b/frontend/go.mod index e8eaedd..67360d9 100644 --- a/frontend/go.mod +++ b/frontend/go.mod @@ -1,9 +1,5 @@ module github.com/xddxdd/bird-lg-go/frontend -go 1.15 +go 1.16 -require ( - github.com/elazarl/go-bindata-assetfs v1.0.1 - github.com/gorilla/handlers v1.5.1 - github.com/kevinburke/go-bindata v3.22.0+incompatible // indirect -) +require github.com/gorilla/handlers v1.5.1 diff --git a/frontend/go.sum b/frontend/go.sum index a8da501..f27a04f 100644 --- a/frontend/go.sum +++ b/frontend/go.sum @@ -1,8 +1,4 @@ -github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= -github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/kevinburke/go-bindata v3.22.0+incompatible h1:/JmqEhIWQ7GRScV0WjX/0tqBrC5D21ALg0H0U/KZ/ts= -github.com/kevinburke/go-bindata v3.22.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= diff --git a/frontend/main.go b/frontend/main.go index 89427f7..ab1b889 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -7,9 +7,6 @@ import ( "strings" ) -// binary data -//go:generate go-bindata -prefix bindata -o bindata.go bindata/... - type settingType struct { servers []string serversDisplay []string diff --git a/frontend/template.Dockerfile b/frontend/template.Dockerfile index 0d12377..127dd21 100644 --- a/frontend/template.Dockerfile +++ b/frontend/template.Dockerfile @@ -19,9 +19,6 @@ ENV GOOS=linux GOARCH=s390x ENV CGO_ENABLED=0 GO111MODULE=on WORKDIR /root COPY . . -# go-bindata is run on the build host as part of the go generate step -RUN GOARCH=amd64 go get -u github.com/kevinburke/go-bindata/... -RUN go generate RUN go build -ldflags "-w -s" -o /frontend ################################################################################ diff --git a/frontend/template.go b/frontend/template.go index bde5b39..ac245dd 100644 --- a/frontend/template.go +++ b/frontend/template.go @@ -1,17 +1,24 @@ package main import ( + "embed" "strings" "text/template" ) +// import templates and other assets +//go:embed assets +var assets embed.FS + +const TEMPLATE_PATH = "assets/templates/" + // template argument structures // page type TemplatePage struct { // Global options - Options map[string]string - Servers []string + Options map[string]string + Servers []string ServersEscaped []string ServersDisplay []string @@ -95,7 +102,7 @@ var requiredTemplates = [...]string{ "bird", } -// import templates from bindata +// import templates from embedded assets func ImportTemplates() { @@ -105,13 +112,16 @@ func ImportTemplates() { // for each template that is needed for _, tmpl := range requiredTemplates { - // extract the template definition from the bindata - def := MustAssetString("templates/" + tmpl + ".tpl") + // extract the template definition from the embedded assets + def, err := assets.ReadFile(TEMPLATE_PATH + tmpl + ".tpl") + if err != nil { + panic("Unable to read template (" + TEMPLATE_PATH + tmpl + ": " + err.Error()) + } // and add it to the template library - template, err := template.New(tmpl).Parse(def) + template, err := template.New(tmpl).Parse(string(def)) if err != nil { - panic("Unable to parse template (templates/" + tmpl + ": " + err.Error()) + panic("Unable to parse template (" + TEMPLATE_PATH + tmpl + ": " + err.Error()) } // store in the library diff --git a/frontend/webserver.go b/frontend/webserver.go index 8ee95fc..926978d 100644 --- a/frontend/webserver.go +++ b/frontend/webserver.go @@ -4,12 +4,12 @@ import ( "bytes" "fmt" "html" + "io/fs" "net/http" "net/url" "os" "strings" - assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/gorilla/handlers" ) @@ -183,13 +183,12 @@ func webServerStart() { http.Redirect(w, r, "/summary/"+url.PathEscape(strings.Join(setting.servers, "+")), 302) }) - // serve static pages using the AssetFS and bindata - fs := http.FileServer(&assetfs.AssetFS{ - Asset: Asset, - AssetDir: AssetDir, - AssetInfo: AssetInfo, - Prefix: "", - }) + // serve static pages using embedded assets from template.go + subfs, err := fs.Sub(assets, "assets") + if err != nil { + panic("Webserver fs.sub failed: " + err.Error()) + } + fs := http.FileServer(http.FS(subfs)) http.Handle("/static/", fs) http.Handle("/robots.txt", fs)