Skip to content

Added null defaultVariant handling #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-olko merged 4 commits into from
Mar 11, 2026
Merged

Added null defaultVariant handling #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a3861
Added null defaultVariant handling
m-olko Mar 6, 2026
aa7a30a
Fixed bug and linter errors
m-olko Mar 6, 2026
edb5de5
Fixed linter and improved tests
m-olko Mar 6, 2026
87fe025
Merge branch 'main' into null_defaultvariant
m-olko Mar 9, 2026
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
8 changes: 3 additions & 5 deletions providers/flagd/src/evaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,10 @@ JsonLogicEvaluator::ResolveAny(std::string_view flag_key, T default_value,
variant_name = std::move(*variant);
reason = openfeature::Reason::kTargetingMatch;
} else {
if (!flag_config.contains("defaultVariant")) {
if (flag_config.value("defaultVariant", nlohmann::json()).is_null()) {
return std::make_unique<openfeature::ResolutionDetails<T>>(
std::move(default_value), openfeature::Reason::kError, "",
flag_metadata, openfeature::ErrorCode::kFlagNotFound,
absl::StrCat("flag: ", flag_key,
" doesn't have defaultVariant defined."));
std::move(default_value), openfeature::Reason::kDefault, "",
flag_metadata, std::nullopt, std::nullopt);
}

variant_name = flag_config["defaultVariant"];
Expand Down
71 changes: 55 additions & 16 deletions providers/flagd/tests/evaluator_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class EvaluatorTest : public ::testing::Test {
std::unique_ptr<flagd::JsonLogicEvaluator> evaluator_;
};

TEST_F(EvaluatorTest, ResolveBoolean_Success) {
TEST_F(EvaluatorTest, ResolveBooleanSuccess) {
nlohmann::json flags = {{"flags",
{{"my-bool-flag",
{{"state", "ENABLED"},
Expand All @@ -52,7 +52,7 @@ TEST_F(EvaluatorTest, ResolveBoolean_Success) {
EXPECT_FALSE(result->GetErrorCode().has_value());
}

TEST_F(EvaluatorTest, ResolveBoolean_FlagNotFound) {
TEST_F(EvaluatorTest, ResolveBooleanFlagNotFound) {
nlohmann::json flags = {{"flags", nlohmann::json::object()}};
sync_->TriggerUpdate(flags);

Expand All @@ -66,7 +66,7 @@ TEST_F(EvaluatorTest, ResolveBoolean_FlagNotFound) {
EXPECT_EQ(result->GetErrorCode(), openfeature::ErrorCode::kFlagNotFound);
}

TEST_F(EvaluatorTest, ResolveBoolean_TypeMismatch) {
TEST_F(EvaluatorTest, ResolveBooleanTypeMismatch) {
nlohmann::json flags = {
{"flags",
{{"my-string-flag",
Expand All @@ -86,7 +86,7 @@ TEST_F(EvaluatorTest, ResolveBoolean_TypeMismatch) {
EXPECT_EQ(result->GetErrorCode(), openfeature::ErrorCode::kTypeMismatch);
}

TEST_F(EvaluatorTest, ResolveBoolean_Metadata) {
TEST_F(EvaluatorTest, ResolveBooleanMetadata) {
nlohmann::json flags = {
{"metadata",
{{"global-key", "global-value"}, {"override-key", "global-override"}}},
Expand Down Expand Up @@ -116,7 +116,7 @@ TEST_F(EvaluatorTest, ResolveBoolean_Metadata) {
"flag-override");
}

TEST_F(EvaluatorTest, ResolveBoolean_VariantNotFound) {
TEST_F(EvaluatorTest, ResolveBooleanVariantNotFound) {
nlohmann::json flags = {{"flags",
{{"my-broken-flag",
{{"state", "ENABLED"},
Expand All @@ -138,7 +138,7 @@ TEST_F(EvaluatorTest, ResolveBoolean_VariantNotFound) {
"missing-variant.");
}

TEST_F(EvaluatorTest, ResolveString_Success) {
TEST_F(EvaluatorTest, ResolveStringSuccess) {
nlohmann::json flags = {
{"flags",
{{"my-string-flag",
Expand All @@ -158,7 +158,7 @@ TEST_F(EvaluatorTest, ResolveString_Success) {
EXPECT_EQ(result->GetVariant(), "v1");
}

TEST_F(EvaluatorTest, ResolveInteger_Success) {
TEST_F(EvaluatorTest, ResolveIntegerSuccess) {
nlohmann::json flags = {{"flags",
{{"my-int-flag",
{{"state", "ENABLED"},
Expand All @@ -177,11 +177,13 @@ TEST_F(EvaluatorTest, ResolveInteger_Success) {
EXPECT_EQ(result->GetVariant(), "two");
}

TEST_F(EvaluatorTest, ResolveDouble_Success) {
TEST_F(EvaluatorTest, ResolveDoubleSuccess) {
const double double1 = 1.1;
const double double2 = 2.2;
nlohmann::json flags = {{"flags",
{{"my-double-flag",
{{"state", "ENABLED"},
{"variants", {{"d1", 1.1}, {"d2", 2.2}}},
{"variants", {{"d1", double1}, {"d2", double2}}},
{"defaultVariant", "d1"}}}}}};

sync_->TriggerUpdate(flags);
Expand All @@ -191,17 +193,18 @@ TEST_F(EvaluatorTest, ResolveDouble_Success) {
std::unique_ptr<openfeature::DoubleResolutionDetails> result =
evaluator_->ResolveDouble("my-double-flag", 0.0, ctx);

EXPECT_DOUBLE_EQ(result->GetValue(), 1.1);
EXPECT_DOUBLE_EQ(result->GetValue(), double1);
EXPECT_EQ(result->GetReason(), openfeature::Reason::kStatic);
EXPECT_EQ(result->GetVariant(), "d1");
}

TEST_F(EvaluatorTest, ResolveObject_Success) {
TEST_F(EvaluatorTest, ResolveObjectSuccess) {
const int baz = 123;
nlohmann::json flags = {{"flags",
{{"my-object-flag",
{{"state", "ENABLED"},
{"variants",
{{"obj1", {{"foo", "bar"}, {"baz", 123}}},
{{"obj1", {{"foo", "bar"}, {"baz", baz}}},
{"obj2", {{"key", true}}}}},
{"defaultVariant", "obj1"}}}}}};

Expand All @@ -225,10 +228,10 @@ TEST_F(EvaluatorTest, ResolveObject_Success) {

EXPECT_TRUE(structure->at("foo").IsString());
EXPECT_EQ(structure->at("foo").AsString().value(), "bar");
EXPECT_EQ(structure->at("baz").AsInt().value(), 123);
EXPECT_EQ(structure->at("baz").AsInt().value(), baz);
}

TEST_F(EvaluatorTest, ResolveString_TypeMismatch) {
TEST_F(EvaluatorTest, ResolveStringTypeMismatch) {
nlohmann::json flags = {{"flags",
{{"my-int-flag",
{{"state", "ENABLED"},
Expand All @@ -247,7 +250,7 @@ TEST_F(EvaluatorTest, ResolveString_TypeMismatch) {
EXPECT_EQ(result->GetErrorCode(), openfeature::ErrorCode::kTypeMismatch);
}

TEST_F(EvaluatorTest, ResolveInteger_TypeMismatch) {
TEST_F(EvaluatorTest, ResolveIntegerTypeMismatch) {
nlohmann::json flags = {{"flags",
{{"my-string-flag",
{{"state", "ENABLED"},
Expand All @@ -266,7 +269,7 @@ TEST_F(EvaluatorTest, ResolveInteger_TypeMismatch) {
EXPECT_EQ(result->GetErrorCode(), openfeature::ErrorCode::kTypeMismatch);
}

TEST_F(EvaluatorTest, ResolveDouble_TypeMismatch) {
TEST_F(EvaluatorTest, ResolveDoubleTypeMismatch) {
nlohmann::json flags = {{"flags",
{{"my-string-flag",
{{"state", "ENABLED"},
Expand All @@ -284,3 +287,39 @@ TEST_F(EvaluatorTest, ResolveDouble_TypeMismatch) {
EXPECT_EQ(result->GetReason(), openfeature::Reason::kError);
EXPECT_EQ(result->GetErrorCode(), openfeature::ErrorCode::kTypeMismatch);
}

class EvaluatorDefaultVariantTest
: public EvaluatorTest,
public ::testing::WithParamInterface<nlohmann::json> {};

TEST_P(EvaluatorDefaultVariantTest, ResolveBooleanReturnsDefault) {
nlohmann::json flags = {{"flags", GetParam()}};
sync_->TriggerUpdate(flags);

openfeature::EvaluationContext ctx =
openfeature::EvaluationContext::Builder().build();
std::unique_ptr<openfeature::BoolResolutionDetails> result =
evaluator_->ResolveBoolean("my-bool-flag", false, ctx);

EXPECT_EQ(result->GetValue(), false);
EXPECT_EQ(result->GetReason(), openfeature::Reason::kDefault);
EXPECT_FALSE(result->GetErrorCode().has_value());
}

INSTANTIATE_TEST_SUITE_P(
DefaultVariantHandling, EvaluatorDefaultVariantTest,
::testing::Values(
// Missing default variant
nlohmann::json{{"my-bool-flag",
{{"state", "ENABLED"},
{"variants", {{"on", true}, {"off", false}}}}}},
// Null default variant
nlohmann::json{{"my-bool-flag",
{{"state", "ENABLED"},
{"variants", {{"on", true}, {"off", false}}},
{"defaultVariant", nullptr}}}},
// Targeting returns null, missing default variant
nlohmann::json{{"my-bool-flag",
{{"state", "ENABLED"},
{"variants", {{"on", true}, {"off", false}}},
{"targeting", {{"if", {{false}, "on", nullptr}}}}}}}));