From f32a52f7184f2081ab8c4c74b59cf6d13ba38642 Mon Sep 17 00:00:00 2001
From: renovate <renovate-bot@autistici.org>
Date: Thu, 28 Jan 2021 13:21:38 +0000
Subject: [PATCH] Update module elazarl/go-bindata-assetfs to v1.0.1
---
go.mod | 2 +-
go.sum | 2 ++
.../elazarl/go-bindata-assetfs/README.md | 32 ++++++++++++++-----
.../elazarl/go-bindata-assetfs/assetfs.go | 14 ++++++--
.../elazarl/go-bindata-assetfs/doc.go | 2 +-
vendor/modules.txt | 2 +-
6 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/go.mod b/go.mod
index 570174d1..e1362122 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.autistici.org/ale/autoradio
go 1.14
require (
- github.com/elazarl/go-bindata-assetfs v1.0.1-0.20180223160309-38087fe4dafb
+ github.com/elazarl/go-bindata-assetfs v1.0.1
github.com/golang/gddo v0.0.0-20190312205958-5a2505f3dbf0 // indirect
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
github.com/golang/protobuf v1.4.3
diff --git a/go.sum b/go.sum
index 6d295aac..70b5ced2 100644
--- a/go.sum
+++ b/go.sum
@@ -56,6 +56,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/elazarl/go-bindata-assetfs v1.0.1-0.20180223160309-38087fe4dafb h1:Dnxl6iOR/3QQRcCBDEOCpusGgsx7uDS+Pa/InwqCFfw=
github.com/elazarl/go-bindata-assetfs v1.0.1-0.20180223160309-38087fe4dafb/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+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/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
diff --git a/vendor/github.com/elazarl/go-bindata-assetfs/README.md b/vendor/github.com/elazarl/go-bindata-assetfs/README.md
index 27ee48f0..b326dca1 100644
--- a/vendor/github.com/elazarl/go-bindata-assetfs/README.md
+++ b/vendor/github.com/elazarl/go-bindata-assetfs/README.md
@@ -1,6 +1,6 @@
# go-bindata-assetfs
-Serve embedded files from [jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata) with `net/http`.
+Serve embedded files from [go-bindata](https://github.com/go-bindata/go-bindata) with `net/http`.
[GoDoc](http://godoc.org/github.com/elazarl/go-bindata-assetfs)
@@ -8,12 +8,12 @@ Serve embedded files from [jteeuwen/go-bindata](https://github.com/jteeuwen/go-b
Install with
- $ go get github.com/jteeuwen/go-bindata/...
+ $ go get github.com/go-bindata/go-bindata/...
$ go get github.com/elazarl/go-bindata-assetfs/...
### Creating embedded data
-Usage is identical to [jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata) usage,
+Usage is identical to [go-bindata](https://github.com/go-bindata/go-bindata) usage,
instead of running `go-bindata` run `go-bindata-assetfs`.
The tool will create a `bindata_assetfs.go` file, which contains the embedded data.
@@ -37,10 +37,26 @@ You can always just run the `go-bindata` tool, and then
use
- import "github.com/elazarl/go-bindata-assetfs"
- ...
- http.Handle("/",
- http.FileServer(
- &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "data"}))
+```go
+import "github.com/elazarl/go-bindata-assetfs"
+...
+http.Handle("/",
+http.FileServer(
+&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "data"}))
+```
to serve files embedded from the `data` directory.
+
+## SPA applications
+
+For single page applications you can use `Fallback: "index.html"` in AssetFS context, so if route doesn't match the pattern it will fallback to file specified.
+
+example
+
+```go
+import "github.com/elazarl/go-bindata-assetfs"
+...
+http.Handle("/",
+http.FileServer(
+&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "data", Fallback: "index.html"}))
+```
diff --git a/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go b/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
index 04f6d7a3..81874973 100644
--- a/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
+++ b/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
@@ -137,6 +137,8 @@ type AssetFS struct {
AssetInfo func(path string) (os.FileInfo, error)
// Prefix would be prepended to http requests
Prefix string
+ // Fallback file that is served if no other is found
+ Fallback string
}
func (fs *AssetFS) Open(name string) (http.File, error) {
@@ -153,9 +155,13 @@ func (fs *AssetFS) Open(name string) (http.File, error) {
}
return NewAssetFile(name, b, timestamp), nil
}
- if children, err := fs.AssetDir(name); err == nil {
- return NewAssetDirectory(name, children, fs), nil
- } else {
+ children, err := fs.AssetDir(name)
+
+ if err != nil {
+ if len(fs.Fallback) > 0 {
+ return fs.Open(fs.Fallback)
+ }
+
// If the error is not found, return an error that will
// result in a 404 error. Otherwise the server returns
// a 500 error for files not found.
@@ -164,4 +170,6 @@ func (fs *AssetFS) Open(name string) (http.File, error) {
}
return nil, err
}
+
+ return NewAssetDirectory(name, children, fs), nil
}
diff --git a/vendor/github.com/elazarl/go-bindata-assetfs/doc.go b/vendor/github.com/elazarl/go-bindata-assetfs/doc.go
index a664249f..8f8f2c3d 100644
--- a/vendor/github.com/elazarl/go-bindata-assetfs/doc.go
+++ b/vendor/github.com/elazarl/go-bindata-assetfs/doc.go
@@ -1,7 +1,7 @@
// assetfs allows packages to serve static content embedded
// with the go-bindata tool with the standard net/http package.
//
-// See https://github.com/jteeuwen/go-bindata for more information
+// See https://github.com/go-bindata/go-bindata for more information
// about embedding binary data with go-bindata.
//
// Usage example, after running
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ef2d0135..9be2afe3 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -14,7 +14,7 @@ github.com/coreos/pkg/capnslog
github.com/dgrijalva/jwt-go
# github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
github.com/dustin/go-humanize
-# github.com/elazarl/go-bindata-assetfs v1.0.1-0.20180223160309-38087fe4dafb
+# github.com/elazarl/go-bindata-assetfs v1.0.1
## explicit
github.com/elazarl/go-bindata-assetfs
# github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
--
GitLab