Merge pull request #10 from rollout/CBP-11526

migrate to OpenFeature 1.6+ and enable lifecycle support in CloudBees Provider

Author: ankurv02

src/CloudBees.OpenFeature.Provider/CloudBees.OpenFeature.Provider.csproj

@@ -5,8 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenFeature" Version="[1.0.1, 2.0.0)" />
-    <PackageReference Include="rox-server" Version="5.1.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
+    <PackageReference Include="OpenFeature" Version="[1.6.0, 2.0.0)" />
+    <PackageReference Include="rox-server" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

src/CloudBees.OpenFeature.Provider/CloudBeesProvider.cs

@@ -5,24 +5,36 @@
 using Io.Rollout.Rox.Core.Context;
 using Io.Rollout.Rox.Server;
 using OpenFeature;
+using OpenFeature.Constant;
 using OpenFeature.Model;
 
 namespace CloudBees.OpenFeature.Provider
 {
     public class CloudBeesProvider : FeatureProvider
     {
         private readonly Metadata _metadata = new Metadata("CloudBees Provider");
+        private ProviderStatus _status = ProviderStatus.NotReady;
+        private string _appKey;
 
-        /// <summary>
-        /// Call this once before using the provider.
-        /// </summary>
-        /// <param name="appKey">The application key from app.rollout.io</param>
-        public static async Task Setup(string appKey) => await Rox.Setup(appKey);
+        public CloudBeesProvider(string appKey)
+        {
+            _appKey = appKey ?? throw new ArgumentNullException(nameof(appKey));
+        }
+
+        public override async Task Initialize(EvaluationContext context)
+        {
+            var options = new RoxOptions(new RoxOptions.RoxOptionsBuilder());
+            await Rox.Setup(_appKey, options);
+            _status = Rox.State == RoxState.Corrupted ? ProviderStatus.Error : ProviderStatus.Ready;
+        }
+
+        public override async Task Shutdown()
+        {
+            await Rox.Shutdown();
+            _status = ProviderStatus.NotReady;
+        }
 
-        /// <summary>
-        /// Call this once when shutting down the application.
-        /// </summary>
-        public static async Task Shutdown() => await Rox.Shutdown();
+        public override ProviderStatus GetStatus() => _status;
 
         public override Metadata GetMetadata() => _metadata;
 
@@ -62,4 +74,4 @@ private static IContext TransformContext(EvaluationContext context)
                 : context.AsDictionary().ToDictionary(x => x.Key, x => x.Value.AsObject));
         }
     }
-}
+}

src/CloudBees.OpenFeature.Provider/ServiceCollectionExtensions.cs

@@ -1,8 +1,9 @@
 using System;
 using CloudBees.OpenFeature.Provider;
 using OpenFeature;
+using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
 
-// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
@@ -17,9 +18,15 @@ public static void AddOpenFeatureCloudBees(this IServiceCollection services, Act
                 throw new ApplicationException("Missing CloudBees API Key");
             }
 
-            CloudBeesProvider.Setup(cloudBeesOptions.ApiKey).Wait();
-            Api.Instance.SetProvider(new CloudBeesProvider());
-            services.AddSingleton(provider => Api.Instance.GetClient());
+            var provider = new CloudBeesProvider(cloudBeesOptions.ApiKey);
+
+            // Set the provider using async lifecycle call
+            Task.Run(async () =>
+            {
+                await Api.Instance.SetProviderAsync(provider);
+            }).GetAwaiter().GetResult();
+
+            services.AddSingleton(_ => Api.Instance.GetClient());
         }
     }
-}
+}