Merge pull request #225 from cipherstash/chore/remove-cipherstash-config-dep-from-proxy

Chore/remove cipherstash config dep from proxy

Author: freshtonic

Cargo.lock

@@ -9,7 +9,6 @@ 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-config = "0.2.3"
 clap = { version = "4.5.31", features = ["derive", "env"] }
 config = { version = "0.15", features = [
     "async",

packages/cipherstash-proxy/Cargo.toml

@@ -3,7 +3,7 @@ use crate::{
     error::{ConfigError, Error},
     log::KEYSET,
 };
-use cipherstash_config::{
+use cipherstash_client::schema::{
     column::{Index, IndexType, TokenFilter, Tokenizer},
     ColumnConfig, ColumnType,
 };

packages/cipherstash-proxy/src/encrypt/config/encrypt_config.rs

@@ -7,7 +7,7 @@ use crate::{
     log::ENCRYPT_CONFIG,
 };
 use arc_swap::ArcSwap;
-use cipherstash_config::ColumnConfig;
+use cipherstash_client::schema::ColumnConfig;
 use serde_json::Value;
 use std::{collections::HashMap, sync::Arc, time::Duration};
 use tokio::{task::JoinHandle, time};

packages/cipherstash-proxy/src/encrypt/config/manager.rs

@@ -17,9 +17,9 @@ use cipherstash_client::{
         self, Encrypted, EncryptedEntry, EncryptedSteVecTerm, IndexTerm, Plaintext,
         PlaintextTarget, ReferencedPendingPipeline,
     },
+    schema::ColumnConfig,
     ConsoleConfig, CtsConfig, ZeroKMSConfig,
 };
-use cipherstash_config::ColumnConfig;
 use config::EncryptConfigManager;
 use schema::SchemaManager;
 use std::{sync::Arc, vec};
@@ -201,7 +201,14 @@ async fn init_cipher(config: &TandemConfig) -> Result<ScopedCipher, Error> {
     // Not using with_env because the proxy config should take precedence
     let builder = ZeroKMSConfig::builder()
         .add_source(EnvSource::default())
-        .workspace_id(&config.auth.workspace_id)
+        .workspace_id(
+            config
+                .auth
+                .workspace_id
+                .to_owned()
+                .try_into()
+                .map_err(cipherstash_client::config::ConfigError::from)?,
+        )
         .access_key(&config.auth.client_access_key)
         .try_with_client_id(&config.encrypt.client_id)?
         .try_with_client_key(&config.encrypt.client_key)?

packages/cipherstash-proxy/src/encrypt/mod.rs

@@ -104,7 +104,7 @@ pub enum ConfigError {
     Certificate(#[from] rustls_pki_types::pem::Error),
 
     #[error(transparent)]
-    EncryptConfig(#[from] cipherstash_config::errors::ConfigError),
+    EncryptConfig(#[from] cipherstash_client::config::errors::ConfigError),
 
     #[error(transparent)]
     Database(#[from] tokio_postgres::Error),
@@ -285,12 +285,6 @@ impl From<config::ConfigError> for Error {
     }
 }
 
-impl From<cipherstash_config::errors::ConfigError> for Error {
-    fn from(e: cipherstash_config::errors::ConfigError) -> Self {
-        Error::Config(e.into())
-    }
-}
-
 impl From<cipherstash_client::encryption::TypeParseError> for Error {
     fn from(e: cipherstash_client::encryption::TypeParseError) -> Self {
         Error::Encrypt(e.into())

packages/cipherstash-proxy/src/error.rs

@@ -1,4 +1,4 @@
-use cipherstash_config::{ColumnConfig, ColumnType};
+use cipherstash_client::schema::{ColumnConfig, ColumnType};
 use postgres_types::Type;
 
 use crate::Identifier;

packages/cipherstash-proxy/src/postgresql/context/column.rs

@@ -6,8 +6,7 @@ use crate::{
 use bigdecimal::BigDecimal;
 use bytes::BytesMut;
 use chrono::NaiveDate;
-use cipherstash_client::encryption::Plaintext;
-use cipherstash_config::ColumnType;
+use cipherstash_client::{encryption::Plaintext, schema::ColumnType};
 use postgres_types::FromSql;
 use postgres_types::Type;
 use rust_decimal::Decimal;
@@ -342,8 +341,10 @@ mod tests {
     };
     use bytes::{BufMut, BytesMut};
     use chrono::NaiveDate;
-    use cipherstash_client::encryption::Plaintext;
-    use cipherstash_config::{ColumnConfig, ColumnMode, ColumnType};
+    use cipherstash_client::{
+        encryption::Plaintext,
+        schema::{ColumnConfig, ColumnMode, ColumnType},
+    };
     use postgres_types::{ToSql, Type};
 
     fn to_message(s: &[u8]) -> BytesMut {

packages/cipherstash-proxy/src/postgresql/data/from_sql.rs

@@ -123,7 +123,7 @@ mod tests {
         Identifier,
     };
     use bytes::BytesMut;
-    use cipherstash_config::{ColumnConfig, ColumnType};
+    use cipherstash_client::schema::{ColumnConfig, ColumnType};
 
     fn to_message(s: &[u8]) -> BytesMut {
         BytesMut::from(s)