arian/anubis-mirror
1
0
Fork 0
mirror of https://github.com/TecharoHQ/anubis.git synced 2026-04-18 06:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename and/or to all/any

Browse Source 
Signed-off-by: Xe Iaso <me@xeiaso.net>
This commit is contained in:
Xe Iaso
2025-04-25 10:52:45 -04:00
parent 65cbc6922c
commit 92a3e5ba81
10 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/policy/config/expressionorlist.go
View File

@@ -14,8 +14,8 @@ var (
type ExpressionOrList struct {
Expression string `json:"-"`
And []string `json:"and"`
Or []string `json:"or"`
All []string `json:"all"`
Any []string `json:"any"`
}
func (eol ExpressionOrList) Equal(rhs *ExpressionOrList) bool {
@@ -23,11 +23,11 @@ func (eol ExpressionOrList) Equal(rhs *ExpressionOrList) bool {
return false
}
if !slices.Equal(eol.And, rhs.And) {
if !slices.Equal(eol.All, rhs.All) {
return false
}
if !slices.Equal(eol.Or, rhs.Or) {
if !slices.Equal(eol.Any, rhs.Any) {
return false
}
@@ -44,8 +44,8 @@ func (eol *ExpressionOrList) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, &val); err != nil {
return err
}
eol.And = val.And
eol.Or = val.Or
eol.All = val.All
eol.Any = val.Any
return nil
}
@@ -54,7 +54,7 @@ func (eol *ExpressionOrList) UnmarshalJSON(data []byte) error {
}
func (eol *ExpressionOrList) Valid() error {
if len(eol.And) != 0 && len(eol.Or) != 0 {
if len(eol.All) != 0 && len(eol.Any) != 0 {
return ErrExpressionCantHaveBoth
}