Skip to content

Commit af34ce1

Browse files
toddbaerttoddbaert
committed
wip
1 parent 431ca45 commit af34ce1

13 files changed

Lines changed: 554 additions & 546 deletions

File tree

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "8.0.403"
4+
"version": "8.0.114"
55
}
66
}

‎src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System;
2-
using System.Numerics;
3-
using JsonLogic.Net;
42

53
namespace OpenFeature.Contrib.Providers.Flagd
64

‎src/OpenFeature.Contrib.Providers.Flagd/OpenFeature.Contrib.Providers.Flagd.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ItemGroup>
2323
<!-- The schema.proto file referenced here will be used to automatically generate the Grpc client when executing 'dotnet build' -->
2424
<!-- The generated files will be placed in ./obj/Debug/netstandard2.0/Protos -->
25-
<PackageReference Include="JsonLogic.Net" Version="1.1.11" />
25+
<PackageReference Include="JsonLogic" Version="5.4.0" />
2626
<PackageReference Include="murmurhash" Version="1.0.3" />
2727
<PackageReference Include="Semver" Version="2.3.0" />
2828
<Protobuf Include="schemas\protobuf\flagd\evaluation\v1\evaluation.proto" GrpcServices="Client" />

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/CustomEvaluators/FlagdProperties.cs‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
11
using System.Collections.Generic;
2+
using System.Text.Json;
3+
using System.Text.Json.Nodes;
4+
using Json.Logic;
5+
using Json.More;
26

37
namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess.CustomEvaluators
48
{
59
internal class FlagdProperties
610
{
711

812
internal const string FlagdPropertiesKey = "$flagd";
9-
internal const string FlagKeyKey = "flagKey";
13+
internal const string FlagKeyKey = "flagKey"; // TODO prefix
1014
internal const string TimestampKey = "timestamp";
1115
internal const string TargetingKeyKey = "targetingKey";
1216

1317
internal string FlagKey { get; set; }
1418
internal long Timestamp { get; set; }
1519
internal string TargetingKey { get; set; }
1620

17-
internal FlagdProperties(object from)
21+
internal FlagdProperties(EvaluationContext from)
1822
{
19-
//object value;
20-
if (from is IDictionary<string, object> dict)
21-
{
22-
if (dict.TryGetValue(TargetingKeyKey, out object targetingKeyValue)
23-
&& targetingKeyValue is string targetingKeyString)
23+
24+
if (from.TryFind(TargetingKeyKey, out JsonNode targetingKeyValue)
25+
&& targetingKeyValue.GetValueKind() == JsonValueKind.String)
26+
{
27+
TargetingKey = targetingKeyValue.ToString();
28+
}
29+
if (from.TryFind($"{FlagdPropertiesKey}.{FlagKeyKey}", out JsonNode flagKeyValue)
30+
&& flagKeyValue.GetValueKind() == JsonValueKind.String)
2431
{
25-
TargetingKey = targetingKeyString;
32+
FlagKey = flagKeyValue.ToString();
2633
}
27-
if (dict.TryGetValue(FlagdPropertiesKey, out object flagdPropertiesObj)
28-
&& flagdPropertiesObj is IDictionary<string, object> flagdProperties)
34+
if (from.TryFind($"{FlagdPropertiesKey}.{TimestampKey}", out JsonNode timestampValue)
35+
&& timestampValue.GetValueKind() == JsonValueKind.Number)
2936
{
30-
if (flagdProperties.TryGetValue(FlagKeyKey, out object flagKeyObj)
31-
&& flagKeyObj is string flagKey)
32-
{
33-
FlagKey = flagKey;
34-
}
35-
if (flagdProperties.TryGetValue(TimestampKey, out object timestampObj)
36-
&& timestampObj is long timestamp)
37-
{
38-
Timestamp = timestamp;
39-
}
37+
Timestamp = timestampValue.GetValue<long>();
4038
}
41-
}
4239
}
4340
}
4441
}

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/CustomEvaluators/FractionalEvaluator.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text;
5-
using JsonLogic.Net;
5+
using System.Text.Json;
6+
using System.Text.Json.Nodes;
7+
using Json.Logic;
68
using Murmur;
7-
using Newtonsoft.Json.Linq;
8-
using Semver;
99

