main: add CreateHooks() method for ConfigFile

This change simplifies middleware.Logic to having only one list of
PreHooks and one list of PostHooks.
This commit is contained in:
Jimmy Zelinskie
2016-08-31 21:09:46 -04:00
parent 6e790eed74
commit e39da6b4e6
3 changed files with 59 additions and 31 deletions

View File

@@ -10,9 +10,15 @@ import (
httpfrontend "github.com/chihaya/chihaya/frontend/http"
udpfrontend "github.com/chihaya/chihaya/frontend/udp"
"github.com/chihaya/chihaya/middleware"
"github.com/chihaya/chihaya/middleware/jwt"
"github.com/chihaya/chihaya/storage/memory"
)
type hookConfig struct {
Name string `yaml:"name"`
Config interface{} `yaml:"config"`
}
// ConfigFile represents a namespaced YAML configation file.
type ConfigFile struct {
MainConfigBlock struct {
@@ -21,6 +27,8 @@ type ConfigFile struct {
HTTPConfig httpfrontend.Config `yaml:"http"`
UDPConfig udpfrontend.Config `yaml:"udp"`
Storage memory.Config `yaml:"storage"`
PreHooks []hookConfig `yaml:"prehooks"`
PostHooks []hookConfig `yaml:"posthooks"`
} `yaml:"chihaya"`
}
@@ -52,3 +60,31 @@ func ParseConfigFile(path string) (*ConfigFile, error) {
return &cfgFile, nil
}
// CreateHooks creates instances of Hooks for all of the PreHooks and PostHooks
// configured in a ConfigFile.
func (cfg ConfigFile) CreateHooks() (preHooks, postHooks []middleware.Hook, err error) {
for _, hookCfg := range cfg.MainConfigBlock.PreHooks {
cfgBytes, err := yaml.Marshal(hookCfg.Config)
if err != nil {
panic("failed to remarshal valid YAML")
}
switch hookCfg.Name {
case "jwt":
var jwtCfg jwt.Config
err := yaml.Unmarshal(cfgBytes, &jwtCfg)
if err != nil {
return nil, nil, errors.New("invalid JWT middleware config" + err.Error())
}
preHooks = append(preHooks, jwt.NewHook(jwtCfg))
}
}
for _, hookCfg := range cfg.MainConfigBlock.PostHooks {
switch hookCfg.Name {
}
}
return
}

View File

@@ -54,8 +54,12 @@ func rootCmdRun(cmd *cobra.Command, args []string) error {
return err
}
// TODO create Hooks
logic := middleware.NewLogic(cfg.Config, peerStore, nil, nil, nil, nil)
preHooks, postHooks, err := configFile.CreateHooks()
if err != nil {
return err
}
logic := middleware.NewLogic(cfg.Config, peerStore, preHooks, postHooks)
if err != nil {
return err
}