Skip to content

Add swagger json path #39

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

Open
soundTricker wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add swagger json path #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af6b24e
Merge remote-tracking branch 'base/master'
soundTricker Feb 20, 2020
20fa295
Merge branch 'fix-additional-properties-type'
soundTricker Feb 20, 2020
4075605
Merge pull request #1 from soundTricker/ignore-path-in-swagger-plugin
soundTricker Mar 2, 2020
99c3100
Merge remote-tracking branch 'base/master'
Jun 22, 2021
64e6603
add SwaggerJSONPath property to change swagger json path
Jun 22, 2021
b7f8e06
fix httpError ErrorMessage loop
Nov 29, 2021
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 middleware_builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (he *httpError) StatusCode() int {
}

func (he *httpError) ErrorMessage() interface{} {
return he
return he.Message
}

func (he *httpError) Error() string {
Expand Down
2 changes: 1 addition & 1 deletion v3/middleware_builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (he *httpError) StatusCode() int {
}

func (he *httpError) ErrorMessage() interface{} {
return he
return he.Message
}

func (he *httpError) Error() string {
Expand Down
7 changes: 6 additions & 1 deletion v3/swagger/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ type HandlerInfo struct {

// Options is a container of optional settings to configure a plugin.
type Options struct {
SwaggerJSONPath string
Object *Object
DefinitionNameModifier func(refT reflect.Type, defName string) string
IgnoreRoute func(rd *ucon.RouteDefinition) bool
Expand All @@ -143,6 +144,10 @@ func NewPlugin(opts *Options) *Plugin {
opts = &Options{}
}

if opts.SwaggerJSONPath == "" {
opts.SwaggerJSONPath = "/api/swagger.json"
}

so := opts.Object

if so == nil {
Expand Down Expand Up @@ -187,7 +192,7 @@ func (p *Plugin) HandlersScannerProcess(m *ucon.ServeMux, rds []*ucon.RouteDefin
}

// supply swagger.json endpoint
m.HandleFunc("GET", "/api/swagger.json", func(w http.ResponseWriter, r *http.Request) *Object {
m.HandleFunc("GET", p.options.SwaggerJSONPath, func(w http.ResponseWriter, r *http.Request) *Object {
return soConstructor.object
})

Expand Down