1010
namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess.CustomEvaluators
1111
{
1212
/// <inheritdoc/>
13-
public class FractionalEvaluator
13+
public class FractionalEvaluator : IRule
1414
{
1515
internal FractionalEvaluator()
1616
{
@@ -22,27 +22,27 @@ class FractionalEvaluationDistribution
2222
public int weight;
2323
}
2424

25-
internal object Evaluate(IProcessJsonLogic p, JToken[] args, object data)
25+
public JsonNode Apply(JsonNode args, EvaluationContext context)
2626
{
2727
// check if we have at least two arguments:
2828
// 1. the property value
2929
// 2. the array containing the buckets
3030

31-
if (args.Length == 0)
31+
if (args.AsArray().Count == 0)
3232
{
3333
return null;
3434
}
3535

36-
var flagdProperties = new FlagdProperties(data);
36+
var flagdProperties = new FlagdProperties(context);
3737

3838
var bucketStartIndex = 0;
3939

40-
var arg0 = p.Apply(args[0], data);
40+
var arg0 = JsonLogic.Apply(args[0], context);
4141

4242
string propertyValue;
43-
if (arg0 is string stringValue)
43+
if (arg0.GetValueKind() == JsonValueKind.String)
4444
{
45-
propertyValue = stringValue;
45+
propertyValue = arg0.ToString();
4646
bucketStartIndex = 1;
4747
}
4848
else
@@ -53,16 +53,16 @@ internal object Evaluate(IProcessJsonLogic p, JToken[] args, object data)
5353
var distributions = new List<FractionalEvaluationDistribution>();
5454
var distributionSum = 0;
5555

56-
for (var i = bucketStartIndex; i < args.Length; i++)
56+
for (var i = bucketStartIndex; i < args.AsArray().Count; i++)
5757
{
58-
var bucket = p.Apply(args[i], data);
58+
var bucket = JsonLogic.Apply(args[i], context);
5959

60-
if (!bucket.IsEnumerable())
60+
if (!(bucket.GetValueKind() == JsonValueKind.Array))
6161
{
6262
continue;
6363
}
6464

65-
var bucketArr = bucket.MakeEnumerable().ToArray();
65+
var bucketArr = bucket.AsArray();
6666

6767
if (!bucketArr.Any())
6868
{
@@ -71,9 +71,9 @@ internal object Evaluate(IProcessJsonLogic p, JToken[] args, object data)
7171

7272
var weight = 1;
7373

74-
if (bucketArr.Length >= 2 && bucketArr.ElementAt(1).IsNumeric())
74+
if (bucketArr.Count >= 2 && bucketArr.ElementAt(1).GetValueKind() == JsonValueKind.Number)
7575
{
76-
weight = Convert.ToInt32(bucketArr.ElementAt(1));
76+
weight = bucketArr.ElementAt(1).GetValue<int>();
7777
}
7878

7979
distributions.Add(new FractionalEvaluationDistribution

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/CustomEvaluators/SemVerEvaluator.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using System;
2-
using JsonLogic.Net;
3-
using Newtonsoft.Json.Linq;
1+
using System.Text.Json.Nodes;
2+
using Json.Logic;
43
using Semver;
54

65
namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess.CustomEvaluators
76
{
87
/// <inheritdoc/>
9-
public class SemVerEvaluator
8+
public class SemVerEvaluator : IRule
109
{
1110
internal SemVerEvaluator()
1211
{
@@ -21,21 +20,22 @@ internal SemVerEvaluator()
2120
const string OperatorMatchMajor = "^";
2221
const string OperatorMatchMinor = "~";
2322

24-
internal object Evaluate(IProcessJsonLogic p, JToken[] args, object data)
23+
24+
public JsonNode Apply(JsonNode args, EvaluationContext context)
2525
{
2626
// check if we have at least 3 arguments
27-
if (args.Length < 3)
27+
if (args.AsArray().Count < 3)
2828
{
2929
return false;
3030
}
3131
// get the value from the provided evaluation context
32-
var versionString = p.Apply(args[0], data).ToString();
32+
var versionString = JsonLogic.Apply(args[0], context).ToString();
3333

3434
// get the operator
35-
var semVerOperator = p.Apply(args[1], data).ToString();
35+
var semVerOperator = JsonLogic.Apply(args[1], context).ToString();
3636

3737
// get the target version
38-
var targetVersionString = p.Apply(args[2], data).ToString();
38+
var targetVersionString = JsonLogic.Apply(args[2], context).ToString();
3939

4040
//convert to semantic versions
4141
if (!SemVersion.TryParse(versionString, SemVersionStyles.Strict, out var version) ||

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/CustomEvaluators/StringEvaluator.cs‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,56 @@
11
using System;
2-
using System.Runtime.InteropServices;
3-
using JsonLogic.Net;
4-
using Newtonsoft.Json.Linq;
5-
using OpenFeature.Error;
6-
using OpenFeature.Model;
2+
using System.Text.Json.Nodes;
3+
using Json.Logic;
74

85
namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess.CustomEvaluators
96
{
10-
internal class StringEvaluator
7+
internal class StartsWith : IRule
118
{
12-
internal StringEvaluator()
9+
internal StartsWith()
1310
{
1411
}
1512

16-
internal object StartsWith(IProcessJsonLogic p, JToken[] args, object data)
13+
public JsonNode Apply(JsonNode args, Json.Logic.EvaluationContext context)
1714
{
18-
if (!isValid(p, args, data, out string operandA, out string operandB))
15+
if (!StringEvaluator.isValid(args, context, out string operandA, out string operandB))
1916
{
2017
return false;
21-
};
18+
}
2219
return Convert.ToString(operandA).StartsWith(Convert.ToString(operandB));
2320
}
21+
}
22+
23+
internal class EndsWith : IRule
24+
{
25+
26+
internal EndsWith()
27+
{
28+
}
2429

25-
internal object EndsWith(IProcessJsonLogic p, JToken[] args, object data)
30+
public JsonNode Apply(JsonNode args, Json.Logic.EvaluationContext context)
2631
{
27-
if (!isValid(p, args, data, out string operandA, out string operandB))
32+
if (!StringEvaluator.isValid(args, context, out string operandA, out string operandB))
2833
{
2934
return false;
30-
};
35+
}
3136
return operandA.EndsWith(operandB);
3237
}
38+
}
3339

34-
private bool isValid(IProcessJsonLogic p, JToken[] args, object data, out string operandA, out string operandB)
40+
internal static class StringEvaluator
41+
{
42+
internal static bool isValid(JsonNode args, Json.Logic.EvaluationContext context, out string operandA, out string operandB)
3543
{
3644
// check if we have at least 2 arguments
3745
operandA = null;
3846
operandB = null;
3947

40-
if (args.Length < 2)
48+
if (args.AsArray().Count < 2)
4149
{
4250
return false;
4351
}
44-
operandA = p.Apply(args[0], data) as string;
45-
operandB = p.Apply(args[1], data) as string;
52+
operandA = JsonLogic.Apply(args[0], context)?.ToString();
53+
operandB = JsonLogic.Apply(args[1], context)?.ToString();
4654

4755
if (!(operandA is string) || !(operandB is string))
4856
{

0 commit comments

Comments
 (0)