Remove rule.head.name usage (#357)

And use rule.head.ref consistently Fixes #331 Signed-off-by: Anders Eknert <anders@styra.com>
StyraInc · Sep 30, 2023 · c937e34 · c937e34
1 parent 57d77d1
commit c937e34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/bundle/regal/ast.rego b/bundle/regal/ast.rego
@@ -22,9 +22,7 @@ package_name := concat(".", [path.value |
 #   note that what constitutes the "name" of a ref-head rule is
 #   ambiguous at best, i.e. a["b"][c] { ... } ... in those cases
 #   we currently return the first element of the ref, i.e. "a"
-name(rule) := rule.head.name if {
-	rule.head.name
-} else := rule.head.ref[0].value
+name(rule) := rule.head.ref[0].value
 
 named_refs(refs) := [ref |
 	some i, ref in refs

diff --git a/bundle/regal/rules/style/prefer_snake_case.rego b/bundle/regal/rules/style/prefer_snake_case.rego
@@ -15,7 +15,7 @@ report contains violation if {
 	some ref in ast.named_refs(rule.head.ref)
 	not util.is_snake_case(ref.value)
 
-	violation := result.fail(rego.metadata.chain(), result.location(location_of(ref, rule)))
+	violation := result.fail(rego.metadata.chain(), result.location(ref))
 }
 
 report contains violation if {
@@ -24,10 +24,3 @@ report contains violation if {
 
 	violation := result.fail(rego.metadata.chain(), result.location(var))
 }
-
-# annoyingly, rule head refs are missing location when a rule.head.name is present,
-# or rather when there's only a single item in the ref.. this inconsistency should
-# probably be fixed in OPA, but until then, there's this.
-location_of(ref, rule) := ref if ref.location
-
-else := rule.head
diff --git a/bundle/regal/rules/testing/metasyntactic_variable.rego b/bundle/regal/rules/testing/metasyntactic_variable.rego
@@ -40,7 +40,7 @@ report contains violation if {
 	# }
 	not ast.is_chained_rule_body(rule, input.regal.file.lines)
 
-	violation := result.fail(rego.metadata.chain(), result.location(location_of(ref, rule)))
+	violation := result.fail(rego.metadata.chain(), result.location(ref))
 }
 
 report contains violation if {
@@ -53,10 +53,3 @@ report contains violation if {
 
 	violation := result.fail(rego.metadata.chain(), result.location(var))
 }
-
-# annoyingly, rule head refs are missing location when a rule.head.name is present,
-# or rather when there's only a single item in the ref.. this inconsistency should
-# probably be fixed in OPA, but until then, there's this.
-location_of(ref, rule) := ref if ref.location
-
-else := rule.head