From 9f3eb71ef6a13924582a947a9c4d85e0b425a67f Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Fri, 25 Jul 2025 19:57:47 +0000 Subject: [PATCH] refactor: get rid of package expressions by moving the code into package expression Signed-off-by: Xe Iaso --- .../expressions => checker/expression}/README.md | 0 lib/checker/expression/checker.go | 11 +++++------ .../expression}/http_headers.go | 2 +- .../expression}/http_headers_test.go | 2 +- .../expressions => checker/expression}/loadavg.go | 2 +- .../expressions => checker/expression}/url_values.go | 2 +- .../expression}/url_values_test.go | 2 +- lib/policy/thresholds.go | 6 +++--- 8 files changed, 13 insertions(+), 14 deletions(-) rename lib/{policy/expressions => checker/expression}/README.md (100%) rename lib/{policy/expressions => checker/expression}/http_headers.go (98%) rename lib/{policy/expressions => checker/expression}/http_headers_test.go (98%) rename lib/{policy/expressions => checker/expression}/loadavg.go (98%) rename lib/{policy/expressions => checker/expression}/url_values.go (98%) rename lib/{policy/expressions => checker/expression}/url_values_test.go (98%) diff --git a/lib/policy/expressions/README.md b/lib/checker/expression/README.md similarity index 100% rename from lib/policy/expressions/README.md rename to lib/checker/expression/README.md diff --git a/lib/checker/expression/checker.go b/lib/checker/expression/checker.go index 4c80513f..07999737 100644 --- a/lib/checker/expression/checker.go +++ b/lib/checker/expression/checker.go @@ -6,7 +6,6 @@ import ( "github.com/TecharoHQ/anubis/internal" "github.com/TecharoHQ/anubis/lib/checker/expression/environment" - "github.com/TecharoHQ/anubis/lib/policy/expressions" "github.com/google/cel-go/cel" "github.com/google/cel-go/common/types" ) @@ -72,15 +71,15 @@ func (cr *CELRequest) ResolveName(name string) (any, bool) { case "path": return cr.URL.Path, true case "query": - return expressions.URLValues{Values: cr.URL.Query()}, true + return URLValues{Values: cr.URL.Query()}, true case "headers": - return expressions.HTTPHeaders{Header: cr.Header}, true + return HTTPHeaders{Header: cr.Header}, true case "load_1m": - return expressions.Load1(), true + return Load1(), true case "load_5m": - return expressions.Load5(), true + return Load5(), true case "load_15m": - return expressions.Load15(), true + return Load15(), true default: return nil, false } diff --git a/lib/policy/expressions/http_headers.go b/lib/checker/expression/http_headers.go similarity index 98% rename from lib/policy/expressions/http_headers.go rename to lib/checker/expression/http_headers.go index 57fcc841..4aba61c3 100644 --- a/lib/policy/expressions/http_headers.go +++ b/lib/checker/expression/http_headers.go @@ -1,4 +1,4 @@ -package expressions +package expression import ( "net/http" diff --git a/lib/policy/expressions/http_headers_test.go b/lib/checker/expression/http_headers_test.go similarity index 98% rename from lib/policy/expressions/http_headers_test.go rename to lib/checker/expression/http_headers_test.go index bb5c761a..ed1f12d0 100644 --- a/lib/policy/expressions/http_headers_test.go +++ b/lib/checker/expression/http_headers_test.go @@ -1,4 +1,4 @@ -package expressions +package expression import ( "net/http" diff --git a/lib/policy/expressions/loadavg.go b/lib/checker/expression/loadavg.go similarity index 98% rename from lib/policy/expressions/loadavg.go rename to lib/checker/expression/loadavg.go index 72b08788..fbed9efc 100644 --- a/lib/policy/expressions/loadavg.go +++ b/lib/checker/expression/loadavg.go @@ -1,4 +1,4 @@ -package expressions +package expression import ( "context" diff --git a/lib/policy/expressions/url_values.go b/lib/checker/expression/url_values.go similarity index 98% rename from lib/policy/expressions/url_values.go rename to lib/checker/expression/url_values.go index a4c63519..6390da4d 100644 --- a/lib/policy/expressions/url_values.go +++ b/lib/checker/expression/url_values.go @@ -1,4 +1,4 @@ -package expressions +package expression import ( "errors" diff --git a/lib/policy/expressions/url_values_test.go b/lib/checker/expression/url_values_test.go similarity index 98% rename from lib/policy/expressions/url_values_test.go rename to lib/checker/expression/url_values_test.go index 14c24b8d..b02ffb25 100644 --- a/lib/policy/expressions/url_values_test.go +++ b/lib/checker/expression/url_values_test.go @@ -1,4 +1,4 @@ -package expressions +package expression import ( "net/url" diff --git a/lib/policy/thresholds.go b/lib/policy/thresholds.go index 1f77f631..ff55088e 100644 --- a/lib/policy/thresholds.go +++ b/lib/policy/thresholds.go @@ -1,8 +1,8 @@ package policy import ( + "github.com/TecharoHQ/anubis/lib/checker/expression/environment" "github.com/TecharoHQ/anubis/lib/policy/config" - "github.com/TecharoHQ/anubis/lib/policy/expressions" "github.com/google/cel-go/cel" ) @@ -16,12 +16,12 @@ func ParsedThresholdFromConfig(t config.Threshold) (*Threshold, error) { Threshold: t, } - env, err := expressions.ThresholdEnvironment() + env, err := environment.Threshold() if err != nil { return nil, err } - program, err := expressions.Compile(env, t.Expression.String()) + program, err := environment.Compile(env, t.Expression.String()) if err != nil { return nil, err }