mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-08-01 23:40:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: revert #1

Browse source
This commit is contained in:
soulteary 2023-01-09 23:00:00 +08:00
parent 5a3828e4dd
commit 3285d30374
No known key found for this signature in database
GPG key ID: 8107DBA6BC84D986
3 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/hook/hook.go
View file

@ -816,13 +816,7 @@ func (h *Hooks) LoadFromFile(path string, asTemplate bool) error {
file = buf.Bytes() file = buf.Bytes()
} }
toJSON, err := yaml.YAMLToJSON(file) return yaml.Unmarshal(file, h)
if err != nil {
return err
}
jsonDecoder := json.NewDecoder(bytes.NewBuffer(toJSON))
jsonDecoder.DisallowUnknownFields()
return jsonDecoder.Decode(h)
} }
// Append appends hooks unless the new hooks contain a hook with an ID that already exists // Append appends hooks unless the new hooks contain a hook with an ID that already exists

2
internal/hook/hook_test.go
View file

@ -491,7 +491,6 @@ var hooksLoadFromFileTests = []struct {
{"", false, true}, {"", false, true},
// failures // failures
{"missing.json", false, false}, {"missing.json", false, false},
{"testdata/unrecognized.yaml", false, false},
} }
func TestHooksLoadFromFile(t *testing.T) { func TestHooksLoadFromFile(t *testing.T) {
@ -501,7 +500,6 @@ func TestHooksLoadFromFile(t *testing.T) {
for _, tt := range hooksLoadFromFileTests { for _, tt := range hooksLoadFromFileTests {
h := &Hooks{} h := &Hooks{}
err := h.LoadFromFile(tt.path, tt.asTemplate) err := h.LoadFromFile(tt.path, tt.asTemplate)
t.Log(err)
if (err == nil) != tt.ok { if (err == nil) != tt.ok {
t.Errorf(err.Error()) t.Errorf(err.Error())
} }

21
webhook.go
View file

@ -206,21 +206,20 @@ func main() {
newHooks := hook.Hooks{} newHooks := hook.Hooks{}
err := newHooks.LoadFromFile(hooksFilePath, *asTemplate) err := newHooks.LoadFromFile(hooksFilePath, *asTemplate)
if err != nil { if err != nil {
log.Fatalf("couldn't load hooks from file! %+v\n", err) log.Printf("couldn't load hooks from file! %+v\n", err)
} } else {
log.Printf("found %d hook(s) in file\n", len(newHooks))
log.Printf("found %d hook(s) in file\n", len(newHooks)) for _, hook := range newHooks {
if matchLoadedHook(hook.ID) != nil {
for _, hook := range newHooks { log.Fatalf("error: hook with the id %s has already been loaded!\nplease check your hooks file for duplicate hooks ids!\n", hook.ID)
if matchLoadedHook(hook.ID) != nil { }
log.Fatalf("error: hook with the id %s has already been loaded!\nplease check your hooks file for duplicate hooks ids!\n", hook.ID) log.Printf("\tloaded: %s\n", hook.ID)
} }
log.Printf("\tloaded: %s\n", hook.ID)
}
loadedHooksFromFiles[hooksFilePath] = newHooks loadedHooksFromFiles[hooksFilePath] = newHooks
}
} }
newHooksFiles := hooksFiles[:0] newHooksFiles := hooksFiles[:0]