Skip to content

Commit 5861db0

Browse files
committed
fix(config): use valid UUID placeholders in example config and fix keyset error variant
Update cipherstash-proxy-example.toml to use valid placeholder UUIDs for client_id and default_keyset_id now that EncryptConfig deserializes these as Uuid types. Rename stale InvalidDatasetId error variant to InvalidDefaultKeysetId with an accurate error message.
1 parent 305e1a5 commit 5861db0

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

cipherstash-proxy-example.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ workspace_crn = "workspace_crn"
2424
client_access_key = "client_access_key"
2525

2626
[encrypt]
27-
default_keyset_id = "default_keyset_id"
28-
client_id = "client_id"
27+
default_keyset_id = "00000000-0000-0000-0000-000000000000"
28+
client_id = "00000000-0000-0000-0000-000000000000"
2929
client_key = "client_key"

packages/cipherstash-proxy/src/config/tandem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl TandemConfig {
205205
value: "invalid UUID".to_string(),
206206
}
207207
} else {
208-
ConfigError::InvalidDatasetId
208+
ConfigError::InvalidDefaultKeysetId
209209
}
210210
}
211211
s if s.contains("missing field") => {

packages/cipherstash-proxy/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ pub enum ConfigError {
125125
#[error("Client key is not valid.")]
126126
InvalidClientKey,
127127

128-
#[error("Dataset id is not a valid UUID.")]
129-
InvalidDatasetId,
128+
#[error("default_keyset_id is not a valid UUID.")]
129+
InvalidDefaultKeysetId,
130130

131131
#[error("Server host {name} is not a valid server name")]
132132
InvalidServerName { name: String },

0 commit comments

Comments
 (0)