From ab5a7f2b27c1c643dc046d9b6f4d913ecd19d30c Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Tue, 11 Jan 2022 17:14:54 -0600 Subject: [PATCH] Remove httpfs package You want to know something silly? There are multiple versions of go-bindata floating around in the world, and they have different features and flags. This httpfs package was written with https://github.com/go-bindata/go-bindata and uses the -fs flag. Most everyone else (nixpkgs, homebrew) seems to have moved over to this fork https://github.com/kevinburke/go-bindata, which does not have that feature. Run `go generate` with this installed and you'll get an error like `flag provided but not defined: -fs`. It looks like `httpfs` is the odd one out here, and it's not used anywhere I can find either here or waypoint, so let's just remove it so we can `go generate` cleanly with the version of go-bindata that most people are using. --- internal/pkg/httpfs/bindata_test.go | 358 ------------------ internal/pkg/httpfs/copy.go | 86 ----- internal/pkg/httpfs/copy_test.go | 47 --- internal/pkg/httpfs/httpfs.go | 3 - internal/pkg/httpfs/testdata/dir/hello.txt | 1 - .../pkg/httpfs/testdata/dir/subdir/child.txt | 1 - 6 files changed, 496 deletions(-) delete mode 100644 internal/pkg/httpfs/bindata_test.go delete mode 100644 internal/pkg/httpfs/copy.go delete mode 100644 internal/pkg/httpfs/copy_test.go delete mode 100644 internal/pkg/httpfs/httpfs.go delete mode 100644 internal/pkg/httpfs/testdata/dir/hello.txt delete mode 100644 internal/pkg/httpfs/testdata/dir/subdir/child.txt diff --git a/internal/pkg/httpfs/bindata_test.go b/internal/pkg/httpfs/bindata_test.go deleted file mode 100644 index 73de06d9a..000000000 --- a/internal/pkg/httpfs/bindata_test.go +++ /dev/null @@ -1,358 +0,0 @@ -// Package httpfs Code generated by go-bindata. (@generated) DO NOT EDIT. -// sources: -// testdata/dir/hello.txt -// testdata/dir/subdir/child.txt -package httpfs - -import ( - "bytes" - "compress/gzip" - "fmt" - "io" - "io/ioutil" - "net/http" - "os" - "path/filepath" - "strings" - "time" -) - -func bindataRead(data, name string) ([]byte, error) { - gz, err := gzip.NewReader(strings.NewReader(data)) - if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) - } - - var buf bytes.Buffer - _, err = io.Copy(&buf, gz) - clErr := gz.Close() - - if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) - } - if clErr != nil { - return nil, err - } - - return buf.Bytes(), nil -} - -type asset struct { - bytes []byte - info os.FileInfo -} - -type bindataFileInfo struct { - name string - size int64 - mode os.FileMode - modTime time.Time -} - -// Name return file name -func (fi bindataFileInfo) Name() string { - return fi.name -} - -// Size return file size -func (fi bindataFileInfo) Size() int64 { - return fi.size -} - -// Mode return file mode -func (fi bindataFileInfo) Mode() os.FileMode { - return fi.mode -} - -// ModTime return file modify time -func (fi bindataFileInfo) ModTime() time.Time { - return fi.modTime -} - -// IsDir return file whether a directory -func (fi bindataFileInfo) IsDir() bool { - return fi.mode&os.ModeDir != 0 -} - -// Sys return file is sys mode -func (fi bindataFileInfo) Sys() interface{} { - return nil -} - -type assetFile struct { - *bytes.Reader - name string - childInfos []os.FileInfo - childInfoOffset int -} - -type assetOperator struct{} - -// Open implement http.FileSystem interface -func (f *assetOperator) Open(name string) (http.File, error) { - var err error - if len(name) > 0 && name[0] == '/' { - name = name[1:] - } - content, err := Asset(name) - if err == nil { - return &assetFile{name: name, Reader: bytes.NewReader(content)}, nil - } - children, err := AssetDir(name) - if err == nil { - childInfos := make([]os.FileInfo, 0, len(children)) - for _, child := range children { - childPath := filepath.Join(name, child) - info, errInfo := AssetInfo(filepath.Join(name, child)) - if errInfo == nil { - childInfos = append(childInfos, info) - } else { - childInfos = append(childInfos, newDirFileInfo(childPath)) - } - } - return &assetFile{name: name, childInfos: childInfos}, nil - } else { - // 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. - if strings.Contains(err.Error(), "not found") { - return nil, os.ErrNotExist - } - return nil, err - } -} - -// Close no need do anything -func (f *assetFile) Close() error { - return nil -} - -// Readdir read dir's children file info -func (f *assetFile) Readdir(count int) ([]os.FileInfo, error) { - if len(f.childInfos) == 0 { - return nil, os.ErrNotExist - } - if count <= 0 { - return f.childInfos, nil - } - if f.childInfoOffset+count > len(f.childInfos) { - count = len(f.childInfos) - f.childInfoOffset - } - offset := f.childInfoOffset - f.childInfoOffset += count - return f.childInfos[offset : offset+count], nil -} - -// Stat read file info from asset item -func (f *assetFile) Stat() (os.FileInfo, error) { - if len(f.childInfos) != 0 { - return newDirFileInfo(f.name), nil - } - return AssetInfo(f.name) -} - -// newDirFileInfo return default dir file info -func newDirFileInfo(name string) os.FileInfo { - return &bindataFileInfo{ - name: name, - size: 0, - mode: os.FileMode(2147484068), // equal os.FileMode(0644)|os.ModeDir - modTime: time.Time{}} -} - -// AssetFile return a http.FileSystem instance that data backend by asset -func AssetFile() http.FileSystem { - return &assetOperator{} -} - -var _dirHelloTxt = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xf2\x48\xcd\xc9\xc9\xe7\x02\x04\x00\x00\xff\xff\x16\x35\x96\x31\x06\x00\x00\x00" - -func dirHelloTxtBytes() ([]byte, error) { - return bindataRead( - _dirHelloTxt, - "dir/hello.txt", - ) -} - -func dirHelloTxt() (*asset, error) { - bytes, err := dirHelloTxtBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "dir/hello.txt", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _dirSubdirChildTxt = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\xce\xc8\xcc\x49\xe1\x02\x04\x00\x00\xff\xff\x9d\x28\xeb\x77\x06\x00\x00\x00" - -func dirSubdirChildTxtBytes() ([]byte, error) { - return bindataRead( - _dirSubdirChildTxt, - "dir/subdir/child.txt", - ) -} - -func dirSubdirChildTxt() (*asset, error) { - bytes, err := dirSubdirChildTxtBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "dir/subdir/child.txt", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -// Asset loads and returns the asset for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) - } - return a.bytes, nil - } - return nil, fmt.Errorf("Asset %s not found", name) -} - -// MustAsset is like Asset but panics when Asset would return an error. -// It simplifies safe initialization of global variables. -func MustAsset(name string) []byte { - a, err := Asset(name) - if err != nil { - panic("asset: Asset(" + name + "): " + err.Error()) - } - - return a -} - -// AssetInfo loads and returns the asset info for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) - } - return a.info, nil - } - return nil, fmt.Errorf("AssetInfo %s not found", name) -} - -// AssetNames returns the names of the assets. -func AssetNames() []string { - names := make([]string, 0, len(_bindata)) - for name := range _bindata { - names = append(names, name) - } - return names -} - -// _bindata is a table, holding each asset generator, mapped to its name. -var _bindata = map[string]func() (*asset, error){ - "dir/hello.txt": dirHelloTxt, - "dir/subdir/child.txt": dirSubdirChildTxt, -} - -// AssetDir returns the file names below a certain -// directory embedded in the file by go-bindata. -// For example if you run go-bindata on data/... and data contains the -// following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png -// then AssetDir("data") would return []string{"foo.txt", "img"} -// AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error -// AssetDir("") will return []string{"data"}. -func AssetDir(name string) ([]string, error) { - node := _bintree - if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") - for _, p := range pathList { - node = node.Children[p] - if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - } - } - if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - rv := make([]string, 0, len(node.Children)) - for childName := range node.Children { - rv = append(rv, childName) - } - return rv, nil -} - -type bintree struct { - Func func() (*asset, error) - Children map[string]*bintree -} - -var _bintree = &bintree{nil, map[string]*bintree{ - "dir": {nil, map[string]*bintree{ - "hello.txt": {dirHelloTxt, map[string]*bintree{}}, - "subdir": {nil, map[string]*bintree{ - "child.txt": {dirSubdirChildTxt, map[string]*bintree{}}, - }}, - }}, -}} - -// RestoreAsset restores an asset under the given directory -func RestoreAsset(dir, name string) error { - data, err := Asset(name) - if err != nil { - return err - } - info, err := AssetInfo(name) - if err != nil { - return err - } - err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) - if err != nil { - return err - } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) - if err != nil { - return err - } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil -} - -// RestoreAssets restores an asset under the given directory recursively -func RestoreAssets(dir, name string) error { - children, err := AssetDir(name) - // File - if err != nil { - return RestoreAsset(dir, name) - } - // Dir - for _, child := range children { - err = RestoreAssets(dir, filepath.Join(name, child)) - if err != nil { - return err - } - } - return nil -} - -func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) -} diff --git a/internal/pkg/httpfs/copy.go b/internal/pkg/httpfs/copy.go deleted file mode 100644 index 6d19d0176..000000000 --- a/internal/pkg/httpfs/copy.go +++ /dev/null @@ -1,86 +0,0 @@ -package httpfs - -import ( - "io" - "net/http" - "os" - "path/filepath" -) - -// Copy copies the file src to dst from the filesystem fs. If src is -// a directory, then all contents in the directory will be copied into the -// directory dst. If src is a file, then it will be copied directly to dst. -func Copy(fs http.FileSystem, dst, src string) error { - f, err := fs.Open(src) - if err != nil { - return err - } - defer f.Close() - - fi, err := f.Stat() - if err != nil { - return err - } - - // If this is a file, then copy the file as-is to the destination path - // and we're done. - if !fi.IsDir() { - dstF, err := os.OpenFile(dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, mode(fi)) - if err != nil { - return err - } - defer dstF.Close() - - _, err = io.Copy(dstF, f) - return err - } - - // Create this directory - if _, err := os.Stat(dst); err != nil { - if !os.IsNotExist(err) { - return err - } - - if err := os.Mkdir(dst, mode(fi)); err != nil { - return err - } - } - - // We want to copy all the files - fis, err := f.Readdir(-1) - if err != nil { - return err - } - for _, fi := range fis { - // fi.Name is in the format "src/filename" where src is the - // value of src. We need to get the relative path so that we can - // determine the proper target destination. - rel, err := filepath.Rel(src, fi.Name()) - if err != nil { - return err - } - - // Recurse! - if err := Copy(fs, filepath.Join(dst, rel), fi.Name()); err != nil { - return err - } - } - - return nil -} - -// mode returns the proper mode to use for creating files -func mode(fi os.FileInfo) os.FileMode { - if fi.IsDir() { - // We always return this. We don't use fi.Mode because go-bindata - // sets it to non-executable. - return 0755 - } - - mode := fi.Mode() - if mode > 0 { - return mode - } - - return 0644 -} diff --git a/internal/pkg/httpfs/copy_test.go b/internal/pkg/httpfs/copy_test.go deleted file mode 100644 index f7fb4e022..000000000 --- a/internal/pkg/httpfs/copy_test.go +++ /dev/null @@ -1,47 +0,0 @@ -package httpfs - -import ( - "io/ioutil" - "os" - "path/filepath" - "testing" - - "github.com/stretchr/testify/require" -) - -func TestCopy_file(t *testing.T) { - require := require.New(t) - - td, err := ioutil.TempDir("", "httpfs") - require.NoError(err) - defer os.RemoveAll(td) - - path := filepath.Join(td, "file.txt") - require.NoError(Copy(AssetFile(), path, "dir/hello.txt")) - - data, err := ioutil.ReadFile(path) - require.NoError(err) - require.Equal("Hello\n", string(data)) -} - -func TestCopy_dir(t *testing.T) { - require := require.New(t) - - td, err := ioutil.TempDir("", "httpfs") - require.NoError(err) - defer os.RemoveAll(td) - - require.NoError(Copy(AssetFile(), td, "dir")) - - { - data, err := ioutil.ReadFile(filepath.Join(td, "hello.txt")) - require.NoError(err) - require.Equal("Hello\n", string(data)) - } - - { - data, err := ioutil.ReadFile(filepath.Join(td, "subdir", "child.txt")) - require.NoError(err) - require.Equal("Child\n", string(data)) - } -} diff --git a/internal/pkg/httpfs/httpfs.go b/internal/pkg/httpfs/httpfs.go deleted file mode 100644 index dfcb03a2b..000000000 --- a/internal/pkg/httpfs/httpfs.go +++ /dev/null @@ -1,3 +0,0 @@ -package httpfs - -//go:generate go-bindata -fs -nomemcopy -nometadata -pkg httpfs -o bindata_test.go -prefix testdata/ testdata/... diff --git a/internal/pkg/httpfs/testdata/dir/hello.txt b/internal/pkg/httpfs/testdata/dir/hello.txt deleted file mode 100644 index e965047ad..000000000 --- a/internal/pkg/httpfs/testdata/dir/hello.txt +++ /dev/null @@ -1 +0,0 @@ -Hello diff --git a/internal/pkg/httpfs/testdata/dir/subdir/child.txt b/internal/pkg/httpfs/testdata/dir/subdir/child.txt deleted file mode 100644 index ef16875b6..000000000 --- a/internal/pkg/httpfs/testdata/dir/subdir/child.txt +++ /dev/null @@ -1 +0,0 @@ -Child