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

Add server API to disable hybrid API on API servers (#1152)

Browse Source
This commit is contained in:
Owen Cliffe
2018-08-01 18:53:38 +01:00
committed by GitHub
parent f8ebfc8a5d
commit 9b1f5e9cee
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/server/server.go
View File

@@ -193,6 +193,7 @@ type Server struct {
lbEnqueue agent.EnqueueDataAccess lbEnqueue agent.EnqueueDataAccess
lbReadAccess agent.ReadDataAccess lbReadAccess agent.ReadDataAccess
noHTTTPTriggerEndpoint bool noHTTTPTriggerEndpoint bool
noHybridAPI bool
cert string cert string
certKey string certKey string
certAuthority string certAuthority string
@@ -770,6 +771,14 @@ func WithoutHTTPTriggerEndpoints() Option {
} }
} }
// WithoutHybridAPI unconditionally disables the Hybrid API on a server
func WithoutHybridAPI() Option {
return func(ctx context.Context, s *Server) error {
s.noHybridAPI = true
return nil
}
}
// WithJaeger maps EnvJaegerURL // WithJaeger maps EnvJaegerURL
func WithJaeger(jaegerURL string) Option { func WithJaeger(jaegerURL string) Option {
return func(ctx context.Context, s *Server) error { return func(ctx context.Context, s *Server) error {
@@ -1126,7 +1135,7 @@ func (s *Server) bindHandlers(ctx context.Context) {
v2.DELETE("/triggers/:triggerID", s.handleTriggerDelete) v2.DELETE("/triggers/:triggerID", s.handleTriggerDelete)
} }
{ // Hybrid API - this should only be enabled on API servers if !s.noHybridAPI { // Hybrid API - this should only be enabled on API servers
runner := cleanv2.Group("/runner") runner := cleanv2.Group("/runner")
runner.PUT("/async", s.handleRunnerEnqueue) runner.PUT("/async", s.handleRunnerEnqueue)
runner.GET("/async", s.handleRunnerDequeue) runner.GET("/async", s.handleRunnerDequeue)
@@ -1141,7 +1150,6 @@ func (s *Server) bindHandlers(ctx context.Context) {
// Deprecate, remove with routes // Deprecate, remove with routes
runnerAppAPI.GET("/routes/*route", s.handleRunnerGetRoute) runnerAppAPI.GET("/routes/*route", s.handleRunnerGetRoute)
runnerAppAPI.GET("/triggerBySource/:triggerType/*triggerSource", s.handleRunnerGetTriggerBySource) runnerAppAPI.GET("/triggerBySource/:triggerType/*triggerSource", s.handleRunnerGetTriggerBySource)
} }
} }