Merge pull request #4 from thedavemarshall/revert-3-main

Revert "update main from upstream"

.github/workflows/pr.yml

@@ -30,8 +30,6 @@ jobs:
       run: cargo test -r --doc
     - name: Run tests
       run: cargo test -r
-    - name: Run example
-      run: cargo run --example regorus -- eval -d examples/server/allowed_server.rego -i examples/server/input.json data.example
     - name: Run tests (ACI)
       run: cargo test -r --test aci
     - name: Run tests (KATA)

.github/workflows/release-plz.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
       - name: Run release-plz
-        uses: MarcoIeni/release-plz-action@98b2b45b090aadf18cb662caaf3de6222d98822a #v0.5.60
+        uses: MarcoIeni/release-plz-action@a10be9933e46ab5005d79ce8b1eafca2ecdcd844 #v0.3.68
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/test-c-cpp.yml

@@ -18,11 +18,6 @@ jobs:
       - name: Setup gcc, g++, cmake, ninja
         run: sudo apt update && sudo apt install -y gcc g++ cmake ninja-build
 
-      - name: Workaround to ensure that regorus.h is generated
-        run: |
-          cargo build -r
-        working-directory: ./bindings/ffi
-
       - name: Test c binding
         run: |
           mkdir bindings/c/build

.github/workflows/test-csharp.yml

@@ -19,8 +19,8 @@ jobs:
 
       - name: Build
         run: dotnet build
-        working-directory: ./bindings/csharp/net8.0
+        working-directory: ./bindings/csharp
 
       - name: Run
         run: LD_LIBRARY_PATH=. dotnet run
-        working-directory: ./bindings/csharp/net8.0
+        working-directory: ./bindings/csharp

.github/workflows/test-java.yml

@@ -22,16 +22,14 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
 
       - name: Building binding
-        run: |
-          cargo clippy --all-targets --no-deps -- -Dwarnings
-          cargo build --release --manifest-path bindings/java/Cargo.toml
+        run: cargo build --release --manifest-path bindings/java/Cargo.toml
 
       - name: Build jar
         run: mvn package
         working-directory: ./bindings/java
 
       - name: Test jar
         run: |
-          javac -cp target/regorus-java-0.2.2.jar Test.java
-          java -Djava.library.path=../../target/release -cp target/regorus-java-0.2.2.jar:. Test
+          javac -cp target/regorus-java-0.1.5.jar Test.java
+          java -Djava.library.path=../../target/release -cp target/regorus-java-0.1.5.jar:. Test
         working-directory: ./bindings/java

.github/workflows/test-python.yml

@@ -34,5 +34,4 @@ jobs:
         run:  |
           pip3 install dist/regorus-*.whl
           cd bindings/python
-          cargo clippy --all-targets --no-deps -- -Dwarnings
           python3 test.py          

.github/workflows/test-ruby.yml

@@ -27,5 +27,4 @@ jobs:
       - name: Run ruby tests
         run:  |
           cd bindings/ruby
-          cargo clippy --all-targets --no-deps -- -Dwarnings
           bundle exec rake

.github/workflows/test-wasm.yml

@@ -26,7 +26,5 @@ jobs:
       - name: Test wasm binding
         run: |
           cd bindings/wasm
-          cargo clippy --all-targets --no-deps -- -Dwarnings
           wasm-pack build --target nodejs --release
-          wasm-pack test --release --node
           node test.js

.gitignore

@@ -1,8 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
-**/wheels/
-**/__pycache__/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -18,11 +16,4 @@ Cargo.lock
 worktrees/
 
 # build folders
-**/build
-
-# Generated C# bindings
-**/*.g.cs
-
-# Generated C, C++ headers
-bindings/ffi/regorus.h
-bindings/ffi/regorus.ffi.hpp
+**/build

CHANGELOG.md

