From cbbd59d09c2b1812a5d2282efd9b27dcfe97cef3 Mon Sep 17 00:00:00 2001 From: Luke Kysow Date: Fri, 22 Sep 2017 17:58:30 -0700 Subject: [PATCH] Move bindata to static package. Clean up coverage script (#149) --- Makefile | 7 +-- scripts/coverage.sh | 24 +++------- server/server.go | 3 +- {server => static}/bindata_assetfs.go | 65 ++++----------------------- 4 files changed, 19 insertions(+), 80 deletions(-) rename {server => static}/bindata_assetfs.go (99%) diff --git a/Makefile b/Makefile index d916add6f..ecbd8fe88 100644 --- a/Makefile +++ b/Makefile @@ -29,13 +29,14 @@ test: ## Run tests, coverage reports, and clean (coverage taints the compiled co go test $(PKG) test-coverage: - ./scripts/coverage.sh + ./scripts/coverage.sh $(PKG) test-coverage-html: - ./scripts/coverage.sh --html + ./scripts/coverage.sh $(PKG) + go tool cover -html .cover/cover.out dist: ## Package up everything in static/ using go-bindata-assetfs so it can be served by a single binary - go-bindata-assetfs -pkg server static/... && mv bindata_assetfs.go server + go-bindata-assetfs -pkg static static/... && mv bindata_assetfs.go static release: ## Create packages for a release ./scripts/binary-release.sh diff --git a/scripts/coverage.sh b/scripts/coverage.sh index f3253f805..afd3beaab 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -1,13 +1,12 @@ #!/bin/sh -# From https://github.com/mlafeldt/chef-runner/blob/v0.7.0/script/coverage +# Taken and modified from https://github.com/mlafeldt/chef-runner/blob/v0.7.0/script/coverage # Generate test coverage statistics for Go packages. # # Works around the fact that `go test -coverprofile` currently does not work # with multiple packages, see https://code.google.com/p/go/issues/detail?id=6909 # -# Usage: script/coverage [--html] -# -# --html Additionally create HTML report and open it in browser +# Usage: coverage.sh packages... +# Example: coverage.sh github.com/hootsuite/atlantis github.com/hootsuite/atlantis/bootstrap # set -e @@ -20,7 +19,7 @@ generate_cover_data() { rm -rf "$workdir" mkdir "$workdir" - pkgs=$(go list ./... | grep -v e2e | grep -v vendor | grep -v static) + pkgs=$@ for pkg in $pkgs; do f="$workdir/$(echo $pkg | tr / -).cover" go test -covermode="$mode" -coverprofile="$f" "$pkg" @@ -30,17 +29,4 @@ generate_cover_data() { grep -h -v "^mode:" "$workdir"/*.cover >>"$profile" } -show_cover_report() { - go tool cover -${1}="$profile" -} - -generate_cover_data $(go list ./...) -show_cover_report func -case "$1" in -"") - ;; ---html) - show_cover_report html ;; -*) - echo >&2 "error: invalid option: $1"; exit 1 ;; -esac +generate_cover_data $@ diff --git a/server/server.go b/server/server.go index 16b241802..efcbd6c37 100644 --- a/server/server.go +++ b/server/server.go @@ -26,6 +26,7 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" "github.com/urfave/negroni" + "github.com/hootsuite/atlantis/static" ) const ( @@ -165,7 +166,7 @@ func (s *Server) Start() error { s.router.HandleFunc("/", s.index).Methods("GET").MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool { return r.URL.Path == "/" || r.URL.Path == "/index.html" }) - s.router.PathPrefix("/static/").Handler(http.FileServer(&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo})) + s.router.PathPrefix("/static/").Handler(http.FileServer(&assetfs.AssetFS{Asset: static.Asset, AssetDir: static.AssetDir, AssetInfo: static.AssetInfo})) s.router.HandleFunc("/events", s.postEvents).Methods("POST") s.router.HandleFunc("/locks", s.deleteLock).Methods("DELETE").Queries("id", "{id:.*}") lockRoute := s.router.HandleFunc("/lock", s.getLock).Methods("GET").Queries("id", "{id}").Name(lockRoute) diff --git a/server/bindata_assetfs.go b/static/bindata_assetfs.go similarity index 99% rename from server/bindata_assetfs.go rename to static/bindata_assetfs.go index 5c58afb0a..e8a96d67e 100644 --- a/server/bindata_assetfs.go +++ b/static/bindata_assetfs.go @@ -1,16 +1,14 @@ // Code generated by go-bindata. // sources: -// static/.DS_Store // static/css/custom.css // static/css/normalize.css // static/css/skeleton.css -// static/images/.DS_Store // static/images/atlantis-icon.png // static/images/atlantis-icon_512.png // static/js/jquery-3.2.1.min.js // DO NOT EDIT! -package server +package static import ( "github.com/elazarl/go-bindata-assetfs" @@ -76,26 +74,6 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _staticDs_store = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x98\x41\x6a\xc3\x30\x10\x45\xff\xa8\xa6\x08\xba\xd1\xb2\x4b\x5d\xa1\x37\x10\xc6\x3d\x81\x2f\xd0\x42\x8b\x29\xb4\x2e\xb4\x24\x6b\xaf\x72\xae\x1c\x2d\x18\xfd\x90\x10\xdb\xc1\x9b\x10\x27\xfc\x07\xe2\x2d\x3c\x23\x1b\x2f\xa4\x99\x01\x60\xe5\xea\xe3\x05\x08\x00\x3c\xb2\xb1\xc1\x28\x9e\x6b\x80\xa3\x2d\xaf\x00\x7c\xe2\x7f\x5d\xff\xb5\xdf\xbf\x6d\x33\xbe\xd7\x80\x3e\xf7\x11\x5f\xf8\xc1\x3b\x9a\x93\x7c\x9b\xb9\x87\x10\x42\x08\x21\xe6\xc3\xfb\xd5\x3f\x5d\xfb\x43\x84\x10\x8b\xa3\x3f\x1f\x22\x9d\xe8\x2e\xdb\xf8\xdc\xd1\xc5\x51\x4e\xa0\x23\x9d\xe8\x2e\xdb\x18\xe7\xe8\x82\xf6\x74\xa0\x23\x9d\xe8\x2e\x9b\x87\x96\xb1\xf9\x30\xbe\xd9\xd8\xa1\x58\xa0\x23\x9d\x2e\xf3\x6f\x84\xb8\x75\x1e\xb2\x42\x7f\xff\xbf\x4e\xf7\xff\x42\x88\x3b\xc6\x8a\xaa\xae\xca\x33\x03\x37\xc7\x42\xe0\x8d\x31\xdb\x7d\xe2\x44\x21\xe0\xf2\xc0\xf0\x19\x87\x38\x15\x03\x42\x2c\x88\x5d\x00\x00\x00\xff\xff\x7a\xa4\x54\x90\x04\x18\x00\x00") - -func staticDs_storeBytes() ([]byte, error) { - return bindataRead( - _staticDs_store, - "static/.DS_Store", - ) -} - -func staticDs_store() (*asset, error) { - bytes, err := staticDs_storeBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "static/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1501623883, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - var _staticCssCustomCss = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x59\x6d\x6f\x1b\xb9\x11\xfe\xae\x5f\x31\xbd\x20\x40\xec\x9a\xf2\x4a\x7e\x89\xbd\x06\x8a\xbb\x33\x12\xdc\x87\xb6\x28\xda\xfe\x01\x6a\x39\x2b\xb1\xe6\x92\x0b\x92\xb2\xa4\x04\xfa\xef\x05\xdf\xf6\x45\xbb\x2b\xc7\xc1\x39\x88\x21\xed\xce\x0c\x87\xc3\x67\x9e\x19\x8e\xe7\x85\x92\x96\x72\x89\x1a\xbe\xcf\x00\x2a\xba\x27\x3b\xce\xec\x26\x87\x45\x96\x65\xf5\xfe\x09\x8e\xb3\xf9\x06\x29\x6b\x04\xf4\x9a\x4b\x62\x55\x9d\xc3\xbd\xc6\xea\x69\x06\x60\x71\x6f\x09\x15\x7c\x2d\x73\x28\x50\x5a\xd4\x8d\x16\x97\x6b\x52\x2a\x69\x89\xe1\xdf\xd0\x1b\x68\xbe\xe5\xb0\x98\x2f\xa3\x85\x42\x09\xa5\x73\xf8\xf0\xf8\xf8\xe8\xbe\x0a\xb4\x16\x35\x31\x35\x2d\xb8\x5c\xe7\x20\x95\xae\xa8\xf0\x46\x0b\xc5\x90\xe0\x9e\x56\xb5\xc0\x81\x43\x8b\xf9\x5d\x34\x18\x9f\xae\x94\xb5\xaa\xca\x21\x1b\xe8\x92\x95\x62\x07\x6f\x60\xb7\xe1\x16\xfd\x5a\x98\x43\xad\xd1\xa9\xef\x94\x66\x64\xa7\x69\x9d\xc3\x4a\x23\x7d\x21\xee\x81\x33\x21\xe9\xeb\x8a\x86\x48\x30\x6e\x6a\x41\x0f\xce\x3b\x89\xd1\xbe\xb4\x28\x2d\xb1\x74\x25\x90\xc4\xed\x0f\x36\x7d\x5b\xef\x9f\x8e\x33\xdb\xac\xdf\x7d\xb7\xf4\xef\xe6\xb4\xe2\x84\xa1\xa5\x5c\x18\x2f\x12\x43\x6c\x35\x95\xa6\x54\xba\xca\x61\x5b\xd7\xa8\x0b\x6a\xbc\xb7\x13\x41\x1d\xc6\xb1\xf3\xca\x6b\xec\x90\xaf\x37\x36\x87\xfb\x2c\x7b\x6a\x97\x89\x27\x29\xb0\xb4\x4f\xb3\xe4\x0d\xb5\x74\xc2\x15\xb7\x7d\xf8\x0b\xaf\x6a\xa5\x2d\x95\xf6\x4f\x71\x68\xe1\x1c\x3a\xce\xe6\x5c\x1a\x4b\x65\x81\x44\xd2\x0a\x89\xa5\x9d\x68\x96\xb4\xe2\xe2\x90\x43\xa5\xa4\xf2\x87\x77\xd5\x7e\x7c\x3a\xc5\xd9\xad\x5f\xe6\x38\x9b\xd7\x82\x16\xb8\x51\x22\xc1\xf9\xfd\xa6\x4e\x20\xbb\xd6\x78\x68\x65\xec\x41\x60\x0e\xdc\x52\xc1\x8b\x89\xcc\x70\x5e\x08\x15\x32\x83\x57\xeb\x11\x28\x4d\xeb\x69\x5c\x73\x25\x89\x41\x81\x85\xf5\x9a\x63\x82\x00\xa5\x50\xd4\x8e\x9c\xcc\x71\xf6\x21\x9a\x10\xdc\xd8\x41\xfa\x3c\xd4\x7b\x27\x33\xbb\xbe\x84\xbf\x53\xbd\x46\x0d\x76\x43\x25\xd4\x1b\x67\xe7\xf2\x7a\xf6\x6b\x85\x8c\x53\xf8\x54\x71\x99\x48\xe2\xee\x2e\xab\xf7\x17\xde\x52\x97\x25\x4e\xd2\x32\x73\x31\x83\xa3\x13\x7a\xa5\x62\x8b\xa4\xd6\xaa\x36\x23\x92\x8f\x0d\x1c\x4e\x12\xf8\xf3\xa9\x85\x14\xba\x81\xe4\xa2\x95\x4c\xa9\xbe\xd6\x9c\xc1\xbc\x50\x62\x5b\xc9\xab\xa9\x17\x66\xc2\x5c\xa0\x94\x60\x90\xa9\xc2\x10\x83\x85\xe5\x4a\x46\xf1\x9a\x32\xe6\xa1\xec\xc8\x30\xf0\x4c\x67\x01\x83\x92\x91\x83\xda\x6a\x83\xa2\x24\x85\xaa\x0f\x51\x2d\x9e\x90\x76\x70\x7f\x1a\x06\x6c\x19\x88\xb7\x6b\xa9\xd0\x88\xd2\x6c\x94\xf5\xbc\x54\x37\x81\xae\x95\xe1\xce\x9f\x1c\xe8\xca\x28\xb1\xb5\x91\x12\xe2\x01\xdd\x3e\x7c\x0c\xdf\x37\x6d\x6a\x7d\x4c\xc9\x58\x5a\x47\x8d\x71\xf9\x3d\x49\x22\x89\xd0\x86\x50\xf0\xcc\x66\x27\xb0\xf0\xb9\xc5\xc2\xf5\x25\xfc\x33\x30\xe5\xe5\xb5\xdb\x45\xa4\xcd\xbf\x8e\x86\x70\xa5\x34\x43\xed\x76\x9e\x2c\xa5\x30\x06\xb5\xab\xf6\x63\xa0\xe9\xb4\xf5\x26\x6d\x56\x42\x15\x2f\xbd\x6d\xb7\xbb\x4c\x9b\xba\x6f\x6a\x03\xc0\x8a\x16\x2f\x6b\xad\xb6\x92\xe5\xf0\xa1\x2c\xcb\xf0\xf4\x1b\xe1\x92\xe1\x3e\x87\x50\x84\xba\x8e\xe5\xb0\xa8\xf7\x60\x94\xe0\x0c\x3e\x20\x62\xef\x7d\x03\x95\xbe\x48\x77\x0b\x13\x7e\xa7\x40\xb7\x11\xfa\x1b\x9c\x14\xe4\xfe\x8e\x7a\x36\x9b\x1c\x06\x70\x1f\x13\xfb\x24\x0e\x19\x2f\x82\xad\x3a\xb7\x58\x0d\x30\xa4\x51\x50\xcb\x5f\x53\x59\x09\x28\x0d\x95\xe0\x6d\x8b\x82\xcb\x97\xf7\xd7\xab\x85\x63\x9d\xe9\x92\x74\xa6\x64\xf8\x45\x18\x16\x4a\xd3\xe0\x7d\xbb\x75\xc1\x25\x92\xb1\xa3\x4f\x9d\xc6\x72\xb9\x1c\x3a\x3f\xa7\x85\xdb\x7c\xdc\x43\x12\xbd\xb9\x79\xbe\xf9\x9a\xb6\xba\xa1\x86\x30\x55\xbc\x20\x23\x92\xbe\x42\xb7\x21\xe8\xc6\xb1\xe4\x7b\x64\xd1\x4b\x07\x9f\xac\x9f\x72\xe7\x6c\x9d\xc5\xb8\x57\xbc\xbe\x84\x7f\x23\x51\xaf\xa8\xb9\xef\x30\xec\x06\x03\x4a\x3c\x48\x80\x61\x21\x68\x08\x09\x58\x05\x15\xb5\xc5\x06\x7c\xff\xa5\x4a\xf8\x08\x2b\x6a\x90\x41\x8b\xb2\x90\xa1\x13\xfb\x9a\xc6\xe3\x43\x80\x63\x70\xe7\x5f\xaa\x76\xee\x44\x5b\x75\xf8\x36\x57\x35\xca\xc9\x54\x3d\x76\x24\x47\xf3\xe2\x2c\xbb\x8d\x05\xf5\x4c\x6a\x87\x4c\x3d\x9b\xc5\x9a\x32\xbe\x35\x39\xdc\x26\x38\x86\x82\xb4\xec\x91\x25\xb9\x4b\xb4\x42\x76\xb8\x7a\xe1\x96\x94\x5c\x58\x67\x99\x69\x55\x13\xb3\xa1\x4c\xed\x3e\x65\x90\xc1\x7d\xbd\x07\xbd\x5e\xd1\x4f\xd9\x95\xfb\x37\x5f\x5c\x5c\x04\x45\xa7\x5b\xa9\x6f\x3f\xa5\xe8\x7f\xde\xa3\xd8\x8b\xb2\xcf\xf8\xbc\xe4\xda\x58\x52\x6c\xb8\x60\xed\x1b\x07\xfe\x9c\x96\x16\x03\xd9\xfe\xa0\xc2\x0a\x4b\xa5\xb1\x61\xf1\xc8\x82\x27\xf5\xa5\x89\x58\x3a\x83\x10\x7f\xcf\x0d\x35\xd5\x98\x3a\xc6\xd8\x3c\xe7\xf0\x0b\xfc\xd2\x67\xee\xac\xc7\xec\xd9\x79\x60\xd4\x8a\xbb\x2e\x88\xe0\x2b\x4a\x6b\x7a\x14\xfb\x9e\x30\xf4\x4b\x53\x64\x02\x1f\xdd\xe5\xdd\xdd\x15\xb4\xbf\xb2\x8b\x91\x5a\x90\x14\x4e\x01\xd8\x5e\xad\x12\xc8\x22\xa1\x46\x74\x2d\xb2\xa6\xee\xff\xdc\x11\x0c\xbd\xbd\x79\xb8\x82\xf6\xd7\x79\x6f\x4f\x53\x22\x79\xbb\x98\xf0\x76\x31\xf0\xb6\x53\x92\x9a\xc6\x28\xeb\xea\xb6\x49\x7b\x5a\xb1\x86\xdb\x7e\xd3\xd0\xe9\xda\x4d\xf5\x99\xaa\x67\x5d\xf2\x9f\xec\x20\x9a\xf5\x1e\xea\x3d\x2c\x9b\x93\x3a\x5f\xec\xdf\xaa\x47\xef\xb9\xbf\x65\xef\xb8\xa4\xb5\x3d\xff\x48\xa5\xec\xb4\xc2\x3f\x06\xa7\x3e\x8e\x3a\x8c\xe8\xff\x67\x83\x90\x7b\x6b\x82\xbe\xc7\x98\x63\xaa\x68\x70\x0c\x8a\x27\x0d\x60\x0f\xeb\x9b\x4e\xa9\x18\x26\x58\x97\xf7\x7b\x15\x7b\x68\xe3\x3d\x1c\xe7\x15\xc6\x38\xe1\x24\x77\xda\x25\xdb\x41\x40\xf7\x82\x95\x70\xb3\x0c\x77\xac\xb9\xc7\xbf\xe5\x36\x4e\x31\xc6\x11\xdb\xeb\xbf\x92\x92\xb1\xd4\x6e\xcd\xdb\x5a\xf1\x6e\xd1\xae\x55\xa1\xb1\xb4\xaa\x7f\x58\xb3\x49\x05\xa2\x03\x02\x93\xef\x5b\xe9\xb2\x85\x30\x6e\x0a\xaa\x19\x59\xd9\x50\xe5\x4f\xe8\x07\xd9\xc9\x54\xa0\x3d\xa2\x29\x99\xe3\x6c\x6e\x2c\x35\x1b\xd7\x82\x90\xd4\x56\xbd\xf7\x8a\xeb\x4c\x58\x24\xaf\x1c\x77\x69\x66\xc5\x65\xd3\x0b\xde\xdc\x65\x71\x17\x15\x1a\x43\xd7\x38\x1d\xc9\xae\x4c\xa1\x18\x7e\x1f\xdd\xc3\x87\xe5\x97\xe7\xe7\xcf\x8b\xa7\x59\x5b\xe1\x3a\x8f\x92\xd0\x57\xff\xd3\xb3\x49\x50\x6b\xa5\xcf\x59\xfe\xf2\xf9\xf6\xf9\xe6\xb9\x67\xb9\x7d\x34\x62\x39\x9c\x8b\x33\xd6\x5c\xf6\xee\x43\x9a\x0d\x2e\x97\xb3\x93\x16\x79\xf1\x10\x1e\xb6\x64\xdb\x14\xa9\xf1\x11\x49\x0b\xac\x76\xd5\x21\xf0\x1c\x4c\xb4\xda\xb9\x97\xc5\x56\x1b\xe7\x30\xc3\x92\x6e\x85\x4d\x83\x86\xff\x6e\x10\xfe\xa1\x18\x15\xf0\xa9\x8d\xc0\x85\x6b\x24\xe7\x95\x7f\x3c\x7a\x65\xba\xbe\x84\x3f\x38\x63\x28\x61\x75\x48\x16\x43\xf3\x39\x6c\xc2\x9d\xf0\x7f\x2c\x3d\x00\x97\xe0\xc7\x3f\x49\xb0\xb9\xef\x2d\x82\x0c\xb7\xe0\x3b\xe6\xba\xb1\x14\xe1\x1f\x87\x18\xbe\x38\xbb\x0b\xb1\x2a\x42\x73\xad\x4a\xdf\x7a\xaf\xd4\x3e\x69\xf4\x5a\xd1\x6e\x8f\xda\xbb\xc4\x5d\x5f\xc2\xd7\xad\x10\xb1\x67\x8f\xaa\xbd\xfb\x79\x23\x12\x9e\x26\x19\xc7\x45\xa5\x50\xbb\x1c\xe8\xd6\x2a\x2f\xf5\x45\xba\x2b\x39\x98\x42\x2b\x21\x80\x97\x20\x11\x19\xb2\xa4\x31\x92\x73\xeb\x55\xe8\x10\x2f\xc2\x2a\x54\x08\x27\x14\xf0\x74\x56\x2d\x75\x96\xd9\xfc\x36\xe8\xfe\x2e\x9c\xe2\xee\x1a\x94\x2b\x39\xf6\xe0\xb4\xc3\xa9\x86\x13\xfd\x23\x0c\x84\x9a\xb3\x24\xbd\x09\x51\xaf\xce\x26\x50\x8e\x67\x98\xff\xe9\x95\x70\x3f\xb4\x7d\xea\xad\xf6\xbb\x62\x87\xce\x5a\x61\xbe\xda\x2c\xb2\xf0\xab\xdc\xfb\xf9\x6a\xab\xf3\x1c\x89\xba\x55\xeb\x52\xf7\x74\x23\x31\xe2\x64\x89\xee\x5f\xbf\x45\xf1\xa7\x34\xda\xc4\x8c\x5c\x48\x1e\x1e\x1e\x7a\x58\xe9\x34\xce\xfb\xd8\xe7\xe7\xb1\x78\x3e\xf8\x6a\xdc\x3b\x92\xe5\xc5\x55\xb8\x02\xb8\x8e\xe5\xf4\xe5\xe2\xf1\xa2\x7f\x6b\xa1\x92\x57\x1e\xc3\x7e\xb0\x9a\x43\xf8\x8e\x56\xd5\x53\x72\x6c\x9b\x9a\x9a\x6c\x7e\x6b\x82\xd4\x5b\x56\xa6\xb4\xe3\xb1\xfd\xc6\x18\xfc\x96\x44\xfc\x4c\x29\x2d\xfb\x82\x87\x52\xd3\x0a\x4d\xc7\x64\x1a\x9c\x69\x55\xc1\x77\x9f\x5a\xe4\x26\xa4\x64\x44\x5f\x0e\xd9\x11\x62\xe2\x45\x89\xac\xf3\x72\xe1\xe7\x59\xbf\xfe\xb4\xe9\xb7\x2c\xcf\xff\x67\x9a\x8a\x68\xb6\x45\x81\xc6\xfc\xe0\x84\xb9\xdf\xfd\x2d\x5c\xcf\x36\x3e\xff\x9d\xcd\x7d\xc3\x30\xfc\xcb\xc2\x9f\x61\x1e\x8e\x30\x9b\xcd\x4d\x45\x85\x18\xfe\x9d\x26\x0b\xe3\xf3\xff\x07\x00\x00\xff\xff\x82\x7f\xce\xa8\x2d\x1a\x00\x00") func staticCssCustomCssBytes() ([]byte, error) { @@ -111,7 +89,7 @@ func staticCssCustomCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/custom.css", size: 6701, mode: os.FileMode(420), modTime: time.Unix(1498429553, 0)} + info := bindataFileInfo{name: "static/css/custom.css", size: 6701, mode: os.FileMode(420), modTime: time.Unix(1498689570, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -131,7 +109,7 @@ func staticCssNormalizeCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/normalize.css", size: 7797, mode: os.FileMode(420), modTime: time.Unix(1495672473, 0)} + info := bindataFileInfo{name: "static/css/normalize.css", size: 7797, mode: os.FileMode(420), modTime: time.Unix(1495690053, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -151,27 +129,7 @@ func staticCssSkeletonCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/skeleton.css", size: 11452, mode: os.FileMode(420), modTime: time.Unix(1495672473, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _staticImagesDs_store = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x98\xc1\x4a\xf3\x40\x14\x46\xcf\x9d\x3f\xfc\x04\xdc\x8c\x0b\xc1\x65\x96\x6e\x14\x2a\xb8\x0f\xa5\x2e\xdc\xea\x03\x68\x5b\x41\x0a\x21\x11\xac\xfb\x3c\xa6\x6f\x53\x49\xe7\x2b\xad\x34\x75\x57\x8c\x72\x0f\x84\x13\x98\xcc\x97\x61\x16\x93\x7b\x03\xd8\xf8\xfd\x79\x04\x11\xc8\x49\xb6\xee\xa6\x87\x5c\xd7\x1e\x61\xc7\xb6\xce\xa8\x59\xb2\xe0\x8d\x4b\x16\xfd\x59\x83\xa3\x5b\xfb\x29\x53\x96\x54\x4c\xbf\xac\x7f\x4e\x43\xcd\x15\xaf\xd4\xbc\xdc\x55\xcd\x7c\x56\x35\xb3\xb4\x55\x76\x0f\x5c\x00\xd9\x6a\xb5\x4e\x39\xfb\x26\xe1\x91\x1b\x46\x5c\x1f\x48\xfa\x50\xd2\x7f\x25\x39\x8e\xe3\x38\xce\xb1\xb1\xa4\xfc\xe4\xa7\x17\xe2\x38\xce\xe0\xe8\xce\x87\x42\x2e\xe5\x36\xd9\x34\x1e\xe4\x6c\x67\x4e\x94\x0b\xb9\x94\xdb\x64\xd3\x73\x41\xce\xe4\x5c\x8e\x72\x21\x97\x72\x9b\xac\x43\xcb\xd4\x7c\x98\xde\xbc\x69\x5e\x2c\xca\x85\x5c\x1e\x67\x6f\x1c\xe7\xb7\xf3\x2f\x29\x76\xdf\xff\xdb\xc3\xfd\xbf\xe3\x38\x7f\x18\xcb\x26\x0f\x93\xf1\xb6\x21\xd8\x23\xa8\x10\x78\xda\x4c\x50\x21\x40\x4f\x11\x10\xd2\xcf\xc2\x73\xb6\xe3\x5e\x08\x38\xce\xc0\xf8\x0c\x00\x00\xff\xff\x31\xf7\x5e\x38\x04\x18\x00\x00") - -func staticImagesDs_storeBytes() ([]byte, error) { - return bindataRead( - _staticImagesDs_store, - "static/images/.DS_Store", - ) -} - -func staticImagesDs_store() (*asset, error) { - bytes, err := staticImagesDs_storeBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "static/images/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1501624841, 0)} + info := bindataFileInfo{name: "static/css/skeleton.css", size: 11452, mode: os.FileMode(420), modTime: time.Unix(1495690053, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -191,7 +149,7 @@ func staticImagesAtlantisIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/images/atlantis-icon.png", size: 4238, mode: os.FileMode(420), modTime: time.Unix(1501624335, 0)} + info := bindataFileInfo{name: "static/images/atlantis-icon.png", size: 4238, mode: os.FileMode(420), modTime: time.Unix(1501691854, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -211,7 +169,7 @@ func staticImagesAtlantisIcon_512Png() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/images/atlantis-icon_512.png", size: 49782, mode: os.FileMode(420), modTime: time.Unix(1501624460, 0)} + info := bindataFileInfo{name: "static/images/atlantis-icon_512.png", size: 49782, mode: os.FileMode(420), modTime: time.Unix(1501691854, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -231,7 +189,7 @@ func staticJsJquery321MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/jquery-3.2.1.min.js", size: 86659, mode: os.FileMode(420), modTime: time.Unix(1498429553, 0)} + info := bindataFileInfo{name: "static/js/jquery-3.2.1.min.js", size: 86659, mode: os.FileMode(420), modTime: time.Unix(1498689570, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -288,11 +246,9 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "static/.DS_Store": staticDs_store, "static/css/custom.css": staticCssCustomCss, "static/css/normalize.css": staticCssNormalizeCss, "static/css/skeleton.css": staticCssSkeletonCss, - "static/images/.DS_Store": staticImagesDs_store, "static/images/atlantis-icon.png": staticImagesAtlantisIconPng, "static/images/atlantis-icon_512.png": staticImagesAtlantisIcon_512Png, "static/js/jquery-3.2.1.min.js": staticJsJquery321MinJs, @@ -339,14 +295,12 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ "static": &bintree{nil, map[string]*bintree{ - ".DS_Store": &bintree{staticDs_store, map[string]*bintree{}}, "css": &bintree{nil, map[string]*bintree{ "custom.css": &bintree{staticCssCustomCss, map[string]*bintree{}}, "normalize.css": &bintree{staticCssNormalizeCss, map[string]*bintree{}}, "skeleton.css": &bintree{staticCssSkeletonCss, map[string]*bintree{}}, }}, "images": &bintree{nil, map[string]*bintree{ - ".DS_Store": &bintree{staticImagesDs_store, map[string]*bintree{}}, "atlantis-icon.png": &bintree{staticImagesAtlantisIconPng, map[string]*bintree{}}, "atlantis-icon_512.png": &bintree{staticImagesAtlantisIcon_512Png, map[string]*bintree{}}, }}, @@ -405,11 +359,8 @@ func _filePath(dir, name string) string { func assetFS() *assetfs.AssetFS { - assetInfo := func(path string) (os.FileInfo, error) { - return os.Stat(path) - } for k := range _bintree.Children { - return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k} + return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: k} } panic("unreachable") }