feat: Force correct init for Provider

spotify · Jun 18, 2024 · 096a07b · 096a07b
1 parent eeda236
commit 096a07b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/Sources/ConfidenceProvider/ConfidenceFeatureProvider.swift b/Sources/ConfidenceProvider/ConfidenceFeatureProvider.swift
@@ -25,14 +25,25 @@ public class ConfidenceFeatureProvider: FeatureProvider {
     /**
     Creates the `Confidence` object to be used as init parameter for this Provider.
     */
-    public static func createConfidence(clientSecret: String) -> Confidence {
-        return Confidence.Builder.init(clientSecret: clientSecret)
+    public static func createConfidence(clientSecret: String) -> ConfidenceForOpenFeature {
+        return ConfidenceForOpenFeature.init(confidence: Confidence.Builder.init(clientSecret: clientSecret)
             .withRegion(region: .global)
             .withMetadata(metadata: ConfidenceMetadata.init(
                 name: providerId,
                 version: "0.2.1") // x-release-please-version
             )
-            .build()
+            .build())
+    }
+
+    /**
+    Proxy holder to ensure correct Confidence configuration passed into the Provider's init.
+    Do not instantiate directly.
+    */
+    public class ConfidenceForOpenFeature {
+        internal init(confidence: Confidence) {
+            self.confidence = confidence
+        }
+        let confidence: Confidence
     }
 
     /**
@@ -41,6 +52,14 @@ public class ConfidenceFeatureProvider: FeatureProvider {
     rather then be instantiated directly via `Confidence.init(...)` as you would if not using the OpenFeature integration.
     */
     public convenience init(
+        confidenceForOF: ConfidenceForOpenFeature,
+        initializationStrategy: InitializationStrategy = .fetchAndActivate
+    ) {
+        self.init(confidence: confidenceForOF.confidence, session: nil)
+    }
+
+    // Allows to pass a confidence object with injected configurations for testing
+    internal convenience init(
         confidence: Confidence,
         initializationStrategy: InitializationStrategy = .fetchAndActivate
     ) {

diff --git a/Tests/ConfidenceProviderTests/ConfidenceProviderTest.swift b/Tests/ConfidenceProviderTests/ConfidenceProviderTest.swift
@@ -1,10 +1,10 @@
 import Foundation
-import ConfidenceProvider
 import Combine
 import OpenFeature
 import XCTest
 
 @testable import Confidence
+@testable import ConfidenceProvider
 
 class ConfidenceProviderTest: XCTestCase {
     private var readyExpectation = XCTestExpectation(description: "Ready")
@@ -84,11 +84,11 @@ class ConfidenceProviderTest: XCTestCase {
 
         let confidenceForOpenFeature = ConfidenceFeatureProvider.createConfidence(clientSecret: "testSecret")
         let provider = ConfidenceFeatureProvider(
-            confidence: confidenceForOpenFeature,
+            confidenceForOF: confidenceForOpenFeature,
             initializationStrategy: .activateAndFetchAsync
         )
         XCTAssertEqual("SDK_ID_SWIFT_PROVIDER", provider.metadata.name)
-        let remoteClient = confidenceForOpenFeature.remoteFlagResolver as? RemoteConfidenceResolveClient
+        let remoteClient = confidenceForOpenFeature.confidence.remoteFlagResolver as? RemoteConfidenceResolveClient
         XCTAssertEqual("SDK_ID_SWIFT_PROVIDER", remoteClient?.metadata.name)
         XCTAssertNotEqual("", remoteClient?.metadata.version)
     }