fix: rename and/or to all/any

Signed-off-by: Xe Iaso <me@xeiaso.net>
2026-04-15 12:58:45 +00:00 · 2025-04-25 10:52:45 -04:00
parent 65cbc6922c
commit 92a3e5ba81
10 changed files with 41 additions and 29 deletions
--- a/lib/policy/config/testdata/bad/multiple_expression_types.json
+++ b/lib/policy/config/testdata/bad/multiple_expression_types.json
@@ -4,11 +4,11 @@
      "name": "multiple-expression-types",
      "action": "ALLOW",
      "expression": {
-        "and": [
+        "all": [
          "userAgent.startsWith(\"git/\") || userAgent.contains(\"libgit\")",
          "\"Git-Protocol\" in headers && headers[\"Git-Protocol\"] == \"version=2\"\n"
        ],
-        "or": [
+        "any": [
          "userAgent.startsWith(\"evilbot/\")"
        ]
      }
--- a/lib/policy/config/testdata/bad/multiple_expression_types.yaml
+++ b/lib/policy/config/testdata/bad/multiple_expression_types.yaml
@@ -2,9 +2,9 @@ bots:
 - name: multiple-expression-types
  action: ALLOW
  expression:
-    and:
+    all:
    - userAgent.startsWith("git/") || userAgent.contains("libgit")
    - >
      "Git-Protocol" in headers && headers["Git-Protocol"] == "version=2"
-    or:
+    any:
    - userAgent.startsWith("evilbot/")
--- a/lib/policy/config/testdata/good/git_client.json
+++ b/lib/policy/config/testdata/good/git_client.json
@@ -4,7 +4,7 @@
      "name": "allow-git-clients",
      "action": "ALLOW",
      "expression": {
-        "and": [
+        "all": [
          "userAgent.startsWith(\"git/\") || userAgent.contains(\"libgit\")",
          "\"Git-Protocol\" in headers && headers[\"Git-Protocol\"] == \"version=2\""
        ]
--- a/lib/policy/config/testdata/good/git_client.yaml
+++ b/lib/policy/config/testdata/good/git_client.yaml
@@ -2,7 +2,7 @@ bots:
 - name: allow-git-clients
  action: ALLOW
  expression:
-    and:
+    all:
    - userAgent.startsWith("git/") || userAgent.contains("libgit")
    - >
      "Git-Protocol" in headers && headers["Git-Protocol"] == "version=2"