i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support per-format provider key auth

Browse Source
This commit is contained in:
fawney19
2026-04-29 15:46:50 +08:00
parent 07a319259b
commit e751289dfb
67 changed files with 1244 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
crates/aether-data-contracts/src/repository/provider_catalog/types.rs
View File

@@ -248,7 +248,8 @@ pub struct StoredProviderCatalogKey {
pub capabilities: Option<serde_json::Value>,
pub is_active: bool,
pub api_formats: Option<serde_json::Value>,
pub encrypted_api_key: String,
pub auth_type_by_format: Option<serde_json::Value>,
pub encrypted_api_key: Option<String>,
pub encrypted_auth_config: Option<String>,
pub note: Option<String>,
pub internal_priority: i32,
@@ -321,7 +322,8 @@ impl StoredProviderCatalogKey {
capabilities,
is_active,
api_formats: None,
encrypted_api_key: String::new(),
auth_type_by_format: None,
encrypted_api_key: None,
encrypted_auth_config: None,
note: None,
internal_priority: 50,
@@ -371,7 +373,7 @@ impl StoredProviderCatalogKey {
pub fn with_transport_fields(
mut self,
api_formats: Option<serde_json::Value>,
encrypted_api_key: String,
encrypted_api_key: impl Into<Option<String>>,
encrypted_auth_config: Option<String>,
rate_multipliers: Option<serde_json::Value>,
global_priority_by_format: Option<serde_json::Value>,
@@ -380,7 +382,11 @@ impl StoredProviderCatalogKey {
proxy: Option<serde_json::Value>,
fingerprint: Option<serde_json::Value>,
) -> Result<Self, crate::DataLayerError> {
if encrypted_api_key.trim().is_empty() {
let encrypted_api_key = encrypted_api_key.into();
if encrypted_api_key
.as_deref()
.is_some_and(|value| value.trim().is_empty())
{
return Err(crate::DataLayerError::UnexpectedValue(
"provider_api_keys.api_key is empty".to_string(),
));
@@ -629,3 +635,60 @@ pub trait ProviderCatalogWriteRepository: Send + Sync {
circuit_breaker_by_format: Option<&serde_json::Value>,
) -> Result<bool, crate::DataLayerError>;
}
#[cfg(test)]
mod tests {
use super::StoredProviderCatalogKey;
fn sample_key() -> StoredProviderCatalogKey {
StoredProviderCatalogKey::new(
"key-1".to_string(),
"provider-1".to_string(),
"key".to_string(),
"service_account".to_string(),
None,
true,
)
.expect("key should build")
}
#[test]
fn transport_fields_allow_null_encrypted_api_key() {
let key = sample_key()
.with_transport_fields(
None,
None::<String>,
None,
None,
None,
None,
None,
None,
None,
)
.expect("null api key should be accepted");
assert_eq!(key.encrypted_api_key, None);
}
#[test]
fn transport_fields_reject_empty_encrypted_api_key_string() {
let err = sample_key()
.with_transport_fields(
None,
Some(" ".to_string()),
None,
None,
None,
None,
None,
None,
None,
)
.expect_err("empty api key string should be rejected");
assert!(err
.to_string()
.contains("provider_api_keys.api_key is empty"));
}
}