From fe78aabc673daf36655f0cca7e83cf2b057b8361 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 21 Aug 2023 20:17:19 +0800 Subject: [PATCH] Add `branch_filter` to hooks API endpoints (#26599) (#26632) Backport #26599 by @yardenshoham We now include the branch filler in the response. - Closes #26591 Signed-off-by: Yarden Shoham Co-authored-by: Yarden Shoham --- modules/structs/hook.go | 1 + services/webhook/general.go | 1 + templates/swagger/v1_json.tmpl | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/modules/structs/hook.go b/modules/structs/hook.go index cd91d4bc46..0babe84410 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -19,6 +19,7 @@ var ErrInvalidReceiveHook = errors.New("Invalid JSON payload received over webho type Hook struct { ID int64 `json:"id"` Type string `json:"type"` + BranchFilter string `json:"branch_filter"` URL string `json:"-"` Config map[string]string `json:"config"` Events []string `json:"events"` diff --git a/services/webhook/general.go b/services/webhook/general.go index f53ea31ffa..b9cc3dc845 100644 --- a/services/webhook/general.go +++ b/services/webhook/general.go @@ -260,5 +260,6 @@ func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) { AuthorizationHeader: authorizationHeader, Updated: w.UpdatedUnix.AsTime(), Created: w.CreatedUnix.AsTime(), + BranchFilter: w.BranchFilter, }, nil } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 8b4d4867f1..6bedcfd4f0 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -18910,6 +18910,10 @@ "type": "string", "x-go-name": "AuthorizationHeader" }, + "branch_filter": { + "type": "string", + "x-go-name": "BranchFilter" + }, "config": { "type": "object", "additionalProperties": { -- 2.39.5