Revert WithDefaultFlagHandler

Author: rolodato

client.go

@@ -56,7 +56,7 @@ type Client struct {
 //	flagsmithClient := flagsmith.NewClient(
 //		os.Getenv("FLAGSMITH_SDK_KEY"),
 //		flagsmith.WithLocalEvaluation(context.Background()),
-//		flagsmith.WithDefaultFlagHandler(GetDefaultFlag),
+//		flagsmith.WithDefaultHandler(GetDefaultFlag),
 //	)
 func NewClient(apiKey string, options ...Option) *Client {
 	c := &Client{
@@ -119,7 +119,7 @@ func NewClient(apiKey string, options ...Option) *Client {
 // GetFlags evaluates the feature flags within an [EvaluationContext].
 //
 // When flag evaluation fails, the return value is determined by the default flag handler from
-// [WithDefaultFlagHandler], if one was provided.
+// [WithDefaultHandler], if one was provided.
 //
 // Flags are evaluated remotely by the Flagsmith API by default.
 // To evaluate flags locally, instantiate a client using [WithLocalEvaluation].

client_test.go

@@ -79,7 +79,7 @@ func TestClientErrorsIfDefaultHandlerAndOfflineHandlerAreBothSet(t *testing.T) {
 	// Trigger panic
 	_ = flagsmith.NewClient("key",
 		flagsmith.WithOfflineHandler(offlineHandler),
-		flagsmith.WithDefaultFlagHandler(func(featureName string) (flagsmith.Flag, error) {
+		flagsmith.WithDefaultHandler(func(featureName string) (flagsmith.Flag, error) {
 			return flagsmith.Flag{}, nil
 		}))
 }
@@ -343,7 +343,7 @@ func TestGetEnvironmentFlagsCallsAPIWhenLocalEnvironmentNotAvailable(t *testing.
 
 	// When
 	client := flagsmith.NewClient(fixtures.EnvironmentAPIKey, flagsmith.WithBaseURL(server.URL+"/api/v1/"),
-		flagsmith.WithDefaultFlagHandler(func(featureName string) (flagsmith.Flag, error) {
+		flagsmith.WithDefaultHandler(func(featureName string) (flagsmith.Flag, error) {
 			return flagsmith.Flag{}, nil
 		}))
 
@@ -501,7 +501,7 @@ func TestDefaultHandlerIsUsedWhenNoMatchingEnvironmentFlagReturned(t *testing.T)
 
 	// When
 	client := flagsmith.NewClient(fixtures.EnvironmentAPIKey, flagsmith.WithBaseURL(server.URL+"/api/v1/"),
-		flagsmith.WithDefaultFlagHandler(func(featureName string) (flagsmith.Flag, error) {
+		flagsmith.WithDefaultHandler(func(featureName string) (flagsmith.Flag, error) {
 			return flagsmith.Flag{}, nil
 		}))
 
@@ -534,7 +534,7 @@ func TestDefaultHandlerIsUsedWhenTimeout(t *testing.T) {
 	// When
 	client := flagsmith.NewClient(fixtures.EnvironmentAPIKey, flagsmith.WithBaseURL(server.URL+"/api/v1/"),
 		flagsmith.WithRequestTimeout(10*time.Millisecond),
-		flagsmith.WithDefaultFlagHandler(func(featureName string) (flagsmith.Flag, error) {
+		flagsmith.WithDefaultHandler(func(featureName string) (flagsmith.Flag, error) {
 			return flagsmith.Flag{}, nil
 		}))
 
@@ -556,7 +556,7 @@ func TestDefaultHandlerIsUsedWhenRequestFails(t *testing.T) {
 
 	// When
 	client := flagsmith.NewClient(fixtures.EnvironmentAPIKey, flagsmith.WithBaseURL(server.URL+"/api/v1/"),
-		flagsmith.WithDefaultFlagHandler(func(featureName string) (flagsmith.Flag, error) {
+		flagsmith.WithDefaultHandler(func(featureName string) (flagsmith.Flag, error) {
 			return flagsmith.Flag{}, nil
 		}))
 

options.go

@@ -76,16 +76,6 @@ func WithCustomHeaders(headers map[string]string) Option {
 }
 
 // WithDefaultHandler sets a handler function used to return fallback values when [Client.GetFlags] would have normally
-// returned an error.
-//
-// Deprecated: Use WithDefaultFlagHandler instead.
-func WithDefaultHandler(handler func(string) (Flag, error)) Option {
-	return func(c *Client) {
-		c.defaultFlagHandler = handler
-	}
-}
-
-// WithDefaultFlagHandler sets a handler function used to return fallback values when [Client.GetFlags] would have normally
 // returned an error. For example, this handler makes all flags be disabled by default:
 //
 //	func handler(flagKey string) (Flag, error) {
@@ -94,20 +84,16 @@ func WithDefaultHandler(handler func(string) (Flag, error)) Option {
 //			Enabled: false,
 //		}, nil
 //	}
-func WithDefaultFlagHandler(handler func(string) (Flag, error)) Option {
-	f := func(flagKey string) (Flag, error) {
-		defaultFlag, err := handler(flagKey)
-		if err != nil {
-			return Flag{}, err
-		}
-		return Flag{
-			IsDefault:   true,
-			FeatureName: flagKey,
-			Enabled:     defaultFlag.Enabled,
-			Value:       defaultFlag.Value,
-		}, nil
-	}
-	return WithDefaultHandler(f)
+func WithDefaultHandler(handler func(string) (Flag, error)) Option {
+	f := func(flagKey string) (flag Flag, err error) {
+		flag, err = handler(flagKey)
+		flag.IsDefault = true
+		flag.FeatureName = flagKey
+		return flag, err
+	}
+	return func(c *Client) {
+		c.defaultFlagHandler = f
+	}
 }
 
 // WithLogger sets a custom [slog.Logger] for the [Client].