- Notifications
You must be signed in to change notification settings - Fork928
feat: bundle a local version of install.sh#16064
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
feat: bundle a local version of install.sh
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitbb5f5f2a7f2cf0269638f12c68ed09006022d5af
There are no files selected for viewing
19 changes: 14 additions & 5 deletionsMakefile
This file contains hidden or 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
43 changes: 42 additions & 1 deletionsite/site.go
This file contains hidden or 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 |
|---|---|---|
| @@ -160,6 +160,11 @@ func New(opts *Options) *Handler { | ||
| handler.buildInfoJSON = html.EscapeString(string(buildInfoResponse)) | ||
| handler.handler = mux.ServeHTTP | ||
| handler.installScript, err = parseInstallScript(opts.SiteFS, opts.BuildInfo) | ||
| if err != nil { | ||
| _ = xerrors.Errorf("install.sh will be unavailable: %w", err) | ||
aslilac marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| return handler | ||
| } | ||
| @@ -169,8 +174,8 @@ type Handler struct { | ||
| secureHeaders *secure.Secure | ||
| handler http.HandlerFunc | ||
| htmlTemplates *template.Template | ||
| buildInfoJSON string | ||
| installScript []byte | ||
| // RegionsFetcher will attempt to fetch the more detailed WorkspaceProxy data, but will fall back to the | ||
| // regions if the user does not have the correct permissions. | ||
| @@ -217,6 +222,16 @@ func (h *Handler) ServeHTTP(rw http.ResponseWriter, r *http.Request) { | ||
| // If the asset does not exist, this will return a 404. | ||
| h.handler.ServeHTTP(rw, r) | ||
| return | ||
| // If requesting the install.sh script, respond with the preprocessed version | ||
| // which contains the correct hostname and version information. | ||
| case reqFile == "install.sh": | ||
| if h.installScript == nil { | ||
| http.NotFound(rw, r) | ||
| return | ||
| } | ||
| rw.Header().Add("Content-Type", "text/plain; charset=utf-8") | ||
| http.ServeContent(rw, r, reqFile, time.Time{}, bytes.NewReader(h.installScript)) | ||
| return | ||
| // If the original file path exists we serve it. | ||
| case h.exists(reqFile): | ||
| if ShouldCacheFile(reqFile) { | ||
| @@ -533,6 +548,32 @@ func findAndParseHTMLFiles(files fs.FS) (*template.Template, error) { | ||
| return root, nil | ||
| } | ||
| type installScriptState struct { | ||
| Origin string | ||
| Version string | ||
| } | ||
| func parseInstallScript(files fs.FS, buildInfo codersdk.BuildInfoResponse) ([]byte, error) { | ||
| scriptFile, err := fs.ReadFile(files, "install.sh") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| script, err := template.New("install.sh").Parse(string(scriptFile)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var buf bytes.Buffer | ||
| state := installScriptState{Origin: buildInfo.DashboardURL, Version: buildInfo.Version} | ||
| err = script.Execute(&buf, state) | ||
aslilac marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return buf.Bytes(), nil | ||
| } | ||
| // ExtractOrReadBinFS checks the provided fs for compressed coder binaries and | ||
| // extracts them into dest/bin if found. As a fallback, the provided FS is | ||
| // checked for a /bin directory, if it is non-empty it is returned. Finally | ||
6 changes: 6 additions & 0 deletionssite/site_test.go
This file contains hidden or 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.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.