@@ -6,127 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.2.8](https://github.com/microsoft/regorus/compare/regorus-v0.2.7...regorus-v0.2.8) - 2024-11-06
-
-### Other
-- *(deps)* update jsonschema requirement from 0.24.0 to 0.26.1 ([#343](https://github.com/microsoft/regorus/pull/343))
-- Update to OPA v0.70.0 ([#341](https://github.com/microsoft/regorus/pull/341))
-
-## [0.2.7](https://github.com/microsoft/regorus/compare/regorus-v0.2.6...regorus-v0.2.7) - 2024-10-22
-
-### Fixed
-- docs failing to build ([#334](https://github.com/microsoft/regorus/pull/334))
-
-### Other
-- *(deps)* update jsonschema requirement from 0.23.0 to 0.24.0 ([#332](https://github.com/microsoft/regorus/pull/332))
-- *(deps)* update jsonschema requirement from 0.22.3 to 0.23.0 ([#331](https://github.com/microsoft/regorus/pull/331))
-
-## [0.2.6](https://github.com/microsoft/regorus/compare/regorus-v0.2.5...regorus-v0.2.6) - 2024-10-09
-
-### Added
-- integer conversion functions for Value ([#328](https://github.com/microsoft/regorus/pull/328))
-
-### Other
-- update to OPA v0.69.0 ([#327](https://github.com/microsoft/regorus/pull/327))
-- *(deps)* update jsonschema requirement from 0.21.0 to 0.22.3 ([#326](https://github.com/microsoft/regorus/pull/326))
-- *(deps)* update jsonschema requirement from 0.20.0 to 0.21.0 ([#325](https://github.com/microsoft/regorus/pull/325))
-- update to jsonschema 0.20.0 ([#323](https://github.com/microsoft/regorus/pull/323))
-
-## [0.2.5](https://github.com/microsoft/regorus/compare/regorus-v0.2.4...regorus-v0.2.5) - 2024-09-18
-
-### Added
-- or keyword ([#315](https://github.com/microsoft/regorus/pull/315))
-
-### Fixed
-- Null terminate C# strings in Rust boundary ([#318](https://github.com/microsoft/regorus/pull/318))
-- Update readme with correct path to example policy ([#312](https://github.com/microsoft/regorus/pull/312))
-
-### Other
-- Update jsonschema requirement from 0.18.0 to 0.19.1 ([#317](https://github.com/microsoft/regorus/pull/317))
-- Update chrono-tz requirement from 0.8.5 to 0.10.0 ([#316](https://github.com/microsoft/regorus/pull/316))
-- Add tests for builtin strings::lower method ([#313](https://github.com/microsoft/regorus/pull/313))
-- Add tests for builtin strings::indexof method ([#311](https://github.com/microsoft/regorus/pull/311))
-
-## [0.2.4](https://github.com/microsoft/regorus/compare/regorus-v0.2.3...regorus-v0.2.4) - 2024-09-04
-
-### Added
-- OPA v0.68.0. Engine::set_rego_v1 ([#305](https://github.com/microsoft/regorus/pull/305))
-
-### Fixed
-- Handle parsing corner cases ([#309](https://github.com/microsoft/regorus/pull/309))
-- Propagate errors encountered in argument evaluation ([#308](https://github.com/microsoft/regorus/pull/308))
-- Issues [#302](https://github.com/microsoft/regorus/pull/302), [#303](https://github.com/microsoft/regorus/pull/303) ([#304](https://github.com/microsoft/regorus/pull/304))
-
-## [0.2.3](https://github.com/microsoft/regorus/compare/regorus-v0.2.2...regorus-v0.2.3) - 2024-08-16
-
-### Fixed
-- Match OPA behavior for split ([#295](https://github.com/microsoft/regorus/pull/295))
-- Merge data to init document ([#293](https://github.com/microsoft/regorus/pull/293))
-
-### Other
-- Update cbindgen requirement from 0.26.0 to 0.27.0 ([#296](https://github.com/microsoft/regorus/pull/296))
-- Bump rexml in /bindings/ruby in the bundler group across 1 directory ([#294](https://github.com/microsoft/regorus/pull/294))
-- Update csbindgen requirement from =1.9.0 to =1.9.3 ([#292](https://github.com/microsoft/regorus/pull/292))
-
-## [0.2.2](https://github.com/microsoft/regorus/compare/regorus-v0.2.1...regorus-v0.2.2) - 2024-07-28
-
-### Added
-- Update to opa v0.67.0 ([#286](https://github.com/microsoft/regorus/pull/286))
-
-### Fixed
-- Handle aliases in scheduler ([#285](https://github.com/microsoft/regorus/pull/285))
-
-### Other
-- Update readme ([#288](https://github.com/microsoft/regorus/pull/288))
-- Update binding versions ([#287](https://github.com/microsoft/regorus/pull/287))
-- build.rs create hooks dir if not exists ([#283](https://github.com/microsoft/regorus/pull/283))
-- add extension_list example ([#281](https://github.com/microsoft/regorus/pull/281))
-- Fix build break ([#278](https://github.com/microsoft/regorus/pull/278))
-- Update pyo3 requirement from 0.21.0 to 0.22.0 ([#275](https://github.com/microsoft/regorus/pull/275))
-- Update to OPA v0.66.0 ([#274](https://github.com/microsoft/regorus/pull/274))
-
-## [0.2.1](https://github.com/microsoft/regorus/compare/regorus-v0.2.0...regorus-v0.2.1) - 2024-06-19
-
-### Added
-- get_policies: Way to obtain policy files and content ([#267](https://github.com/microsoft/regorus/pull/267))
-
-### Other
-- Fix c,cpp,no-std binding examples ([#272](https://github.com/microsoft/regorus/pull/272))
-- Update binding versions for next release ([#270](https://github.com/microsoft/regorus/pull/270))
-- rename method from 'Clone' to 'clone' in 'Engine' class to match the java naming convention and definiont in the of java.lang.Object. ([#268](https://github.com/microsoft/regorus/pull/268))
-- Suppress clippy unused warning ([#269](https://github.com/microsoft/regorus/pull/269))
-- Provide ability to get JSON representation of policy AST ([#266](https://github.com/microsoft/regorus/pull/266))
-- Update OPA tests to v0.65.0 ([#264](https://github.com/microsoft/regorus/pull/264))
-- Allow lexer to be used for other policy languages ([#262](https://github.com/microsoft/regorus/pull/262))
-
-## [0.2.0](https://github.com/microsoft/regorus/compare/regorus-v0.1.5...regorus-v0.2.0) - 2024-05-30
-
-### Other
-- Add release-plz config to publish only regorus package ([#259](https://github.com/microsoft/regorus/pull/259))
-- Revert "chore: release v0.2.0 ([#257](https://github.com/microsoft/regorus/pull/257))" ([#258](https://github.com/microsoft/regorus/pull/258))
-- release v0.2.0 ([#257](https://github.com/microsoft/regorus/pull/257))
-- Fix release-plz hash ([#256](https://github.com/microsoft/regorus/pull/256))
-- non collections should evaluate to false ([#253](https://github.com/microsoft/regorus/pull/253))
-- Fix merge issue ([#252](https://github.com/microsoft/regorus/pull/252))
-- Update bindings to include newer APIs ([#250](https://github.com/microsoft/regorus/pull/250))
-- update ruby bindings version to 0.1.5, bump deps ([#251](https://github.com/microsoft/regorus/pull/251))
-- Use correct docsrs feature annotation ([#248](https://github.com/microsoft/regorus/pull/248))
-- Lockdown kata test prints as well as prints of various values ([#249](https://github.com/microsoft/regorus/pull/249))
-- Fix bindings and add CI tests ([#247](https://github.com/microsoft/regorus/pull/247))
-- Add test-ruby CI for github actions ([#244](https://github.com/microsoft/regorus/pull/244))
-- Update `README.md` for Java bindings to mention we don't publish to ([#246](https://github.com/microsoft/regorus/pull/246))
-- Update itertools requirement from 0.12.1 to 0.13.0 ([#245](https://github.com/microsoft/regorus/pull/245))
-- Update ruby bindings for add_policy and add_policy_from_file to return package name ([#240](https://github.com/microsoft/regorus/pull/240))
-- Provide a way to obtain package names of loaded policies ([#239](https://github.com/microsoft/regorus/pull/239))
-- `c_no_std` binding to show use in C freestanding environments. ([#238](https://github.com/microsoft/regorus/pull/238))
-- Bump rexml in /bindings/ruby in the bundler group across 1 directory ([#236](https://github.com/microsoft/regorus/pull/236))
-- Update prettydiff requirement from 0.6.4 to 0.7.0 ([#234](https://github.com/microsoft/regorus/pull/234))
-- Update jsonschema requirement from 0.17.1 to 0.18.0 ([#235](https://github.com/microsoft/regorus/pull/235))
-- no_std support ([#232](https://github.com/microsoft/regorus/pull/232))
-- add `std` feature ([#231](https://github.com/microsoft/regorus/pull/231))
-- Tests from MSFT fork of kata-containers ([#230](https://github.com/microsoft/regorus/pull/230))
-- Use alloc, core instead of std ([#225](https://github.com/microsoft/regorus/pull/225))
-
 ## [0.1.5](https://github.com/microsoft/regorus/compare/regorus-v0.1.4...regorus-v0.1.5) - 2024-05-07
 
 ### Added
@@ -433,4 +312,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - LICENSE committed
 - CODE_OF_CONDUCT.md committed
 - Initial commit
-

Cargo.toml

@@ -12,7 +12,7 @@ members = [
 [package]
 name = "regorus"
 description = "A fast, lightweight Rego (OPA policy language) interpreter"
-version = "0.2.8"
+version = "0.1.5"
 edition = "2021"
 license-file = "LICENSE"
 repository = "https://github.com/microsoft/regorus"
@@ -27,7 +27,6 @@ doctest = false
 default = ["full-opa", "arc"]
 
 arc = ["scientific/arc"]
-ast = []
 base64 = ["dep:data-encoding"]
 base64url = ["dep:data-encoding"]
 coverage = []
@@ -67,9 +66,7 @@ full-opa = [
     "time",
     "uuid",
     "urlquery",
-    "yaml",
-
-    #"rego-extensions"
+    "yaml"
 ]
 
 # Features that can be used in no_std environments.
@@ -91,9 +88,6 @@ opa-no-std = [
   "lazy_static/spin_no_std"
 ]
 
-# Rego language extensions
-rego-extensions = []
-
 # This feature enables some testing utils for OPA tests.
 opa-testutil = []
 rand = ["dep:rand"]
@@ -120,9 +114,9 @@ semver = {version = "1.0.20", optional = true, default-features = false }
 wax = { version = "0.6.0", features = [], default-features = false, optional = true }
 url = { version = "2.5.0", optional = true }
 uuid = { version = "1.6.1", default-features = false, features = ["v4", "fast-rng"], optional = true }
-jsonschema = { version = "0.26.1", default-features = false, optional = true }
+jsonschema = { version = "0.18.0", default-features = false, optional = true }
 chrono = { version = "0.4.31", optional = true }
-chrono-tz = { version = "0.10.0", optional = true }
+chrono-tz = { version = "0.8.5", optional = true }
 jsonwebtoken = { version = "9.2.0", optional = true }
 itertools = { version = "0.13.0", default-features = false, optional = true }
 
@@ -133,7 +127,7 @@ rand = { version = "0.8.5", default-features = false, optional = true }
 anyhow = "1.0.45"
 cfg-if = "1.0.0"
 clap = { version = "4.4.7", features = ["derive"] }
-prettydiff = { version = "0.8.0", default-features = false }
+prettydiff = { version = "0.7.0", default-features = false }
 serde_yaml = "0.9.16"
 test-generator = "0.3.1"
 walkdir = "2.3.2"