ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-14 12:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't panic on format due to unexpected comments (#7458)

Browse Source 
fix: don't panic on format due to unexpected comments

comments next to object elements is valid rego, instead of panicking
catch the error and write the rule as-is.

Signed-off-by: sspaink <sspaink@styra.com>
This commit is contained in:
Sebastian Spaink
2025-04-15 08:55:47 -05:00
committed by GitHub
parent a3be450eb9
commit 0fb752607b
9 changed files with 1045 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/format/format.go
+688 -209
View File
File diff suppressed because it is too large Load Diff
v1/format/testfiles/v0/test_issue_6330.rego
+45
View File
@@ -0,0 +1,45 @@
package a
value := {"a":
{"b":
{"c":
"d"}}}
value := {"a": # test 1
"b"} # test 2
value := {"a": # test 1
"b"}
value := {"a":
{"b":
{"c":
"d"}}}
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
value := {"a":
{"b":
{"c":
"d"}}}
p[
{"a": #
"b"} #
] := true
p.foo.bar[
{"a": #
"b"} #
] := true
p[
{"a": #
"b"} #
][
{"c": #
"d"} #
] := true
v1/format/testfiles/v0/test_issue_6330.rego.formatted
+31
View File
@@ -0,0 +1,31 @@
package a
value := {"a": {"b": {"c": "d"}}}
value := {"a": # test 1
"b"} # test 2
value := {"a": "b"} # test 1
value := {"a": {"b": {"c": "d"}}}
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
value := {"a": {"b": {"c": "d"}}}
p[{"a": #
"b"} #
] := true
p.foo.bar[{"a": #
"b"} #
] := true
p[{"a": #
"b"} #
][{"c": #
"d"} #
] := true
v1/format/testfiles/v0/test_issue_6330_1.rego
+6
View File
@@ -0,0 +1,6 @@
package a
p[
{"a": #
"b"} #
] := true
v1/format/testfiles/v0/test_issue_6330_1.rego.formatted
+6
View File
@@ -0,0 +1,6 @@
package a
p[
{"a": #
"b"} #
] := true
v1/format/testfiles/v1/test_issue_6330.rego
+135
View File
@@ -0,0 +1,135 @@
package a
p[
{"a": #
"b"} #
] := true
value := {"a":
{"b":
{"c":
"d"}}}
value := {"a": # test 1
"b"} # test 2
value := {"a": # test 1
"b"}
value := {"a":
{"b":
{"c":
"d"}}}
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
p := {"a": #
"b"} if { #
str := "my \n string"
}
value := {"a":
{"b":
{"c":
"d"}}}
f(_) := value if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
p := value if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
p := x if {
x := [v | v := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
]
}
p if {
every x in input.foo {
x == {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
}
value contains {"a": #
"b"} #
p := {"a": #
str} if {
str := "my \n string"
}
p := {"a":
str} if {
#
str := "my \n string"
}
authorize := "allow" if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
input.user == "superuser" # allow 'superuser' to perform any operation.
} else := "deny" if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
input.path[0] == value # disallow 'admin' operations...
input.source_network == "external" # from external networks.
} # ... more rules
p[
{"a": #
"b"} #
] := true
p.foo.bar[
{"a": #
"b"} #
] := true
p[
{"a": #
"b"} #
][
{"c": #
"d"} #
] := true
p if {
x := {"a": # do
"b"} # re
1 + 2 == 3
y := {"c": # mi
"d"} # fa
x != y
}
p[x].r := y if {
x := "q"
y := 1
y := {"c": # hello
"d"} # world
y := 1
}
v1/format/testfiles/v1/test_issue_6330.rego.formatted
+116
View File
@@ -0,0 +1,116 @@
package a
p[{"a": #
"b"} #
] := true
value := {"a": {"b": {"c": "d"}}}
value := {"a": # test 1
"b"} # test 2
value := {"a": "b"} # test 1
value := {"a": {"b": {"c": "d"}}}
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
p := {"a": #
"b"} if { #
str := "my \n string"
}
value := {"a": {"b": {"c": "d"}}}
f(_) := value if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
p := value if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
p := x if {
x := [v | v := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
]
}
p if {
every x in input.foo {
x == {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
}
}
value contains {"a": #
"b"} #
p := {"a": str} if { #
str := "my \n string"
}
p := {"a": str} if {
#
str := "my \n string"
}
authorize := "allow" if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
input.user == "superuser" # allow 'superuser' to perform any operation.
} else := "deny" if {
value := {"a": # this is
{"b": # my ridiculous
{"c": # way of
"d"}}} # commenting code
input.path[0] == value # disallow 'admin' operations...
input.source_network == "external" # from external networks.
} # ... more rules
p[{"a": #
"b"} #
] := true
p.foo.bar[{"a": #
"b"} #
] := true
p[{"a": #
"b"} #
][{"c": #
"d"} #
] := true
p if {
x := {"a": # do
"b"} # re
1 + 2 == 3
y := {"c": # mi
"d"} # fa
x != y
}
p[x].r := y if {
x := "q"
y := 1
y := {"c": # hello
"d"} # world
y := 1
}
v1/format/testfiles/v1/test_issue_6330_1.rego
+9
View File
@@ -0,0 +1,9 @@
package a
# A ref-head rule by itself is formatted differently when there are multiple ref-head rules in a file.
# This file handles the case when there is a single ref-head rule, while `test_issue_6330.rego` handles multiple.
p[
{"a": #
"b"} #
] := true
v1/format/testfiles/v1/test_issue_6330_1.rego.formatted
+9
View File
@@ -0,0 +1,9 @@
package a
# A ref-head rule by itself is formatted differently when there are multiple ref-head rules in a file.
# This file handles the case when there is a single ref-head rule, while `test_issue_6330.rego` handles multiple.
p[
{"a": #
"b"} #
] := true