Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
71 changes: 41 additions & 30 deletions src/OpenFeature/Providers/Memory/Flag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,41 +36,52 @@ public Flag(Dictionary<string, T> variants, string defaultVariant, Func<Evaluati

internal ResolutionDetails<T> Evaluate(string flagKey, T _, EvaluationContext? evaluationContext)
{
T? value;
if (this._contextEvaluator == null)
{
if (this._variants.TryGetValue(this._defaultVariant, out value))
{
return new ResolutionDetails<T>(
flagKey,
value,
variant: this._defaultVariant,
reason: Reason.Static,
flagMetadata: this._flagMetadata
);
}
else
{
throw new GeneralException($"variant {this._defaultVariant} not found");
}
return this.EvaluateDefaultVariant(flagKey);
}

string variant;
try
{
variant = this._contextEvaluator.Invoke(evaluationContext ?? EvaluationContext.Empty);
}
catch (Exception)
{
return this.EvaluateDefaultVariant(flagKey, Reason.Default);
}

if (!this._variants.TryGetValue(variant, out var value))
{
return this.EvaluateDefaultVariant(flagKey, Reason.Default);
}
else
{
return new ResolutionDetails<T>(
flagKey,
value,
variant: variant,
reason: Reason.TargetingMatch,
flagMetadata: this._flagMetadata
);
}
Comment thread
kylejuliandev marked this conversation as resolved.
Outdated
Comment thread
kylejuliandev marked this conversation as resolved.
Outdated
}

private ResolutionDetails<T> EvaluateDefaultVariant(string flagKey, string reason = Reason.Static)
{
if (this._variants.TryGetValue(this._defaultVariant, out var value))
{
return new ResolutionDetails<T>(
flagKey,
value,
variant: this._defaultVariant,
reason: reason,
flagMetadata: this._flagMetadata
);
}
else
{
var variant = this._contextEvaluator.Invoke(evaluationContext ?? EvaluationContext.Empty);
if (!this._variants.TryGetValue(variant, out value))
{
throw new GeneralException($"variant {variant} not found");
}
else
{
return new ResolutionDetails<T>(
flagKey,
value,
variant: variant,
reason: Reason.TargetingMatch,
flagMetadata: this._flagMetadata
);
}
throw new GeneralException($"variant {this._defaultVariant} not found");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,18 @@ public InMemoryProviderTests()
return "missing";
}
)
},
{
"evaluator-throws-flag", new Flag<bool>(
variants: new Dictionary<string, bool>(){
{ "on", true },
{ "off", false }
},
defaultVariant: "on",
(context) => {
throw new Exception("Cannot evaluate flag at the moment.");
}
)
}
});

Expand Down Expand Up @@ -198,9 +210,25 @@ public async Task MissingDefaultVariant_ShouldThrow()
}

[Fact]
public async Task MissingEvaluatedVariant_ShouldThrow()
public async Task MissingEvaluatedVariant_ReturnsDefaultVariant()
{
await Assert.ThrowsAsync<GeneralException>(() => this.commonProvider.ResolveBooleanValueAsync("invalid-evaluator-flag", false, EvaluationContext.Empty));
// Act
var result = await this.commonProvider.ResolveBooleanValueAsync("invalid-evaluator-flag", false, EvaluationContext.Empty);

// Assert
Assert.True(result.Value);
Assert.Equal(Reason.Default, result.Reason);
Comment thread
kylejuliandev marked this conversation as resolved.
}

[Fact]
public async Task ContextEvaluatorThrows_ReturnsDefaultVariant()
{
// Act
var result = await this.commonProvider.ResolveBooleanValueAsync("evaluator-throws-flag", false, EvaluationContext.Empty);

// Assert
Assert.True(result.Value);
Assert.Equal(Reason.Default, result.Reason);
Comment thread
kylejuliandev marked this conversation as resolved.
}

[Fact]
Expand Down