Merge branch 'main' into feat/flipt-provider

open-feature · Apr 30, 2024 · c04e8a1 · c04e8a1
2 parents 8160721 + 6108d45
commit c04e8a1
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 27 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -5,5 +5,5 @@
   "src/OpenFeature.Contrib.Providers.Flagsmith": "0.1.6",
   "src/OpenFeature.Contrib.Providers.ConfigCat": "0.0.2",
   "src/OpenFeature.Contrib.Providers.FeatureManagement": "0.0.1",
-  "src/OpenFeature.Contrib.Providers.Statsig": "0.0.3"
+  "src/OpenFeature.Contrib.Providers.Statsig": "0.0.4"
 }
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -3,4 +3,4 @@
 #
 # Managed by Peribolos: https://github.com/open-feature/community/blob/main/config/open-feature/sdk-dotnet/workgroup.yaml
 #
-* @open-feature/sdk-dotnet-maintainers
+* @open-feature/sdk-dotnet-maintainers @open-feature/sdk-dotnet-approvers
diff --git a/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs b/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs
@@ -16,7 +16,7 @@ public sealed class FlagdProvider : FeatureProvider
     {
         const string ProviderName = "flagd Provider";
         private readonly FlagdConfig _config;
-        private ProviderStatus _status;
+        private ProviderStatus _status = ProviderStatus.NotReady;
         private readonly Metadata _providerMetadata = new Metadata(ProviderName);
 
         private readonly Resolver.Resolver _resolver;
@@ -118,11 +118,13 @@ public override Task Initialize(EvaluationContext context)
             {
                 await _resolver.Init();
                 _status = ProviderStatus.Ready;
-
             }).ContinueWith((t) =>
             {
-                _status = ProviderStatus.Error;
-                if (t.IsFaulted) throw t.Exception;
+                if (t.IsFaulted)
+                {
+                    _status = ProviderStatus.Error;
+                    throw t.Exception;
+                };
             });
         }
 

diff --git a/src/OpenFeature.Contrib.Providers.Flagsmith/OpenFeature.Contrib.Providers.Flagsmith.csproj b/src/OpenFeature.Contrib.Providers.Flagsmith/OpenFeature.Contrib.Providers.Flagsmith.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Flagsmith" Version="5.2.2" />
+    <PackageReference Include="Flagsmith" Version="5.3.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 

