Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Apr 28, 2026
Merged

Policy nested rule fix #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 policy/src/main/java/dev/cel/policy/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
visibility = ["//visibility:private"],
deps = [
":compiled_rule",
"//:auto_value",
"//bundle:cel",
"//common:cel_ast",
"//common:compiler_common",
"//common:mutable_ast",
"//common:mutable_source",
"//common:operator",
"//common/ast",
"//common/ast:mutable_expr",
"//common/formats:value_string",
"//common/navigation:mutable_navigation",
"//extensions:optional_library",
"//optimizer:ast_optimizer",
"//optimizer:mutable_ast",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)
284 changes: 205 additions & 79 deletions policy/src/main/java/dev/cel/policy/RuleComposer.java
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 26 additions & 3 deletions policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
// Read the policy source
String policySource = testData.yamlPolicy.readPolicyYamlContent();
CelPolicy policy = POLICY_PARSER.parse(policySource);
CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
Object outputObj = testData.testCase.getOutput();
String exprToCompile;
if (outputObj instanceof String) {
exprToCompile = (String) outputObj;
} else if (outputObj instanceof Map) {
@SuppressWarnings("unchecked") // Test only
Map<String, Object> outputMap = (Map<String, Object>) outputObj;
if (outputMap.containsKey("value")) {
Object value = outputMap.get("value");
if (value instanceof String) {
String escapedValue = ((String) value).replace("\"", "\\\"");
exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
} else {
exprToCompile = String.valueOf(value);
}
} else if (outputMap.containsKey("expr")) {
exprToCompile = (String) outputMap.get("expr");
} else {
throw new IllegalArgumentException("Invalid output format: " + outputObj);
}
} else {
throw new IllegalArgumentException("Invalid output format: " + outputObj);
}
CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

// Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

// Result is Optional<Optional<Object>>
assertThat(evalResult).hasValue(Optional.of(true));
// Result is Optional<Object> containing true
assertThat(evalResult).hasValue(true);
}

