move things around

.gitignore

@@ -27,7 +27,7 @@ _testmain.go
 # Other dirs
 /bin/
 /pkg/
-/http/web_ui/**
+/http/webui/**
 
 # Vault-specific
 example.hcl

Makefile

@@ -139,7 +139,7 @@ update-plugins:
 	grep vault-plugin- vendor/vendor.json | cut -d '"' -f 4 | xargs govendor fetch
 
 static-assets-dir:
-	@mkdir -p ./http/web_ui
+	@mkdir -p ./http/webui
 
 test-ember:
 	@echo "--> Installing JavaScript assets"

go.mod

@@ -142,6 +142,7 @@ require (
 	github.com/rboyer/safeio v0.2.1
 	github.com/ryanuber/columnize v2.1.0+incompatible
 	github.com/ryanuber/go-glob v1.0.0
+	github.com/ryboe/q v1.0.13
 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
 	github.com/sasha-s/go-deadlock v0.2.0
 	github.com/sethvargo/go-limiter v0.3.0

go.sum

@@ -1068,6 +1068,8 @@ github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUW
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/ryboe/q v1.0.13 h1:A7lqkemc1+OmnhjH5wSrrJZZdVwEiLisOoP9QAEEAQk=
+github.com/ryboe/q v1.0.13/go.mod h1:ISWUxiBpZfTx3deLPD3TWaP4R8ZUw98Ki1IUVCo2Mjc=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=

http/handler.go

@@ -29,6 +29,7 @@ import (
 	"github.com/hashicorp/vault/sdk/helper/pathmanager"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/hashicorp/vault/vault"
+	"github.com/ryboe/q"
 )
 
 const (
@@ -570,7 +571,9 @@ type UIAssetWrapper struct {
 }
 
 func (fsw *UIAssetWrapper) Open(name string) (fs.File, error) {
+	q.Q("-->name:", name)
 	name = "web_ui/" + name
+	q.Q("-->web_ui name:", name)
 	file, err := fsw.FileSystem.Open(name)
 	if err == nil {
 		return file, nil

packages-oss.yml

@@ -241,7 +241,7 @@ layers:
   - name: build-static-assets
     source-include: Makefile
     dockerfile: |-
-      RUN go-bindata-assetfs -o bindata_assetfs.go -pkg http -prefix pkg -modtime 1480000000 -tags ui ./http/web_ui/...
+      RUN go-bindata-assetfs -o bindata_assetfs.go -pkg http -prefix pkg -modtime 1480000000 -tags ui ./http/webui/...
       RUN mkdir -p http && mv bindata_assetfs.go http/
       RUN goimports -w http/bindata_assetfs.go
   # Up to now, the layers do not vary between packages. This means the layers above

ui/.ember-cli

@@ -6,5 +6,5 @@
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
   "disableAnalytics": true,
-  "output-path": "../http/web_ui"
+  "output-path": "../http/webui"
 }

ui/package.json

@@ -23,8 +23,8 @@
     "test:browserstack": "export CI=true; node scripts/start-vault.js --browserstack",
     "test:quick": "node scripts/start-vault.js",
     "test:quick-oss": "yarn test:quick -f='!enterprise'",
-    "build:storybook": "build-storybook -s ../http/web_ui",
-    "storybook": "start-storybook -p 6006 -s ../http/web_ui",
+    "build:storybook": "build-storybook -s ../http/webui",
+    "storybook": "start-storybook -p 6006 -s ../http/webui",
     "deploy:storybook": "yarn build && yarn build:storybook",
     "gen-story-md": "node scripts/gen-story-md.js"
   },