Skip to content

Commit

Permalink
Merge branch 'master' into external
Browse files Browse the repository at this point in the history
  • Loading branch information
arschles authored Mar 20, 2020
2 parents 49d0c1b + 94a97fe commit ceed6bc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Mention briefly how you have applied the fix.
## What GitHub issue(s) does this PR fix or close?

<!--
If it doesn't fix any issues, that's ok. You can leave this blank.
If it doesn't fix any GitHub Issues, that's ok. Can you please delete the below "Fixes #" line for us? It would help us out a lot. Thanks!
If it does, then use the below "Fixes #<issue number>" notation below
Your PR might fix one or more GitHub issues. If so, please use the below "Fixes #<issue number>" notation below. If your PR fixes multiple issues, please put multiple lines of "Fixes #<issue number>", one for each issue. If you do that, when this PR is merged, it'll automatically close the issue(s) you reference.
-->

Fixes #
Expand Down
2 changes: 1 addition & 1 deletion cmd/proxy/actions/app_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func addProxyRoutes(
r.HandleFunc(supportPath, func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
})
sumHandler := sumdbPoxy(sumdbURL, c.NoSumPatterns)
sumHandler := sumdbProxy(sumdbURL, c.NoSumPatterns)
pathPrefix := "/sumdb/" + sumdbURL.Host
r.PathPrefix(pathPrefix + "/").Handler(
http.StripPrefix(pathPrefix, sumHandler),
Expand Down
2 changes: 1 addition & 1 deletion cmd/proxy/actions/sumdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/gomods/athens/pkg/paths"
)

func sumdbPoxy(url *url.URL, nosumPatterns []string) http.Handler {
func sumdbProxy(url *url.URL, nosumPatterns []string) http.Handler {
rp := httputil.NewSingleHostReverseProxy(url)
rp.Director = func(req *http.Request) {
req.Host = url.Host
Expand Down
2 changes: 1 addition & 1 deletion cmd/proxy/actions/sumdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestSumdbProxy(t *testing.T) {
panic(err)
}
pathPrefix := "/sumdb/" + surl.Host
h := sumdbPoxy(surl, nil)
h := sumdbProxy(surl, nil)
h = http.StripPrefix(pathPrefix, h)

targetURL := "/sumdb/" + surl.Host + "/latest"
Expand Down

0 comments on commit ceed6bc

Please sign in to comment.