@Test
Expand Down
28 changes: 22 additions & 6 deletions policy/src/test/java/dev/cel/policy/PolicyTestHelper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
enum TestYamlPolicy {
NESTED_RULE(
"nested_rule",
true,
false,
"cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
+ " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
+ " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
+ " false} : @index2)))"),
+ " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
+ " false} : @index2))"),
NESTED_RULE2(
"nested_rule2",
false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
+ " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
+ " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
+ " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
NESTED_RULE5(
"nested_rule5",
true,
"cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
+ " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
NESTED_RULE6(
"nested_rule6",
false,
"cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
+ " > 3) ? @index0 : @index1).orValue(false)))"),
NESTED_RULE7(
"nested_rule7",
true,
"cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
+ " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
REQUIRED_LABELS(
"required_labels",
true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
public static final class PolicyTestCase {
private String name;
private Map<String, PolicyTestInput> input;
private String output;
private Object output;

public void setName(String name) {
this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
this.input = input;
}

public void setOutput(String output) {
public void setOutput(Object output) {
this.output = output;
}

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
return input;
}

public String getOutput() {
public Object getOutput() {
return output;
}

Expand Down
31 changes: 16 additions & 15 deletions testing/src/test/resources/policy/k8s/tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
tests:
- name: "restricted_container"
input:
resource.namespace:
value: "dev.cel"
resource.labels:
value:
environment: "staging"
resource.containers:
value:
- staging.dev.cel.container1
- staging.dev.cel.container2
- preprod.dev.cel.container3
output: "'only staging containers are allowed in namespace dev.cel'"
- name: "invalid"
tests:
- name: "restricted_container"
input:
resource.namespace:
value: "dev.cel"
resource.labels:
value:
environment: "staging"
resource.containers:
value:
- staging.dev.cel.container1
- staging.dev.cel.container2
- preprod.dev.cel.container3
output:
value: "only staging containers are allowed in namespace dev.cel"
48 changes: 26 additions & 22 deletions testing/src/test/resources/policy/limits/tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
tests:
- name: "7pm"
input:
now:
expr: "timestamp('2024-07-30T00:30:00Z')"
output: "'hello, me'"
- name: "8pm"
input:
now:
expr: "timestamp('2024-07-30T20:30:00Z')"
output: "'goodbye, me!'"
- name: "9pm"
input:
now:
expr: "timestamp('2024-07-30T21:30:00Z')"
output: "'goodbye, me!!'"
- name: "11pm"
input:
now:
expr: "timestamp('2024-07-30T23:30:00Z')"
output: "'goodbye, me!!!'"
- name: "now_after_hours"
tests:
- name: "7pm"
input:
now:
expr: "timestamp('2024-07-30T00:30:00Z')"
output:
value: "hello, me"
- name: "8pm"
input:
now:
expr: "timestamp('2024-07-30T20:30:00Z')"
output:
value: "goodbye, me!"
- name: "9pm"
input:
now:
expr: "timestamp('2024-07-30T21:30:00Z')"
output:
value: "goodbye, me!!"
- name: "11pm"
input:
now:
expr: "timestamp('2024-07-30T23:30:00Z')"
output:
value: "goodbye, me!!!"
39 changes: 21 additions & 18 deletions testing/src/test/resources/policy/nested_rule/tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
- name: "banned"
tests:
- name: "restricted_origin"
input:
resource:
value:
origin: "ir"
output: "{'banned': true}"
- name: "by_default"
input:
resource:
value:
origin: "de"
output: "{'banned': true}"
- name: "restricted_origin"
input:
resource:
value:
origin: "ir"
output:
expr: "{'banned': true}"
- name: "by_default"
input:
resource:
value:
origin: "de"
output:
expr: "{'banned': true}"
- name: "permitted"
tests:
- name: "valid_origin"
input:
resource:
value:
origin: "uk"
output: "{'banned': false}"
- name: "valid_origin"
input:
resource:
value:
origin: "uk"
output:
expr: "{'banned': false}"
68 changes: 36 additions & 32 deletions testing/src/test/resources/policy/nested_rule2/tests.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
tests:
- name: "restricted_origin"
input:
resource:
value:
user: "bad-user"
origin: "ir"
output: "{'banned': 'restricted_region'}"
- name: "by_default"
input:
resource:
value:
user: "bad-user"
origin: "de"
output: "{'banned': 'bad_actor'}"
- name: "unconfigured_region"
input:
resource:
value:
user: "good-user"
origin: "de"
output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
tests:
- name: "valid_origin"
input:
resource:
value:
user: "good-user"
origin: "uk"
output: "{}"
- name: "banned"
tests:
- name: "restricted_origin"
input:
resource:
value:
user: "bad-user"
origin: "ir"
output:
expr: "{'banned': 'restricted_region'}"
- name: "by_default"
input:
resource:
value:
user: "bad-user"
origin: "de"
output:
expr: "{'banned': 'bad_actor'}"
- name: "unconfigured_region"
input:
resource:
value:
user: "good-user"
origin: "de"
output:
expr: "{'banned': 'unconfigured_region'}"
- name: "permitted"
tests:
- name: "valid_origin"
input:
resource:
value:
user: "good-user"
origin: "uk"
output:
expr: "{}"
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Policy nested rule fix#1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 28, 2026
 Merged


Policy nested rule fix
#1039
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
policy/src/main/java/dev/cel/policy/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,19 +247,19 @@ java_library(
 visibility = ["//visibility:private"],
 deps = [
 ":compiled_rule",
 "//:auto_value",
 "//bundle:cel",
 "//common:cel_ast",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common:mutable_source",
 "//common:operator",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/formats:value_string",
 "//common/navigation:mutable_navigation",
 "//extensions:optional_library",
 "//optimizer:ast_optimizer",
 "//optimizer:mutable_ast",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

284 changes: 205 additions & 79 deletions
policy/src/main/java/dev/cel/policy/RuleComposer.java

View file


Open in desktop


Large diffs are not rendered by default.


29 changes: 26 additions & 3 deletions
policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,30 @@ public void evaluateYamlPolicy_withCanonicalTestData(
 // Read the policy source
 String policySource = testData.yamlPolicy.readPolicyYamlContent();
 CelPolicy policy = POLICY_PARSER.parse(policySource);
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(testData.testCase.getOutput()).getAst();
 Object outputObj = testData.testCase.getOutput();
 String exprToCompile;
 if (outputObj instanceof String) {
 exprToCompile = (String) outputObj;
 } else if (outputObj instanceof Map) {
 @SuppressWarnings("unchecked") // Test only
 Map<String, Object> outputMap = (Map<String, Object>) outputObj;
 if (outputMap.containsKey("value")) {
 Object value = outputMap.get("value");
 if (value instanceof String) {
 String escapedValue = ((String) value).replace("\"", "\\\"");
 exprToCompile = "\"" + escapedValue + "\""; // Quote string literals
 } else {
 exprToCompile = String.valueOf(value);
 }
 } else if (outputMap.containsKey("expr")) {
 exprToCompile = (String) outputMap.get("expr");
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 } else {
 throw new IllegalArgumentException("Invalid output format: " + outputObj);
 }
 CelAbstractSyntaxTree expectedOutputAst = cel.compile(exprToCompile).getAst();
 Object expectedOutput = cel.createProgram(expectedOutputAst).eval();

 // Act
Expand DownExpand Up@@ -266,8 +289,8 @@ public void evaluateYamlPolicy_nestedRuleProducesOptionalOutput() throws Excepti
 CelPolicyCompilerFactory.newPolicyCompiler(cel).build().compile(policy);
 Optional<Object> evalResult = (Optional<Object>) cel.createProgram(compiledPolicyAst).eval();

 // Result is Optional<Optional<Object>>
 assertThat(evalResult).hasValue(Optional.of(true));
 // Result is Optional<Object> containing true
 assertThat(evalResult).hasValue(true);
 }

 @Test
Expand Down

28 changes: 22 additions & 6 deletions
policy/src/test/java/dev/cel/policy/PolicyTestHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,11 @@ final class PolicyTestHelper {
 enum TestYamlPolicy {
 NESTED_RULE(
 "nested_rule",
true,
false,
 "cel.@block([resource.origin, @index0 in [\"us\", \"uk\", \"es\"], {\"banned\": true}],"
 + " ((@index0 in {\"us\": false, \"ru\": false, \"ir\": false} && !@index1) ?"
 + " optional.of(@index2) : optional.none()).or(optional.of(@index1 ? {\"banned\":"
 + " false} : @index2)))"),
 + " optional.of(@index2) : optional.none()).orValue(@index1 ? {\"banned\":"
 + " false} : @index2))"),
 NESTED_RULE2(
 "nested_rule2",
 false,
Expand All@@ -61,6 +61,22 @@ enum TestYamlPolicy {
 + " false, \"ru\": false, \"ir\": false} && @index1) ? {\"banned\":"
 + " \"restricted_region\"} : {\"banned\": \"bad_actor\"}) : (@index1 ?"
 + " optional.of({\"banned\": \"unconfigured_region\"}) : optional.none()))"),
 NESTED_RULE4("nested_rule4", false, "(x > 0) ? true : false"),
 NESTED_RULE5(
 "nested_rule5",
 true,
 "cel.@block([optional.of(true), optional.none()], (x > 0) ? ((x > 2) ? @index0 : @index1) :"
 + " ((x > 1) ? ((x >= 2) ? @index0 : @index1) : optional.of(false)))"),
 NESTED_RULE6(
 "nested_rule6",
 false,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).orValue(((x"
 + " > 3) ? @index0 : @index1).orValue(false)))"),
 NESTED_RULE7(
 "nested_rule7",
 true,
 "cel.@block([optional.of(true), optional.none()], ((x > 2) ? @index0 : @index1).or(((x > 3)"
 + " ? @index0 : @index1).or((x > 1) ? optional.of(false) : @index1)))"),
 REQUIRED_LABELS(
 "required_labels",
 true,
Expand DownExpand Up@@ -198,7 +214,7 @@ public List<PolicyTestCase> getTests() {
 public static final class PolicyTestCase {
 private String name;
 private Map<String, PolicyTestInput> input;
 private String output;
 private Object output;

 public void setName(String name) {
 this.name = name;
Expand All@@ -208,7 +224,7 @@ public void setInput(Map<String, PolicyTestInput> input) {
 this.input = input;
 }

 public void setOutput(String output) {
 public void setOutput(Object output) {
 this.output = output;
 }

Expand All@@ -220,7 +236,7 @@ public Map<String, PolicyTestInput> getInput() {
 return input;
 }

 public String getOutput() {
 public Object getOutput() {
 return output;
 }

Expand Down

31 changes: 16 additions & 15 deletions
testing/src/test/resources/policy/k8s/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,19 @@

description: K8s admission control tests
section:
- name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output: "'only staging containers are allowed in namespace dev.cel'"
 - name: "invalid"
 tests:
 - name: "restricted_container"
 input:
 resource.namespace:
 value: "dev.cel"
 resource.labels:
 value:
 environment: "staging"
 resource.containers:
 value:
 - staging.dev.cel.container1
 - staging.dev.cel.container2
 - preprod.dev.cel.container3
 output:
 value: "only staging containers are allowed in namespace dev.cel"

48 changes: 26 additions & 22 deletions
testing/src/test/resources/policy/limits/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,25 +14,29 @@

description: Limits related tests
section:
- name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output: "'hello, me'"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output: "'goodbye, me!'"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output: "'goodbye, me!!'"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output: "'goodbye, me!!!'"
 - name: "now_after_hours"
 tests:
 - name: "7pm"
 input:
 now:
 expr: "timestamp('2024-07-30T00:30:00Z')"
 output:
 value: "hello, me"
 - name: "8pm"
 input:
 now:
 expr: "timestamp('2024-07-30T20:30:00Z')"
 output:
 value: "goodbye, me!"
 - name: "9pm"
 input:
 now:
 expr: "timestamp('2024-07-30T21:30:00Z')"
 output:
 value: "goodbye, me!!"
 - name: "11pm"
 input:
 now:
 expr: "timestamp('2024-07-30T23:30:00Z')"
 output:
 value: "goodbye, me!!!"

39 changes: 21 additions & 18 deletions
testing/src/test/resources/policy/nested_rule/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,23 +16,26 @@ description: Nested rule conformance tests
section:
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output: "{'banned': true}"
 - name: "restricted_origin"
 input:
 resource:
 value:
 origin: "ir"
 output:
 expr: "{'banned': true}"
 - name: "by_default"
 input:
 resource:
 value:
 origin: "de"
 output:
 expr: "{'banned': true}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output: "{'banned': false}"
 - name: "valid_origin"
 input:
 resource:
 value:
 origin: "uk"
 output:
 expr: "{'banned': false}"

68 changes: 36 additions & 32 deletions
testing/src/test/resources/policy/nested_rule2/tests.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,39 @@

description: Nested rule conformance tests
section:
- name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output: "{'banned': 'unconfigured_region'}"
- name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output: "{}"
 - name: "banned"
 tests:
 - name: "restricted_origin"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "ir"
 output:
 expr: "{'banned': 'restricted_region'}"
 - name: "by_default"
 input:
 resource:
 value:
 user: "bad-user"
 origin: "de"
 output:
 expr: "{'banned': 'bad_actor'}"
 - name: "unconfigured_region"
 input:
 resource:
 value:
 user: "good-user"
 origin: "de"
 output:
 expr: "{'banned': 'unconfigured_region'}"
 - name: "permitted"
 tests:
 - name: "valid_origin"
 input:
 resource:
 value:
 user: "good-user"
 origin: "uk"
 output:
 expr: "{}"
Loading
Loading