Skip to content

Canonical shared encryption config #386

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

Open
freshtonic wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Canonical shared encryption config #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb4e0e6
docs(plans): add migration plan for canonical encryption config
freshtonic Apr 1, 2026
dbeee44
refactor(proxy): replace local ColumnEncryptionConfig with canonical …
freshtonic Apr 1, 2026
27fa59b
docs(plan): add backwards compatibility test plan for canonical confi…
freshtonic Apr 1, 2026
83611df
test(proxy): add backwards compatibility tests for canonical config m…
freshtonic Apr 1, 2026
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
39 changes: 12 additions & 27 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ debug = true

[workspace.dependencies]
sqltk = { version = "0.10.0" }
cipherstash-client = { version = "0.34.0-alpha.4" }
cts-common = { version = "0.34.0-alpha.4" }
cipherstash-client = { version = "0.34.0-alpha.5" }
cipherstash-config = { version = "0.34.0-alpha.5" }
cts-common = { version = "0.34.0-alpha.5" }

thiserror = "2.0.9"
tokio = { version = "1.44.2", features = ["full"] }
Expand All @@ -55,3 +56,9 @@ tracing-subscriber = { version = "^0.3.20", features = [
"env-filter",
"std",
] }

[patch.crates-io]
cipherstash-client = { path = "../cipherstash-suite/packages/cipherstash-client" }
cipherstash-config = { path = "../cipherstash-suite/packages/cipherstash-config" }
cts-common = { path = "../cipherstash-suite/packages/cts-common" }
zerokms-protocol = { path = "../cipherstash-suite/packages/zerokms-protocol" }
Comment on lines +60 to +64
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

sed -n '44,64p' Cargo.toml
printf '\n---\n'

for p in \
  "../cipherstash-suite/packages/cipherstash-client" \
  "../cipherstash-suite/packages/cipherstash-config" \
  "../cipherstash-suite/packages/cts-common" \
  "../cipherstash-suite/packages/zerokms-protocol"
do
  if [ -e "$p" ]; then
    echo "$p exists"
  else
    echo "$p MISSING"
  fi
done

Repository: cipherstash/proxy

Length of output: 1784

Remove the [patch.crates-io] entries before merge.

These patches reference ../cipherstash-suite/packages/*, which do not exist in the CI environment and are causing the current GitHub Actions failure. Move these patches to a local Cargo.local configuration or remove them from the shared manifest.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Cargo.toml` around lines 60 - 64, The shared Cargo manifest currently
contains a [patch.crates-io] section referencing local paths for
cipherstash-client, cipherstash-config, cts-common, and zerokms-protocol which
break CI; remove that entire [patch.crates-io] block from Cargo.toml (the
entries for cipherstash-client, cipherstash-config, cts-common,
zerokms-protocol) before merging, and instead move those local path overrides
into a non-shared local config (e.g., Cargo.local or a developer-only manifest)
so CI uses the published crates.

Loading
Loading