support glob.match without delimiters #4923

ast/builtins.go

@@ -2604,7 +2604,10 @@ var GlobMatch = &Builtin{
 	Decl: types.NewFunction(
 		types.Args(
 			types.Named("pattern", types.S),
-			types.Named("delimiters", types.NewArray(nil, types.S)).Description("glob pattern delimiters, e.g. `[\".\", \":\"]`, defaults to `[\".\"]` if unset."),
+			types.Named("delimiters", types.NewAny(
+				types.NewArray(nil, types.S),
+				types.NewNull(),
+			)).Description("glob pattern delimiters, e.g. `[\".\", \":\"]`, defaults to `[\".\"]` if unset. If `delimiters` is `null`, glob match without delimiter."),
 			types.Named("match", types.S),
 		),
 		types.Named("result", types.B).Description("true if `match` can be found in `pattern` which is separated by `delimiters`"),

builtin_metadata.json

@@ -3677,9 +3677,9 @@
         "type": "string"
       },
       {
-        "description": "glob pattern delimiters, e.g. `[\".\", \":\"]`, defaults to `[\".\"]` if unset.",
+        "description": "glob pattern delimiters, e.g. `[\".\", \":\"]`, defaults to `[\".\"]` if unset. If `delimiters` is `null`, glob match without delimiter.",
         "name": "delimiters",
-        "type": "array[string]"
+        "type": "any\u003cnull, array[string]\u003e"
       },
       {
         "name": "match",

capabilities.json

@@ -894,10 +894,18 @@
             "type": "string"
           },
           {
-            "dynamic": {
-              "type": "string"
-            },
-            "type": "array"
+            "of": [
+              {
+                "type": "null"
+              },
+              {
+                "dynamic": {
+                  "type": "string"
+                },
+                "type": "array"
+              }
+            ],
+            "type": "any"
           },
           {
             "type": "string"

docs/content/policy-reference.md

@@ -337,6 +337,7 @@ The following table shows examples of how ``glob.match`` works:
 | -------- | ---------- | ----------- |
 | ``output := glob.match("*.github.com", [], "api.github.com")`` | ``true`` | A glob with the default ``["."]`` delimiter. |
 | ``output := glob.match("*.github.com", [], "api.cdn.github.com")`` | ``false`` | A glob with the default ``["."]`` delimiter. |
+| ``output := glob.match("*hub.com", null, "api.cdn.github.com")`` | ``true`` | A glob without delimiter. |
 | ``output := glob.match("*:github:com", [":"], "api:github:com")`` | ``true`` | A glob with delimiters ``[":"]``. |
 | ``output := glob.match("api.**.com", [], "api.github.com")`` | ``true`` | A super glob. |
 | ``output := glob.match("api.**.com", [], "api.cdn.github.com")`` | ``true`` | A super glob. |

test/cases/testdata/globmatch/test-globmatch-0159.yaml

@@ -0,0 +1,15 @@
+cases:
+- data: {}
+  modules:
+  - |
+    package generated
+
+    p[x] {
+      glob.match("*", null, "foo.bar", x)
+    }
+  note: globmatch/glob match single without default delimiter
+  query: data.generated.p = x
+  sort_bindings: true
+  want_result:
+  - x:
+    - true

topdown/glob.go

@@ -18,16 +18,22 @@ func builtinGlobMatch(a, b, c ast.Value) (ast.Value, error) {
 	if err != nil {
 		return nil, err
 	}
+	var delimiters []rune
+	switch b.(type) {
+	case ast.Null:
+		delimiters = []rune{}
+	case *ast.Array:
+		delimiters, err = builtins.RuneSliceOperand(b, 2)
+		if err != nil {
+			return nil, err
+		}
 
-	delimiters, err := builtins.RuneSliceOperand(b, 2)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(delimiters) == 0 {
-		delimiters = []rune{'.'}
+		if len(delimiters) == 0 {
+			delimiters = []rune{'.'}
+		}
+	default:
+		delimiters = []rune{}
 	}
-
 	match, err := builtins.StringOperand(c, 3)
 	if err != nil {
 		return nil, err