Skip to content

Fix production swagger #403

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

Merged
merenbach merged 4 commits into from
Jul 13, 2018
Merged

Fix production swagger #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
232c29f
Factor out filepath
Jul 13, 2018
5065ac0
Use packr to serve swagger.json
Jul 13, 2018
35ff970
Pass packr.Box instead of string, thanks @alexmt
Jul 13, 2018
8269954
Fix test for Swagger UI server
Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func (a *ArgoCDServer) newHTTPServer(ctx context.Context, port int) *http.Server
mustRegisterGWHandler(settings.RegisterSettingsServiceHandlerFromEndpoint, ctx, gwmux, endpoint, dOpts)
mustRegisterGWHandler(project.RegisterProjectServiceHandlerFromEndpoint, ctx, gwmux, endpoint, dOpts)

swagger.ServeSwaggerUI(mux, "server", "/swagger-ui")
swagger.ServeSwaggerUI(mux, packr.NewBox("."), "/swagger-ui")

// Dex reverse proxy and client app and OAuth2 login/callback
a.registerDexHandlers(mux)
Expand Down
13 changes: 10 additions & 3 deletions util/swagger/swagger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
package swagger

import (
"fmt"
"log"
"net/http"
"path"
"path/filepath"

"github.com/go-openapi/runtime/middleware"
"github.com/gobuffalo/packr"
)

// ServeSwaggerUI serves the Swagger UI and JSON spec.
func ServeSwaggerUI(mux *http.ServeMux, component, uiPath string) {
func ServeSwaggerUI(mux *http.ServeMux, box packr.Box, uiPath string) {
prefix := path.Dir(uiPath)
specURL := path.Join(prefix, "swagger.json")

swaggerJSON, err := box.MustString("swagger.json")
if err != nil {
log.Fatal(err)
}

mux.HandleFunc(specURL, func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, filepath.Join(component, "swagger.json"))
fmt.Fprintf(w, swaggerJSON)
})

mux.Handle(uiPath, middleware.Redoc(middleware.RedocOpts{
Expand Down
3 changes: 2 additions & 1 deletion util/swagger/swagger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"github.com/go-openapi/loads"
"github.com/gobuffalo/packr"
)

func TestSwaggerUI(t *testing.T) {
Expand All @@ -31,7 +32,7 @@ func TestSwaggerUI(t *testing.T) {
c <- listener.Addr().String()

mux := http.NewServeMux()
ServeSwaggerUI(mux, "../../server", "/swagger-ui")
ServeSwaggerUI(mux, packr.NewBox("../../server"), "/swagger-ui")
panic(http.Serve(listener, mux))
}

Expand Down