Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

return a 404 if not found instead of redirect to ui #6658

Merged
merged 3 commits into from
Nov 11, 2019
Merged

return a 404 if not found instead of redirect to ui #6658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39280e7
returns a 404 if not found instead of redirect to ui
drewbailey Nov 8, 2019
d91a5e6
update test
drewbailey Nov 8, 2019
29585dd
better func name, swap conditional
drewbailey Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions api/allocations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package api

import (
"context"
"fmt"
"os"
"reflect"
"sort"
Expand Down Expand Up @@ -265,8 +266,10 @@ func TestAllocations_ExecErrors(t *testing.T) {
}
job.Canonicalize()

allocID := uuid.Generate()

alloc := &Allocation{
ID: "",
ID: allocID,
Namespace: DefaultNamespace,
EvalID: uuid.Generate(),
Name: "foo-bar[1]",
Expand All @@ -280,9 +283,10 @@ func TestAllocations_ExecErrors(t *testing.T) {

// make a request that will result in an error
// ensure the error is what we expect
_, err := a.Exec(context.Background(), alloc, "bar", false, []string{"command"}, os.Stdin, os.Stdout, os.Stderr, sizeCh, nil)
require.Contains(t, err.Error(), "Unexpected response code: 301")
require.Contains(t, err.Error(), "Moved Permanently")
exitCode, err := a.Exec(context.Background(), alloc, "bar", false, []string{"command"}, os.Stdin, os.Stdout, os.Stderr, sizeCh, nil)

require.Equal(t, exitCode, -2)
require.Equal(t, err.Error(), fmt.Sprintf("Unknown allocation \"%s\"", allocID))
}

func TestAllocations_ShouldMigrate(t *testing.T) {
Expand Down
11 changes: 7 additions & 4 deletions command/agent/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func (s *HTTPServer) registerHandlers(enableDebug bool) {
w.Write([]byte(stubHTML))
})
}
s.mux.Handle("/", handleRootRedirect())
s.mux.Handle("/", handleRootFallthrough())

if enableDebug {
s.mux.HandleFunc("/debug/pprof/", pprof.Index)
Expand Down Expand Up @@ -275,10 +275,13 @@ func handleUI(h http.Handler) http.Handler {
})
}

func handleRootRedirect() http.Handler {
func handleRootFallthrough() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
http.Redirect(w, req, "/ui/", 307)
return
if req.URL.Path == "/" {
http.Redirect(w, req, "/ui/", 307)
} else {
w.WriteHeader(http.StatusNotFound)
}
})
}

Expand Down