Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/regopolicyinterpreter/module.rego
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package module

subtract := {"result": result} {
subtract := {"result": result} if {
result := input.a - input.b
}

subtract := {"result": result} {
subtract := {"result": result} if {
result := concat("-", [input.a, input.b])
}
4 changes: 0 additions & 4 deletions internal/regopolicyinterpreter/regopolicyinterpreter.go
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,6 @@ func (r *RegoPolicyInterpreter) compile() error {

options := ast.CompileOpts{
EnablePrintStatements: r.logLevel != LogNone,
ParserOptions: ast.ParserOptions{
RegoVersion: ast.RegoV0,
},
}

if compiled, err := ast.CompileModulesWithOpt(modules, options); err == nil {
Expand Down Expand Up @@ -732,7 +729,6 @@ func (r *RegoPolicyInterpreter) query(rule string, input map[string]interface{})
rego.Query(rule),
rego.Input(input),
rego.Store(store),
rego.SetRegoVersion(ast.RegoV0),
rego.EnablePrintStatements(r.logLevel != LogNone),
rego.PrintHook(topdown.NewPrintHook(&buf)),
rego.Compiler(r.compiledModules))
Expand Down
28 changes: 14 additions & 14 deletions internal/regopolicyinterpreter/test.rego
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ package test

default is_greater_than := {"result": false}

is_greater_than := {"result": true} {
is_greater_than := {"result": true} if {
input.a >= input.b
}

add := {"result": result} {
add := {"result": result} if {
result := input.a + input.b
}

add := {"result": result} {
add := {"result": result} if {
result := concat("+", [input.a, input.b])
}

default create := {"success": false}

create := {"success": true, "metadata": [addGreater, addLesser]} {
create := {"success": true, "metadata": [addGreater, addLesser]} if {
input.a >= input.b
addGreater := {
"name": input.name,
Expand All @@ -32,7 +32,7 @@ create := {"success": true, "metadata": [addGreater, addLesser]} {
}
}

create := {"success": true, "metadata": [addGreater, addLesser]} {
create := {"success": true, "metadata": [addGreater, addLesser]} if {
input.a < input.b
addGreater := {
"name": input.name,
Expand All @@ -52,16 +52,16 @@ default append := {"success": false}

default lists_exist := false

lists_exist {
lists_exist if {
data.metadata[input.name]
}

append := result {
append := result if {
not lists_exist
result := create
}

append := {"success": true, "metadata": [updateGreater, updateLesser]} {
append := {"success": true, "metadata": [updateGreater, updateLesser]} if {
input.a >= input.b
updateGreater := {
"name": input.name,
Expand All @@ -77,7 +77,7 @@ append := {"success": true, "metadata": [updateGreater, updateLesser]} {
}
}

append := {"success": true, "metadata": [updateGreater, updateLesser]} {
append := {"success": true, "metadata": [updateGreater, updateLesser]} if {
input.a < input.b
updateGreater := {
"name": input.name,
Expand All @@ -93,7 +93,7 @@ append := {"success": true, "metadata": [updateGreater, updateLesser]} {
}
}

compute_gap := {"result": result, "metadata": [removeGreater, removeLesser]} {
compute_gap := {"result": result, "metadata": [removeGreater, removeLesser]} if {
diffs := [diff | some i
g := data.metadata[input.name].greater[i]
l := data.metadata[input.name].lesser[i]
Expand All @@ -114,7 +114,7 @@ compute_gap := {"result": result, "metadata": [removeGreater, removeLesser]} {

subtract := data.module.subtract

setAdd := {"success": true, "metadata": [addSet]} {
setAdd := {"success": true, "metadata": [addSet]} if {
addSet := {
"name": input.name,
"type": "set",
Expand All @@ -125,7 +125,7 @@ setAdd := {"success": true, "metadata": [addSet]} {
}
}

setRemove := {"success": true, "metadata": [removeSet]} {
setRemove := {"success": true, "metadata": [removeSet]} if {
removeSet := {
"name": input.name,
"type": "set",
Expand All @@ -137,12 +137,12 @@ setRemove := {"success": true, "metadata": [removeSet]} {
}

default setContains := {"result": false}
setContains := {"result": true} {
setContains := {"result": true} if {
data.metadata[input.name][_].value == input.value
}

default getSet := {"result": []}
getSet := {"result": result} {
getSet := {"result": result} if {
s := data.metadata[input.name]
result := [item.value | item := s[_]]
}
2 changes: 1 addition & 1 deletion pkg/securitypolicy/fragment_definition.rego
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default __fragment_parameters_metadata := {}
__fragment_parameters_metadata := data[input.namespace].parameters_api {
__fragment_parameters_metadata := data[input.namespace].parameters_api if {
data[input.namespace].parameters_api
}
parameter(name) := data.framework.extract_parameter(name, __fragment_parameters, __fragment_parameters_metadata)
Loading
Loading