forked from hashicorp/vault
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace go-bindata-assetfs build dependency with native go:embed (has…
…hicorp#11208) * copy over the webui move web_ui to http remove web ui files, add .gitkeep updates, messing with gitkeep and ignoring web_ui update ui scripts gitkeep ignore http/web_ui Remove debugging remove the jwt reference, that was from something else restore old jwt plugin move things around Revert "move things around" This reverts commit 2a35121. Update ui path handling to not need the web_ui name part add desc move the http.FS conversion internal to assetFS update gitignore remove bindata dep clean up some comments remove asset check script that's no longer needed Update readme remove more bindata things restore asset check update packagespec update stub stub the assetFS method and set uiBuiltIn to false for non-ui builds update packagespec to build ui * fail if assets aren't found * tidy up vendor * go mod tidy * updating .circleci * restore tools.go * re-re-re-run make packages * re-enable arm64 * Adding change log * Removing a file Co-authored-by: hamid ghaf <[email protected]>
- Loading branch information
Showing
19 changed files
with
1,190 additions
and
1,198 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:change | ||
| ui: replaces Vault's use of elazarl/go-bindata-assetfs in building the UI with Go's native Embed package | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // +build ui | ||
|
|
||
| package http | ||
|
|
||
| import ( | ||
| "embed" | ||
| "io/fs" | ||
| "net/http" | ||
| ) | ||
|
|
||
| // content is our static web server content. | ||
| //go:embed web_ui/* | ||
| var content embed.FS | ||
|
|
||
| // assetFS is a http Filesystem that serves the generated web UI from the | ||
| // "ember-dist" make step | ||
| func assetFS() http.FileSystem { | ||
| // sub out to web_ui, where the generated content lives | ||
| f, err := fs.Sub(content, "web_ui") | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| return http.FS(f) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.