From fb81db6a84e25ac01df81ab0bb0df5de047131ac Mon Sep 17 00:00:00 2001 From: John Anderson Date: Thu, 7 Nov 2024 10:25:22 -0500 Subject: [PATCH] feat(jans-cedarling): "cedar_version": "v2.4.7" to "v4.0.0" Signed-off-by: John Anderson --- docs/cedarling/cedarling-policy-store.md | 4 ++-- .../cedarling_python/example_files/policy-store.json | 2 +- jans-cedarling/cedarling/src/common/policy_store/test.rs | 6 +++--- jans-cedarling/cedarling/src/tests/agama_policy_test.rs | 4 ++-- jans-cedarling/test_files/policy-store_blobby.json | 2 +- jans-cedarling/test_files/policy-store_ok_2.yaml | 2 +- .../test_files/policy-store_policy_err_base64.json | 2 +- .../test_files/policy-store_policy_err_broken_policy.yaml | 2 +- .../test_files/policy-store_policy_err_broken_utf8.json | 2 +- jans-cedarling/test_files/policy-store_schema_err.yaml | 2 +- .../test_files/policy-store_schema_err_base64.json | 2 +- .../test_files/policy-store_schema_err_cedar_mistake.yaml | 2 +- .../policy-store_with_multiple_role_mappings_err.yaml | 2 +- .../test_files/policy-store_with_trusted_issuers_ok.yaml | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/cedarling/cedarling-policy-store.md b/docs/cedarling/cedarling-policy-store.md index 75341b1dde0..6b138914421 100644 --- a/docs/cedarling/cedarling-policy-store.md +++ b/docs/cedarling/cedarling-policy-store.md @@ -66,7 +66,7 @@ The `policies` field describes the Cedar policies that will be used in Cedarling ```json "policies": { "unique_policy_id": { - "cedar_version" : "v2.4.7", + "cedar_version" : "v4.0.0", "name": "Policy for Unique Id", "description": "simple policy example", "creation_date": "2024-09-20T17:22:39.996050", @@ -207,7 +207,7 @@ Here is a non-normative example of a `cedarling_store.json` file: ```json { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example", diff --git a/jans-cedarling/bindings/cedarling_python/example_files/policy-store.json b/jans-cedarling/bindings/cedarling_python/example_files/policy-store.json index 87cac6a8212..1e2fe2070d7 100644 --- a/jans-cedarling/bindings/cedarling_python/example_files/policy-store.json +++ b/jans-cedarling/bindings/cedarling_python/example_files/policy-store.json @@ -1,5 +1,5 @@ { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example for principal workload", diff --git a/jans-cedarling/cedarling/src/common/policy_store/test.rs b/jans-cedarling/cedarling/src/common/policy_store/test.rs index 3393b6b78c7..9b470e3da2f 100644 --- a/jans-cedarling/cedarling/src/common/policy_store/test.rs +++ b/jans-cedarling/cedarling/src/common/policy_store/test.rs @@ -36,7 +36,7 @@ fn test_policy_store_deserialization_success() { // represents the `policy_store.json` let policy_store_json = json!({ - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example", @@ -74,7 +74,7 @@ fn test_base64_decoding_error_in_policy_store() { // represents the `policy_store.json` let policy_store_json = json!({ - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example", @@ -123,7 +123,7 @@ fn test_policy_parsing_error_in_policy_store() { // represents the `policy_store.json` let policy_store_json = json!({ - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example", diff --git a/jans-cedarling/cedarling/src/tests/agama_policy_test.rs b/jans-cedarling/cedarling/src/tests/agama_policy_test.rs index 7cc37ba8364..9d2e4c453bd 100644 --- a/jans-cedarling/cedarling/src/tests/agama_policy_test.rs +++ b/jans-cedarling/cedarling/src/tests/agama_policy_test.rs @@ -16,13 +16,13 @@ fn load_agama_policy_store_json() { "fbcd361d3243f4808d5e6f89ca81eaf4ca03900b407e": { "policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "description": "simple policy example for principal workload", "creation_date": "2024-09-20T17:22:39.996050", "policy_content": "cGVybWl0KAogICAgcHJpbmNpcGFsIGlzIEphbnM6Oldvcmtsb2FkLAogICAgYWN0aW9uIGluIFtKYW5zOjpBY3Rpb246OiJVcGRhdGUiXSwKICAgIHJlc291cmNlIGlzIEphbnM6Oklzc3VlCil3aGVuewogICAgcHJpbmNpcGFsLm9yZ19pZCA9PSByZXNvdXJjZS5vcmdfaWQKfTs=" }, "444da5d85403f35ea76519ed1a18a33989f855bf1cf8": { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "description": "simple policy example for principal user", "creation_date": "2024-09-20T17:22:39.996050", "policy_content": "cGVybWl0KAogICAgcHJpbmNpcGFsIGlzIEphbnM6OlVzZXIsCiAgICBhY3Rpb24gaW4gW0phbnM6OkFjdGlvbjo6IlVwZGF0ZSJdLAogICAgcmVzb3VyY2UgaXMgSmFuczo6SXNzdWUKKXdoZW57CiAgICBwcmluY2lwYWwuY291bnRyeSA9PSByZXNvdXJjZS5jb3VudHJ5Cn07" diff --git a/jans-cedarling/test_files/policy-store_blobby.json b/jans-cedarling/test_files/policy-store_blobby.json index 503b4cbb249..9318b8bce79 100644 --- a/jans-cedarling/test_files/policy-store_blobby.json +++ b/jans-cedarling/test_files/policy-store_blobby.json @@ -1,5 +1,5 @@ { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "simple policy example for principal workload", diff --git a/jans-cedarling/test_files/policy-store_ok_2.yaml b/jans-cedarling/test_files/policy-store_ok_2.yaml index 60b027c2d42..39ca0836c76 100644 --- a/jans-cedarling/test_files/policy-store_ok_2.yaml +++ b/jans-cedarling/test_files/policy-store_ok_2.yaml @@ -1,7 +1,7 @@ cedar_version: v4.0.0 policy_stores: a1bf93115de86de760ee0bea1d529b521489e5a11747: - cedar_version: v2.4.7 + cedar_version: v4.0.0 policies: 1: description: simple policy example for principal workload, permit when workload org_id same with resource diff --git a/jans-cedarling/test_files/policy-store_policy_err_base64.json b/jans-cedarling/test_files/policy-store_policy_err_base64.json index 8d04c818ba4..efadbe4cfb9 100644 --- a/jans-cedarling/test_files/policy-store_policy_err_base64.json +++ b/jans-cedarling/test_files/policy-store_policy_err_base64.json @@ -2,7 +2,7 @@ "cedar_version": "v4.0.0", "policy_stores": { "23641abe5787e6276852e4c0d37c881e6814e4ecf2e8ffebff3c88a9d9bf1975": { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "admin access", diff --git a/jans-cedarling/test_files/policy-store_policy_err_broken_policy.yaml b/jans-cedarling/test_files/policy-store_policy_err_broken_policy.yaml index 98f63588928..97216ec84ec 100644 --- a/jans-cedarling/test_files/policy-store_policy_err_broken_policy.yaml +++ b/jans-cedarling/test_files/policy-store_policy_err_broken_policy.yaml @@ -1,7 +1,7 @@ cedar_version: v4.0.0 policy_stores: ba1f39115ed86ed760ee0bea1d529b52189e5a117474: - cedar_version: v2.4.7 + cedar_version: v4.0.0 name: PolicyStoreOk description: Syntax error in policy cedar_policies: diff --git a/jans-cedarling/test_files/policy-store_policy_err_broken_utf8.json b/jans-cedarling/test_files/policy-store_policy_err_broken_utf8.json index 45dafec8628..448ead2fd9e 100644 --- a/jans-cedarling/test_files/policy-store_policy_err_broken_utf8.json +++ b/jans-cedarling/test_files/policy-store_policy_err_broken_utf8.json @@ -2,7 +2,7 @@ "cedar_version": "v4.0.0", "policy_stores": { "050bc9c1b1c08eb4b95b1da310c5d17a69be17f7a13c206d868853232edb57bb": { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "admin access", diff --git a/jans-cedarling/test_files/policy-store_schema_err.yaml b/jans-cedarling/test_files/policy-store_schema_err.yaml index f8118e615eb..6f90bf9e419 100644 --- a/jans-cedarling/test_files/policy-store_schema_err.yaml +++ b/jans-cedarling/test_files/policy-store_schema_err.yaml @@ -1,4 +1,4 @@ -cedar_version: v2.4.7 +cedar_version: v4.0.0 policy_stores: e8c39ee71792766d3b9b12846f0479419051bb5fafff: policies: diff --git a/jans-cedarling/test_files/policy-store_schema_err_base64.json b/jans-cedarling/test_files/policy-store_schema_err_base64.json index 21b655dc0dc..cb7c6b07777 100644 --- a/jans-cedarling/test_files/policy-store_schema_err_base64.json +++ b/jans-cedarling/test_files/policy-store_schema_err_base64.json @@ -2,7 +2,7 @@ "cedar_version": "v4.0.0", "policy_stores": { "8ec39ee717927663bd9b18246f0479491051bb5af15a": { - "cedar_version": "v2.4.7", + "cedar_version": "v4.0.0", "cedar_policies": { "840da5d85403f35ea76519ed1a18a33989f855bf1cf8": { "description": "admin access", diff --git a/jans-cedarling/test_files/policy-store_schema_err_cedar_mistake.yaml b/jans-cedarling/test_files/policy-store_schema_err_cedar_mistake.yaml index 7bdc009d2fc..d28e294cd19 100644 --- a/jans-cedarling/test_files/policy-store_schema_err_cedar_mistake.yaml +++ b/jans-cedarling/test_files/policy-store_schema_err_cedar_mistake.yaml @@ -1,7 +1,7 @@ cedar_version: v4.0.0 policy_stores: a1bf93115de86de760ee0bea1d529b521489e5a11747: - cedar_version: v2.4.7 + cedar_version: v4.0.0 policies: 840da5d85403f35ea76519ed1a18a33989f855bf1cf8: description: admin access diff --git a/jans-cedarling/test_files/policy-store_with_multiple_role_mappings_err.yaml b/jans-cedarling/test_files/policy-store_with_multiple_role_mappings_err.yaml index 2cd787f33f1..9f888909a86 100644 --- a/jans-cedarling/test_files/policy-store_with_multiple_role_mappings_err.yaml +++ b/jans-cedarling/test_files/policy-store_with_multiple_role_mappings_err.yaml @@ -1,5 +1,5 @@ --- -cedar_version: v2.4.7 +cedar_version: v4.0.0 cedar_policies: 840da5d85403f35ea76519ed1a18a33989f855bf1cf8: description: simple policy example diff --git a/jans-cedarling/test_files/policy-store_with_trusted_issuers_ok.yaml b/jans-cedarling/test_files/policy-store_with_trusted_issuers_ok.yaml index b909268c0d0..1e009455d8f 100644 --- a/jans-cedarling/test_files/policy-store_with_trusted_issuers_ok.yaml +++ b/jans-cedarling/test_files/policy-store_with_trusted_issuers_ok.yaml @@ -1,5 +1,5 @@ --- -cedar_version: v2.4.7 +cedar_version: v4.0.0 cedar_policies: 840da5d85403f35ea76519ed1a18a33989f855bf1cf8: description: simple policy example