mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-08-02 07:50:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix 1.19 incompatibilities

Browse source
This commit is contained in:
soulteary 2023-01-09 22:02:57 +08:00
parent 5730b0e588
commit 5f59f90f9c
No known key found for this signature in database
GPG key ID: 8107DBA6BC84D986
11 changed files with 38 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
droppriv_nope.go
View file

@ -1,3 +1,4 @@
//go:build linux || windows
// +build linux windows // +build linux windows
package main package main

1
droppriv_unix.go
View file

@ -1,3 +1,4 @@
//go:build !windows && !linux
// +build !windows,!linux // +build !windows,!linux
package main package main

25
internal/hook/hook_test.go
View file

@ -294,14 +294,14 @@ var hookParseJSONParametersTests = []struct {
rheaders, rquery, rpayload map[string]interface{} rheaders, rquery, rpayload map[string]interface{}
ok bool ok bool
}{ }{
{[]Argument{Argument{"header", "a", "", false}}, map[string]interface{}{"A": `{"b": "y"}`}, nil, nil, map[string]interface{}{"A": map[string]interface{}{"b": "y"}}, nil, nil, true}, {[]Argument{{"header", "a", "", false}}, map[string]interface{}{"A": `{"b": "y"}`}, nil, nil, map[string]interface{}{"A": map[string]interface{}{"b": "y"}}, nil, nil, true},
{[]Argument{Argument{"url", "a", "", false}}, nil, map[string]interface{}{"a": `{"b": "y"}`}, nil, nil, map[string]interface{}{"a": map[string]interface{}{"b": "y"}}, nil, true}, {[]Argument{{"url", "a", "", false}}, nil, map[string]interface{}{"a": `{"b": "y"}`}, nil, nil, map[string]interface{}{"a": map[string]interface{}{"b": "y"}}, nil, true},
{[]Argument{Argument{"payload", "a", "", false}}, nil, nil, map[string]interface{}{"a": `{"b": "y"}`}, nil, nil, map[string]interface{}{"a": map[string]interface{}{"b": "y"}}, true}, {[]Argument{{"payload", "a", "", false}}, nil, nil, map[string]interface{}{"a": `{"b": "y"}`}, nil, nil, map[string]interface{}{"a": map[string]interface{}{"b": "y"}}, true},
{[]Argument{Argument{"header", "z", "", false}}, map[string]interface{}{"Z": `{}`}, nil, nil, map[string]interface{}{"Z": map[string]interface{}{}}, nil, nil, true}, {[]Argument{{"header", "z", "", false}}, map[string]interface{}{"Z": `{}`}, nil, nil, map[string]interface{}{"Z": map[string]interface{}{}}, nil, nil, true},
// failures // failures
{[]Argument{Argument{"header", "z", "", false}}, map[string]interface{}{"Z": ``}, nil, nil, map[string]interface{}{"Z": ``}, nil, nil, false}, // empty string {[]Argument{{"header", "z", "", false}}, map[string]interface{}{"Z": ``}, nil, nil, map[string]interface{}{"Z": ``}, nil, nil, false}, // empty string
{[]Argument{Argument{"header", "y", "", false}}, map[string]interface{}{"X": `{}`}, nil, nil, map[string]interface{}{"X": `{}`}, nil, nil, false}, // missing parameter {[]Argument{{"header", "y", "", false}}, map[string]interface{}{"X": `{}`}, nil, nil, map[string]interface{}{"X": `{}`}, nil, nil, false}, // missing parameter
{[]Argument{Argument{"string", "z", "", false}}, map[string]interface{}{"Z": ``}, nil, nil, map[string]interface{}{"Z": ``}, nil, nil, false}, // invalid argument source {[]Argument{{"string", "z", "", false}}, map[string]interface{}{"Z": ``}, nil, nil, map[string]interface{}{"Z": ``}, nil, nil, false}, // invalid argument source
} }
func TestHookParseJSONParameters(t *testing.T) { func TestHookParseJSONParameters(t *testing.T) {
@ -326,9 +326,9 @@ var hookExtractCommandArgumentsTests = []struct {
value []string value []string
ok bool ok bool
}{ }{
{"test", []Argument{Argument{"header", "a", "", false}}, map[string]interface{}{"A": "z"}, nil, nil, []string{"test", "z"}, true}, {"test", []Argument{{"header", "a", "", false}}, map[string]interface{}{"A": "z"}, nil, nil, []string{"test", "z"}, true},
// failures // failures
{"fail", []Argument{Argument{"payload", "a", "", false}}, map[string]interface{}{"A": "z"}, nil, nil, []string{"fail", ""}, false}, {"fail", []Argument{{"payload", "a", "", false}}, map[string]interface{}{"A": "z"}, nil, nil, []string{"fail", ""}, false},
} }
func TestHookExtractCommandArguments(t *testing.T) { func TestHookExtractCommandArguments(t *testing.T) {
@ -351,6 +351,7 @@ func TestHookExtractCommandArguments(t *testing.T) {
// we test both cases where the name of the data is used as the name of the // we test both cases where the name of the data is used as the name of the
// env key & the case where the hook definition sets the env var name to a // env key & the case where the hook definition sets the env var name to a
// fixed value using the envname construct like so:: // fixed value using the envname construct like so::
//
// [ // [
// { // {
// "id": "push", // "id": "push",
@ -375,14 +376,14 @@ var hookExtractCommandArgumentsForEnvTests = []struct {
// successes // successes
{ {
"test", "test",
[]Argument{Argument{"header", "a", "", false}}, []Argument{{"header", "a", "", false}},
map[string]interface{}{"A": "z"}, nil, nil, map[string]interface{}{"A": "z"}, nil, nil,
[]string{"HOOK_a=z"}, []string{"HOOK_a=z"},
true, true,
}, },
{ {
"test", "test",
[]Argument{Argument{"header", "a", "MYKEY", false}}, []Argument{{"header", "a", "MYKEY", false}},
map[string]interface{}{"A": "z"}, nil, nil, map[string]interface{}{"A": "z"}, nil, nil,
[]string{"MYKEY=z"}, []string{"MYKEY=z"},
true, true,
@ -390,7 +391,7 @@ var hookExtractCommandArgumentsForEnvTests = []struct {
// failures // failures
{ {
"fail", "fail",
[]Argument{Argument{"payload", "a", "", false}}, []Argument{{"payload", "a", "", false}},
map[string]interface{}{"A": "z"}, nil, nil, map[string]interface{}{"A": "z"}, nil, nil,
[]string{}, []string{},
false, false,

4
internal/middleware/logger.go
View file

@ -39,13 +39,13 @@ type LogEntry struct {
} }
// Write constructs and writes the final log entry. // Write constructs and writes the final log entry.
func (l *LogEntry) Write(status, totalBytes int, elapsed time.Duration) { func (l *LogEntry) Write(status int, bytes int, header http.Header, elapsed time.Duration, extra interface{}) {
rid := GetReqID(l.req.Context()) rid := GetReqID(l.req.Context())
if rid != "" { if rid != "" {
fmt.Fprintf(l.buf, "[%s] ", rid) fmt.Fprintf(l.buf, "[%s] ", rid)
} }
fmt.Fprintf(l.buf, "%03d | %s | %s | ", status, humanize.IBytes(uint64(totalBytes)), elapsed) fmt.Fprintf(l.buf, "%03d | %s | %s | ", status, humanize.IBytes(uint64(bytes)), elapsed)
l.buf.WriteString(l.req.Host + " | " + l.req.Method + " " + l.req.RequestURI) l.buf.WriteString(l.req.Host + " | " + l.req.Method + " " + l.req.RequestURI)
log.Print(l.buf.String()) log.Print(l.buf.String())
} }

1
internal/pidfile/mkdirall.go
View file

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package pidfile package pidfile

1
internal/pidfile/mkdirall_windows.go
View file

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package pidfile package pidfile

1
internal/pidfile/pidfile_darwin.go
View file

@ -1,3 +1,4 @@
//go:build darwin
// +build darwin // +build darwin
package pidfile package pidfile

1
internal/pidfile/pidfile_unix.go
View file

@ -1,3 +1,4 @@
//go:build !windows && !darwin
// +build !windows,!darwin // +build !windows,!darwin
package pidfile package pidfile

1
signals.go
View file

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package main package main

1
signals_windows.go
View file

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package main package main

2
webhook_test.go
View file

@ -47,7 +47,7 @@ func TestStaticParams(t *testing.T) {
ResponseMessage: "success", ResponseMessage: "success",
CaptureCommandOutput: true, CaptureCommandOutput: true,
PassArgumentsToCommand: []hook.Argument{ PassArgumentsToCommand: []hook.Argument{
hook.Argument{Source: "string", Name: "passed"}, {Source: "string", Name: "passed"},
}, },
} }