alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix JSON list responses (#1098)

Browse Source
This commit is contained in:
Owen Cliffe
2018-06-28 01:28:07 +01:00
committed by GitHub
parent 6bda57199a
commit 73d45db443
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/const.go
View File

@@ -7,10 +7,10 @@ const (
Path string = "path" Path string = "path"
// Gin URL template parameters // Gin URL template parameters
ParamAppID string = "appId" ParamAppID string = "appID"
ParamAppName string = "appName" ParamAppName string = "appName"
ParamRouteName string = "route" ParamRouteName string = "route"
ParamTriggerID string = "triggerId" ParamTriggerID string = "triggerID"
ParamCallID string = "call" ParamCallID string = "call"
ParamFnID string = "fnId" ParamFnID string = "fnID"
) )

8
api/datastore/sql/sql.go
View File

@@ -378,7 +378,7 @@ func (ds *SQLStore) InsertApp(ctx context.Context, newApp *models.App) (*models.
app.ID = id.New().String() app.ID = id.New().String()
if app.Config == nil { if app.Config == nil {
// keeps the json from being nil // keeps the JSON from being nil
app.Config = map[string]string{} app.Config = map[string]string{}
} }
@@ -509,7 +509,7 @@ func (ds *SQLStore) GetAppByID(ctx context.Context, appID string) (*models.App,
// GetApps retrieves an array of apps according to a specific filter. // GetApps retrieves an array of apps according to a specific filter.
func (ds *SQLStore) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) { func (ds *SQLStore) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
var res []*models.App res := []*models.App{} // for JSON empty list
if filter.NameIn != nil && len(filter.NameIn) == 0 { // this basically makes sure it doesn't return ALL apps if filter.NameIn != nil && len(filter.NameIn) == 0 { // this basically makes sure it doesn't return ALL apps
return res, nil return res, nil
@@ -845,7 +845,7 @@ func (ds *SQLStore) UpdateFn(ctx context.Context, fn *models.Fn) (*models.Fn, er
} }
func (ds *SQLStore) GetFns(ctx context.Context, filter *models.FnFilter) ([]*models.Fn, error) { func (ds *SQLStore) GetFns(ctx context.Context, filter *models.FnFilter) ([]*models.Fn, error) {
var res []*models.Fn // for json empty list res := []*models.Fn{} // for JSON empty list
if filter == nil { if filter == nil {
filter = new(models.FnFilter) filter = new(models.FnFilter)
} }
@@ -1338,7 +1338,7 @@ func buildFilterTriggerQuery(filter *models.TriggerFilter) (string, []interface{
} }
func (ds *SQLStore) GetTriggers(ctx context.Context, filter *models.TriggerFilter) ([]*models.Trigger, error) { func (ds *SQLStore) GetTriggers(ctx context.Context, filter *models.TriggerFilter) ([]*models.Trigger, error) {
var res []*models.Trigger // for json empty list res := []*models.Trigger{} // for JSON empty list
if filter == nil { if filter == nil {
filter = new(models.TriggerFilter) filter = new(models.TriggerFilter)
} }

20
api/server/server.go
View File

@@ -925,21 +925,21 @@ func (s *Server) bindHandlers(ctx context.Context) {
{ {
v2.GET("/apps", s.handleAppList) v2.GET("/apps", s.handleAppList)
v2.POST("/apps", s.handleAppCreate) v2.POST("/apps", s.handleAppCreate)
v2.GET("/apps/:appId", s.handleAppGet) v2.GET("/apps/:appID", s.handleAppGet)
v2.PUT("/apps/:appId", s.handleAppUpdate) v2.PUT("/apps/:appID", s.handleAppUpdate)
v2.DELETE("/apps/:appId", s.handleAppDelete) v2.DELETE("/apps/:appID", s.handleAppDelete)
v2.GET("/fns", s.handleFnList) v2.GET("/fns", s.handleFnList)
v2.POST("/fns", s.handleFnCreate) v2.POST("/fns", s.handleFnCreate)
v2.GET("/fns/:fnId", s.handleFnGet) v2.GET("/fns/:fnID", s.handleFnGet)
v2.PUT("/fns/:fnId", s.handleFnUpdate) v2.PUT("/fns/:fnID", s.handleFnUpdate)
v2.DELETE("/fns/:fnId", s.handleFnDelete) v2.DELETE("/fns/:fnID", s.handleFnDelete)
v2.GET("/triggers", s.handleTriggerList) v2.GET("/triggers", s.handleTriggerList)
v2.POST("/triggers", s.handleTriggerCreate) v2.POST("/triggers", s.handleTriggerCreate)
v2.GET("/triggers/:triggerId", s.handleTriggerGet) v2.GET("/triggers/:triggerID", s.handleTriggerGet)
v2.PUT("/triggers/:triggerId", s.handleTriggerUpdate) v2.PUT("/triggers/:triggerID", s.handleTriggerUpdate)
v2.DELETE("/triggers/:triggerId", s.handleTriggerDelete) v2.DELETE("/triggers/:triggerID", s.handleTriggerDelete)
} }
{ {
@@ -952,7 +952,7 @@ func (s *Server) bindHandlers(ctx context.Context) {
runnerAppApi := runner.Group( runnerAppApi := runner.Group(
"/apps/:appId") "/apps/:appID")
runnerAppApi.Use(setAppIDInCtx) runnerAppApi.Use(setAppIDInCtx)
runnerAppApi.GET("", s.handleV1AppGetByName) runnerAppApi.GET("", s.handleV1AppGetByName)
runnerAppApi.GET("/routes/:route", s.handleRouteGetRunner) runnerAppApi.GET("/routes/:route", s.handleRouteGetRunner)