diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64c17a0c..35aaa983 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,6 +26,7 @@ jobs: CS_DEFAULT_KEYSET_ID: ${{ secrets.CS_DEFAULT_KEYSET_ID }} CS_CLIENT_ID: ${{ secrets.CS_CLIENT_ID }} CS_CLIENT_KEY: ${{ secrets.CS_CLIENT_KEY }} + CS_REGION: "ap-southeast-2.aws" RUST_BACKTRACE: "1" run: | diff --git a/Cargo.lock b/Cargo.lock index 45b21856..92a4eb8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,7 +194,7 @@ dependencies = [ "asn1-rs-derive", "asn1-rs-impl", "displaydoc", - "nom", + "nom 7.1.3", "num-traits", "rusticata-macros", "thiserror 2.0.12", @@ -599,7 +599,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -650,9 +650,9 @@ dependencies = [ [[package]] name = "cipherstash-client" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe21509165da6daf50b84d4dc9bc46b558e5afb34db75dbd2371b963faabe4d" +checksum = "84a83c23fbd5b42bf7af65f882a584afd6f534a60ffd734a87618d0c3341c4b3" dependencies = [ "aes-gcm-siv", "anyhow", @@ -1021,9 +1021,9 @@ dependencies = [ [[package]] name = "cts-common" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938da7d14d05c2769bf7ae33c5a395eb6a34ffdd25ec286e97702ae563314f9b" +checksum = "058540fce9a147af37cab4f55a5f9d8ae7f35f66efeec58c08cce6beb173d9c3" dependencies = [ "arrayvec", "axum", @@ -1032,6 +1032,7 @@ dependencies = [ "fake 3.1.0", "http", "miette", + "nom 8.0.0", "rand 0.8.5", "regex", "serde", @@ -1110,7 +1111,7 @@ checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" dependencies = [ "asn1-rs", "displaydoc", - "nom", + "nom 7.1.3", "num-bigint", "num-traits", "rusticata-macros", @@ -2353,6 +2354,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3255,7 +3265,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -4910,7 +4920,7 @@ dependencies = [ "data-encoding", "der-parser", "lazy_static", - "nom", + "nom 7.1.3", "oid-registry", "rusticata-macros", "thiserror 2.0.12", diff --git a/packages/cipherstash-proxy-integration/Cargo.toml b/packages/cipherstash-proxy-integration/Cargo.toml index 74ea4334..4291432e 100644 --- a/packages/cipherstash-proxy-integration/Cargo.toml +++ b/packages/cipherstash-proxy-integration/Cargo.toml @@ -24,7 +24,7 @@ tracing-subscriber = { workspace = true } webpki-roots = "0.26.7" [dev-dependencies] -cipherstash-client = { version = "0.20.0", features = ["tokio"] } +cipherstash-client = { version = "0.21.0", features = ["tokio"] } cipherstash-config = "0.2.3" clap = "4.5.32" fake = { version = "4", features = ["chrono", "derive"] } diff --git a/packages/cipherstash-proxy/Cargo.toml b/packages/cipherstash-proxy/Cargo.toml index 957f3a1b..26b17bac 100644 --- a/packages/cipherstash-proxy/Cargo.toml +++ b/packages/cipherstash-proxy/Cargo.toml @@ -8,7 +8,7 @@ bigdecimal = { version = "0.4.6", features = ["serde-json"] } arc-swap = "1.7.1" bytes = { version = "1.9", default-features = false } chrono = { version = "0.4.39", features = ["clock"] } -cipherstash-client = { version = "0.20.0", features = ["tokio"] } +cipherstash-client = { version = "0.21.0", features = ["tokio"] } clap = { version = "4.5.31", features = ["derive", "env"] } config = { version = "0.15", features = [ "async",