diff --git a/src/OpenFeature.Contrib.Providers.Statsig/CHANGELOG.md b/src/OpenFeature.Contrib.Providers.Statsig/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.0.4](https://github.com/open-feature/dotnet-sdk-contrib/compare/OpenFeature.Contrib.Providers.Statsig-v0.0.3...OpenFeature.Contrib.Providers.Statsig-v0.0.4) (2024-04-16)
+
+
+### 🐛 Bug Fixes
+
+* Fix Statsig nuget package name ([#172](https://github.com/open-feature/dotnet-sdk-contrib/issues/172)) ([3d089f5](https://github.com/open-feature/dotnet-sdk-contrib/commit/3d089f5c48478d7151fcf5964aa545471a0afe5c))
+* Use new Statsig Api to return default value when flag is not defined ([#177](https://github.com/open-feature/dotnet-sdk-contrib/issues/177)) ([5efc8a6](https://github.com/open-feature/dotnet-sdk-contrib/commit/5efc8a603d1ad9d8887d75e38f95d5168a2319fa))
+
 ## [0.0.3](https://github.com/open-feature/dotnet-sdk-contrib/compare/OpenFeature.Contrib.Providers.Statsig-v0.0.2...OpenFeature.Contrib.Providers.Statsig-v0.0.3) (2024-04-03)
 
 

diff --git a/src/OpenFeature.Contrib.Providers.Statsig/OpenFeature.Contrib.Providers.Statsig.csproj b/src/OpenFeature.Contrib.Providers.Statsig/OpenFeature.Contrib.Providers.Statsig.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<PackageId>OpenFeature.Contrib.Providers.Statsig</PackageId>
-		<VersionNumber>0.0.3</VersionNumber><!--x-release-please-version -->
+		<VersionNumber>0.0.4</VersionNumber><!--x-release-please-version -->
 		<VersionPrefix>$(VersionNumber)</VersionPrefix>
 		<VersionSuffix>preview</VersionSuffix>
 		<AssemblyVersion>$(VersionNumber)</AssemblyVersion>

diff --git a/src/OpenFeature.Contrib.Providers.Statsig/README.md b/src/OpenFeature.Contrib.Providers.Statsig/README.md
@@ -94,6 +94,3 @@ The following parameters are mapped to the corresponding Statsig pre-defined par
 
 ## Known issues and limitations
 - Only `ResolveBooleanValue` implemented for now
-
-- Gate BooleanEvaluation with default value true cannot fallback to true.
-  https://github.com/statsig-io/dotnet-sdk/issues/33
diff --git a/src/OpenFeature.Contrib.Providers.Statsig/StatsigProvider.cs b/src/OpenFeature.Contrib.Providers.Statsig/StatsigProvider.cs
@@ -1,8 +1,8 @@
 using OpenFeature.Constant;
-using OpenFeature.Error;
 using OpenFeature.Model;
 using Statsig;
 using Statsig.Server;
+using Statsig.Server.Evaluation;
 using System;
 using System.Threading.Tasks;
 
@@ -46,13 +46,34 @@ public StatsigProvider(string sdkKey = null, StatsigServerOptions statsigServerO
         /// <inheritdoc/>
         public override Task<ResolutionDetails<bool>> ResolveBooleanValue(string flagKey, bool defaultValue, EvaluationContext context = null)
         {
-            //TODO: defaultvalue = true not yet supported due to https://github.com/statsig-io/dotnet-sdk/issues/33
-            if (defaultValue == true)
-                throw new FeatureProviderException(ErrorType.General, "defaultvalue = true not supported (https://github.com/statsig-io/dotnet-sdk/issues/33)");
-            if (GetStatus() != ProviderStatus.Ready)
-                return Task.FromResult(new ResolutionDetails<bool>(flagKey, defaultValue, ErrorType.ProviderNotReady));
-            var result = ServerDriver.CheckGateSync(context.AsStatsigUser(), flagKey);
-            return Task.FromResult(new ResolutionDetails<bool>(flagKey, result));
+            var result = ServerDriver.GetFeatureGate(context.AsStatsigUser(), flagKey);
+            var gateFound = false;
+            var responseType = ErrorType.None;
+
+            switch (result.Reason)
+            {
+                case EvaluationReason.Network:
+                case EvaluationReason.LocalOverride:
+                case EvaluationReason.Bootstrap:
+                case EvaluationReason.DataAdapter:
+                    gateFound = true;
+                    break;
+                case EvaluationReason.Unrecognized:
+                    responseType = ErrorType.FlagNotFound;
+                    break;
+                case EvaluationReason.Uninitialized:
+                    responseType = ErrorType.ProviderNotReady;
+                    break;
+                case EvaluationReason.Unsupported:
+                    responseType = ErrorType.InvalidContext;
+                    break;
+                case EvaluationReason.Error:
+                    responseType = ErrorType.General;
+                    break;
+                case null:
+                    break;
+            }
+            return Task.FromResult(new ResolutionDetails<bool>(flagKey, gateFound ? result.Value : defaultValue, responseType));
         }
 
         /// <inheritdoc/>

diff --git a/src/OpenFeature.Contrib.Providers.Statsig/version.txt b/src/OpenFeature.Contrib.Providers.Statsig/version.txt
@@ -1 +1 @@
-0.0.3
+0.0.4
diff --git a/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs b/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs
@@ -5,6 +5,7 @@
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using NSubstitute;
+using NSubstitute.ExceptionExtensions;
 using NSubstitute.ReceivedExtensions;
 using OpenFeature.Constant;
 using OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess;
@@ -525,6 +526,28 @@ public async Task TestCacheAsync()
             mockGrpcClient.Received(Quantity.AtLeastOne()).EventStream(Arg.Any<EventStreamRequest>(), null, null, CancellationToken.None);
         }
 
+        [Fact]
+        public async Task TestResolverInit_Success_Ready()
+        {
+            var mockResolver = Substitute.For<Resolver.Resolver>();
+            mockResolver.Init().Returns(Task.CompletedTask);
+            var provider = new FlagdProvider(resolver: mockResolver);
+            await provider.Initialize(EvaluationContext.Empty);
+
+            Assert.Equal(ProviderStatus.Ready, provider.GetStatus());
+        }
+
+        [Fact]
+        public async Task TestResolverInit_Failure_Error()
+        {
+            var mockResolver = Substitute.For<Resolver.Resolver>();
+            mockResolver.Init().ThrowsAsync(new Exception("fake exception"));
+            var provider = new FlagdProvider(resolver: mockResolver);
+            await Assert.ThrowsAsync<AggregateException>(() => provider.Initialize(EvaluationContext.Empty));
+
+            Assert.Equal(ProviderStatus.Error, provider.GetStatus());
+        }
+
         [Fact]
         public async Task TestCacheHitAsync()
         {

diff --git a/test/OpenFeature.Contrib.Providers.Flagsmith.Test/FlagsmithProviderTest.cs b/test/OpenFeature.Contrib.Providers.Flagsmith.Test/FlagsmithProviderTest.cs
@@ -17,7 +17,7 @@ public class UnitTestFlagsmithProvider
         private static FlagsmithConfiguration GetDefaultFlagsmithConfiguration() => new()
         {
             ApiUrl = "https://edge.api.flagsmith.com/api/v1/",
-            EnvironmentKey = string.Empty,
+            EnvironmentKey = "some-key",
             EnableClientSideEvaluation = false,
             EnvironmentRefreshIntervalSeconds = 60,
             EnableAnalytics = false,

diff --git a/test/OpenFeature.Contrib.Providers.Statsig.Test/StatsigProviderTest.cs b/test/OpenFeature.Contrib.Providers.Statsig.Test/StatsigProviderTest.cs
@@ -1,6 +1,5 @@
 using AutoFixture.Xunit2;
 using OpenFeature.Constant;
-using OpenFeature.Error;
 using OpenFeature.Model;
 using System.Threading.Tasks;
 using Xunit;
@@ -41,25 +40,32 @@ public async Task GetBooleanValue_ForFeatureWithContext(bool flagValue, bool exp
     [Theory]
     [InlineAutoData(true, false)]
     [InlineAutoData(false, false)]
-    public async Task GetBooleanValue_ForFeatureWithNoContext_ReturnsFalse(bool flagValue, bool expectedValue, string flagName)
+    public async Task GetBooleanValue_ForFeatureWithNoContext_ReturnsDefaultValue(bool flagValue, bool defaultValue, string flagName)
     {
         // Arrange
         await statsigProvider.Initialize(null);
         statsigProvider.ServerDriver.OverrideGate(flagName, flagValue);
 
         // Act & Assert
-        Assert.Equal(expectedValue, statsigProvider.ResolveBooleanValue(flagName, false).Result.Value);
+        Assert.Equal(defaultValue, statsigProvider.ResolveBooleanValue(flagName, defaultValue).Result.Value);
     }
 
     [Theory]
     [AutoData]
-    public async Task GetBooleanValue_ForFeatureWithDefaultTrue_ThrowsException(string flagName)
+    [InlineAutoData(false)]
+    [InlineAutoData(true)]
+    public async Task GetBooleanValue_ForFeatureWithDefault(bool defaultValue, string flagName, string userId)
     {
         // Arrange
         await statsigProvider.Initialize(null);
 
-        // Act & Assert
-        Assert.ThrowsAny<FeatureProviderException>(() => statsigProvider.ResolveBooleanValue(flagName, true).Result.Value);
+        var ec = EvaluationContext.Builder().SetTargetingKey(userId).Build();
+
+        // Act
+        var result = await statsigProvider.ResolveBooleanValue(flagName, defaultValue, ec);
+
+        //Assert
+        Assert.Equal(defaultValue, result.Value);
     }
 
     [Fact]