Skip to content
Closed
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
25 changes: 23 additions & 2 deletions libdd-ffe-ffi/src/assignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ impl From<&ResolutionDetails> for Reason {
Ok(assignment) => assignment.reason.into(),
Err(EvaluationError::FlagDisabled) => Reason::Disabled,
Err(EvaluationError::DefaultAllocationNull) => Reason::Default,
Err(EvaluationError::FlagConfigurationInvalid) => Reason::Default,
Err(EvaluationError::FlagConfigurationInvalid) => Reason::Error,
Err(_) => Reason::Error,
}
}
Expand Down Expand Up @@ -409,7 +409,7 @@ impl From<&EvaluationError> for ErrorCode {
EvaluationError::TypeMismatch { .. } => ErrorCode::TypeMismatch,
EvaluationError::TargetingKeyMissing => ErrorCode::TargetingKeyMissing,
EvaluationError::ConfigurationParseError => ErrorCode::ParseError,
EvaluationError::FlagConfigurationInvalid => ErrorCode::Ok,
EvaluationError::FlagConfigurationInvalid => ErrorCode::ParseError,
EvaluationError::ConfigurationMissing => ErrorCode::ProviderNotReady,
EvaluationError::FlagUnrecognizedOrDisabled => ErrorCode::FlagNotFound,
EvaluationError::FlagDisabled => ErrorCode::Ok,
Expand Down Expand Up @@ -486,3 +486,24 @@ pub unsafe extern "C" fn ddog_ffe_assignment_drop(assignment: *mut Handle<Resolu
// SAFETY: the caller must ensure that assignment is valid
unsafe { Handle::free(assignment) }
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn invalid_flag_configuration_reports_parse_error() {
let details = ResolutionDetails::from(EvaluationError::FlagConfigurationInvalid);

assert!(matches!(Reason::from(&details), Reason::Error));
assert_eq!(ErrorCode::from(&details), ErrorCode::ParseError);
}

#[test]
fn unrecognized_flag_remains_flag_not_found() {
let details = ResolutionDetails::from(EvaluationError::FlagUnrecognizedOrDisabled);

assert!(matches!(Reason::from(&details), Reason::Error));
assert_eq!(ErrorCode::from(&details), ErrorCode::FlagNotFound);
}
}
9 changes: 3 additions & 6 deletions libdd-ffe-test-suite/tests/canonical_fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,15 @@ fn reason_from_assignment(reason: AssignmentReason) -> &'static str {
fn reason_from_error(err: &EvaluationError) -> &'static str {
match err {
EvaluationError::FlagDisabled => "DISABLED",
EvaluationError::DefaultAllocationNull | EvaluationError::FlagConfigurationInvalid => {
"DEFAULT"
}
EvaluationError::DefaultAllocationNull => "DEFAULT",
_ => "ERROR",
}
}

fn error_code_from_error(err: &EvaluationError) -> Option<&'static str> {
match err {
EvaluationError::FlagDisabled
| EvaluationError::DefaultAllocationNull
| EvaluationError::FlagConfigurationInvalid => None,
EvaluationError::FlagDisabled | EvaluationError::DefaultAllocationNull => None,
EvaluationError::FlagConfigurationInvalid => Some("PARSE_ERROR"),
EvaluationError::TypeMismatch { .. } => Some("TYPE_MISMATCH"),
EvaluationError::TargetingKeyMissing => Some("TARGETING_KEY_MISSING"),
EvaluationError::ConfigurationParseError => Some("PARSE_ERROR"),
Expand Down
11 changes: 10 additions & 1 deletion libdd-ffe/src/rules_based/eval/eval_rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl ConditionCheck {
} => {
let attr_str = attribute?.as_str()?;
let attr_version = semver::Version::parse(attr_str.as_ref()).ok()?;
let ordering = attr_version.cmp(comparand);
let ordering = attr_version.cmp_precedence(comparand);
match operator {
SemverComparisonOperator::Eq => ordering.is_eq(),
SemverComparisonOperator::Neq => !ordering.is_eq(),
Expand Down Expand Up @@ -386,6 +386,15 @@ mod tests {
assert!(!check.eval(Some(&"1.0.0".into())));
}

#[test]
fn semver_build_metadata_does_not_affect_precedence() {
let check = ConditionCheck::SemverComparison {
operator: SemverComparisonOperator::Eq,
comparand: semver("1.0.0"),
};
assert!(check.eval(Some(&"1.0.0+build.42".into())));
}

#[test]
fn semver_invalid_attribute_returns_false() {
let check = ConditionCheck::SemverComparison {
Expand Down
Loading