From 8109c9ac4fc7b96ea0217153454ffcf1c67d7206 Mon Sep 17 00:00:00 2001 From: yusing Date: Thu, 9 Jan 2025 14:07:11 +0800 Subject: [PATCH] small refactor --- internal/api/handler.go | 2 +- internal/net/http/middleware/cidr_whitelist.go | 2 +- internal/notif/webhook.go | 5 +---- internal/utils/validation.go | 7 +++++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/api/handler.go b/internal/api/handler.go index 2a050224..06e727e2 100644 --- a/internal/api/handler.go +++ b/internal/api/handler.go @@ -58,4 +58,4 @@ func checkHost(f http.HandlerFunc) http.HandlerFunc { LogDebug(r).Interface("headers", r.Header).Msg("API request") f(w, r) } -} \ No newline at end of file +} diff --git a/internal/net/http/middleware/cidr_whitelist.go b/internal/net/http/middleware/cidr_whitelist.go index 9eb899e3..e123c868 100644 --- a/internal/net/http/middleware/cidr_whitelist.go +++ b/internal/net/http/middleware/cidr_whitelist.go @@ -34,7 +34,7 @@ var ( ) func init() { - utils.Validator().RegisterValidation("status_code", func(fl validator.FieldLevel) bool { + utils.MustRegisterValidation("status_code", func(fl validator.FieldLevel) bool { statusCode := fl.Field().Int() return gphttp.IsStatusCodeValid(int(statusCode)) }) diff --git a/internal/notif/webhook.go b/internal/notif/webhook.go index 74e8293b..46d5f239 100644 --- a/internal/notif/webhook.go +++ b/internal/notif/webhook.go @@ -49,10 +49,7 @@ func jsonIfTemplateNotUsed(fl validator.FieldLevel) bool { func init() { utils.RegisterDefaultValueFactory(DefaultValue) - err := utils.Validator().RegisterValidation("jsonIfTemplateNotUsed", jsonIfTemplateNotUsed) - if err != nil { - panic(err) - } + utils.MustRegisterValidation("jsonIfTemplateNotUsed", jsonIfTemplateNotUsed) } // Name implements Provider. diff --git a/internal/utils/validation.go b/internal/utils/validation.go index f27c44ce..226657a3 100644 --- a/internal/utils/validation.go +++ b/internal/utils/validation.go @@ -12,3 +12,10 @@ var ErrValidationError = E.New("validation error") func Validator() *validator.Validate { return validate } + +func MustRegisterValidation(tag string, fn validator.Func) { + err := validate.RegisterValidation(tag, fn) + if err != nil { + panic(err) + } +}