Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/adaptive/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ impl From<PluginError> for AdaptiveError {
fn from(value: PluginError) -> Self {
match value {
PluginError::InvalidConfig(message) => Self::InvalidConfig(message),
PluginError::Conflict(message) => Self::RegistrationFailed(message),
PluginError::NotFound(message) => Self::NotFound(message),
PluginError::Serialization(err) => Self::Serialization(err),
PluginError::Internal(message) => Self::Internal(message),
Expand Down
6 changes: 6 additions & 0 deletions crates/adaptive/tests/coverage/error_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ fn test_plugin_error_conversion_maps_all_variants() {
let invalid = AdaptiveError::from(PluginError::InvalidConfig("bad config".into()));
assert_eq!(format!("{invalid}"), "invalid config: bad config");

let conflict = AdaptiveError::from(PluginError::Conflict("duplicate plugin".into()));
assert_eq!(
format!("{conflict}"),
"registration failed: duplicate plugin"
);

let missing = AdaptiveError::from(PluginError::NotFound("missing plugin".into()));
assert_eq!(format!("{missing}"), "not found: missing plugin");

Expand Down
8 changes: 8 additions & 0 deletions crates/core/src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ use crate::api::runtime::{
};
use crate::api::subscriber::{deregister_subscriber, register_subscriber};

pub mod dynamic;
pub use dynamic::*;

type PluginMap = HashMap<String, Arc<dyn Plugin>>;

static PLUGIN_HANDLERS: LazyLock<RwLock<PluginMap>> = LazyLock::new(|| RwLock::new(HashMap::new()));
Expand All @@ -53,6 +56,10 @@ pub enum PluginError {
#[error("invalid config: {0}")]
InvalidConfig(String),

/// The requested mutation conflicts with current plugin state.
#[error("conflict: {0}")]
Conflict(String),

/// The requested plugin resource was not found.
#[error("not found: {0}")]
NotFound(String),
Expand Down Expand Up @@ -776,6 +783,7 @@ pub fn ensure_builtin_plugins_registered() -> Result<()> {
fn clone_cached_plugin_error(err: &PluginError) -> PluginError {
match err {
PluginError::InvalidConfig(message) => PluginError::InvalidConfig(message.clone()),
PluginError::Conflict(message) => PluginError::Conflict(message.clone()),
PluginError::NotFound(message) => PluginError::NotFound(message.clone()),
PluginError::Serialization(err) => PluginError::Internal(err.to_string()),
PluginError::Internal(message) => PluginError::Internal(message.clone()),
Expand Down
Loading