Remove assets dir (#346)

fabric8-services · Feb 26, 2018 · 01b01ca · 01b01ca
1 parent 067fb24
commit 01b01ca
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 106 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -20,10 +20,8 @@ coverage:
 
   # See http://docs.codecov.io/docs/ignoring-paths
   ignore:
-   - "*/bindata_assetfs.go"
    - "vendor/*"
    - "app/*"
-   - "assets/js/*"
    - "client/*"
    - "swagger/*"
    - "tool/cli/*"

diff --git a/.gitignore b/.gitignore
@@ -73,8 +73,6 @@ vendor/
 
 # Generated assets
 app/
-assets/js/
-bindata_assetfs.go
 client/
 swagger/
 tool/cli/

diff --git a/.gofmt_exclude b/.gofmt_exclude
@@ -1,4 +1,3 @@
-bindata_assetfs\.go
 sqlbindata
 confbindata
 design/.*

diff --git a/.golint_exclude b/.golint_exclude
@@ -1,4 +1,3 @@
-bindata_assetfs\.go
 sqlbindata
 confbindata
 design/.*

diff --git a/.make/Makefile.lnx b/.make/Makefile.lnx
@@ -4,7 +4,6 @@ GLIDE_BIN=glide
 GOAGEN_BIN=$(VENDOR_DIR)/github.com/goadesign/goa/goagen/goagen
 GO_BINDATA_BIN=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/go-bindata
 GO_BINDATA_DIR=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/
-GO_BINDATA_ASSETFS_BIN=$(VENDOR_DIR)/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/go-bindata-assetfs
 FRESH_BIN=$(VENDOR_DIR)/github.com/pilu/fresh/fresh
 EXTRA_PATH=$(shell dirname $(GO_BINDATA_BIN))
 GOCOV_BIN=$(VENDOR_DIR)/github.com/axw/gocov/gocov/gocov

diff --git a/.make/Makefile.win b/.make/Makefile.win
@@ -4,7 +4,6 @@ GLIDE_BIN=glide.exe
 GOAGEN_BIN=$(VENDOR_DIR)/github.com/goadesign/goa/goagen/goagen.exe
 GO_BINDATA_BIN=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/go-bindata.exe
 GO_BINDATA_DIR=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/
-GO_BINDATA_ASSETFS_BIN=$(VENDOR_DIR)/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/go-bindata-assetfs.exe
 FRESH_BIN=$(VENDOR_DIR)/github.com/pilu/fresh/fresh.exe
 EXTRA_PATH=$(shell cygpath --unix '$(GO_BINDATA_DIR)')
 GOCOV_BIN=$(VENDOR_DIR)/github.com/axw/gocov/gocov/gocov.exe

diff --git a/.make/test.mk b/.make/test.mk
@@ -293,9 +293,7 @@ $(COV_PATH_OVERALL): $(GOCOVMERGE_BIN)
 # Console coverage output:
 
 # First parameter: file to do in-place replacement with.
-# Delete the lines containing /bindata_assetfs.go
 define cleanup-coverage-file
-@sed -i '/.*\/bindata_assetfs\.go.*/d' $(1)
 @sed -i '/.*\/sqlbindata\.go.*/d' $(1)
 @sed -i '/.*\/confbindata\.go.*/d' $(1)
 endef

diff --git a/Makefile b/Makefile
@@ -194,8 +194,6 @@ $(GOAGEN_BIN): $(VENDOR_DIR)
 	cd $(VENDOR_DIR)/github.com/goadesign/goa/goagen && go build -v
 $(GO_BINDATA_BIN): $(VENDOR_DIR)
 	cd $(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata && go build -v
-$(GO_BINDATA_ASSETFS_BIN): $(VENDOR_DIR)
-	cd $(VENDOR_DIR)/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs && go build -v
 $(FRESH_BIN): $(VENDOR_DIR)
 	cd $(VENDOR_DIR)/github.com/pilu/fresh && go build -v
 $(GO_JUNIT_BIN): $(VENDOR_DIR)
@@ -218,11 +216,9 @@ CLEAN_TARGETS += clean-generated
 ## Removes all generated code.
 clean-generated:
 	-rm -rf ./app
-	-rm -rf ./assets/js
 	-rm -rf ./client/
 	-rm -rf ./swagger/
 	-rm -rf ./tool/cli/
-	-rm -f ./bindata_assetfs.go
 	-rm -f ./migration/sqlbindata.go
 	-rm -f ./migration/sqlbindata_test.go
 	-rm -f ./configuration/confbindata.go
@@ -259,21 +255,14 @@ app/controllers.go: $(DESIGNS) $(GOAGEN_BIN) $(VENDOR_DIR)
 	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-tenant/design --notool --pkg tenant -o account
 	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-notification/design --notool --pkg client -o notification
 
-
-assets/js/client.js: $(DESIGNS) $(GOAGEN_BIN) $(VENDOR_DIR)
-	$(GOAGEN_BIN) js -d ${PACKAGE_NAME}/${DESIGN_DIR} -o assets/ --noexample
-
-bindata_assetfs.go: $(DESIGNS) $(GO_BINDATA_ASSETFS_BIN) $(GO_BINDATA_BIN) $(VENDOR_DIR)
-	PATH="$$PATH:$(EXTRA_PATH)" $(GO_BINDATA_ASSETFS_BIN) -debug assets/...
-
 .PHONY: migrate-database
 ## Compiles the server and runs the database migration with it
 migrate-database: $(BINARY_SERVER_BIN)
 	$(BINARY_SERVER_BIN) -migrateDatabase
 
 .PHONY: generate
 ## Generate GOA sources. Only necessary after clean of if changed `design` folder.
-generate: app/controllers.go assets/js/client.js bindata_assetfs.go migration/sqlbindata.go configuration/confbindata.go
+generate: app/controllers.go migration/sqlbindata.go configuration/confbindata.go
 
 .PHONY: regenerate
 ## Runs the "clean-generated" and the "generate" target

diff --git a/README.adoc b/README.adoc
@@ -253,11 +253,9 @@ Only files `+./*.go+`, `+./design/*.go+`, `+./models/*.go+` and `+./tool/wit-cli
 These files and directory are generated:
 
  * `./app/`
- * `./assets/js/`
  * `./client/`
  * `./swagger/`
  * `./tool/cli/`
- * `./bindata_asstfs.go`
 
 == Developer setup
 

diff --git a/assets/index.html b/assets/index.html
diff --git a/docs/reference.html b/docs/reference.html
@@ -1103,7 +1103,7 @@ <h4 id="_how_to_use_an_offline_token">How to use an Offline Token</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-02-14 22:30:09 PST
+Last updated 2018-02-15 16:50:21 PST
 </div>
 </div>
 </body>

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -40,9 +40,6 @@ import:
   version: ^3.0.7
   subpackages:
   - '...'
-- package: github.com/elazarl/go-bindata-assetfs
-  subpackages:
-  - go-bindata-assetfs
 - package: golang.org/x/tools
   subpackages:
   - go/ast/astutil

diff --git a/main.go b/main.go
@@ -268,7 +268,6 @@ func main() {
 	log.Logger().Infoln("NumCPU:         ", runtime.NumCPU())
 
 	http.Handle("/api/", service.Mux)
-	http.Handle("/", http.FileServer(assetFS()))
 	http.Handle("/favicon.ico", http.NotFoundHandler())
 
 	// Start/mount metrics http

diff --git a/runner.conf b/runner.conf
@@ -1,4 +1,4 @@
 root:              .
 tmp_path:          ./tmp
 valid_ext:         .go, .tpl, .tmpl, .html
-ignored:           assets, tmp, vendor
+ignored:           tmp, vendor