Review fixes

Signed-off-by: Olivier Laviale <olivier.laviale@gmail.com>

Author: olvlvl

providers/go-feature-flag/pkg/controller/goff_api.go

@@ -61,12 +61,10 @@ func (g *GoFeatureFlagAPI) CollectData(events []model.FeatureEvent) error {
 	}
 
 	req.Header.Set(ContentTypeHeader, ApplicationJson)
+	applyHeaders(g.options.CustomHeaders, req)
 	if g.options.APIKey != "" {
 		req.Header.Set(AuthorizationHeader, BearerPrefix+g.options.APIKey)
 	}
-	for k, v := range g.options.CustomHeaders {
-		req.Header.Set(k, v)
-	}
 
 	response, err := g.getHttpClient().Do(req)
 	if err != nil {
@@ -90,12 +88,10 @@ func (g *GoFeatureFlagAPI) ConfigurationHasChanged() (ConfigurationChangeStatus,
 		return ErrorConfigurationChange, err
 	}
 	req.Header.Set(ContentTypeHeader, ApplicationJson)
+	applyHeaders(g.options.CustomHeaders, req)
 	if g.options.APIKey != "" {
 		req.Header.Set(AuthorizationHeader, BearerPrefix+g.options.APIKey)
 	}
-	for k, v := range g.options.CustomHeaders {
-		req.Header.Set(k, v)
-	}
 	if g.configChangeEtag != "" {
 		req.Header.Set(IfNoneMatchHeader, g.configChangeEtag)
 	}
@@ -129,3 +125,10 @@ func (g *GoFeatureFlagAPI) getHttpClient() *http.Client {
 	}
 	return client
 }
+
+// applyHeaders to a request.
+func applyHeaders(headers map[string]string, req *http.Request) {
+	for k, v := range headers {
+		req.Header.Set(k, v)
+	}
+}

providers/go-feature-flag/pkg/controller/goff_api_test.go

@@ -3,13 +3,14 @@ package controller_test
 import (
 	"bytes"
 	"errors"
+	"io"
+	"net/http"
+	"testing"
+
 	"github.com/open-feature/go-sdk-contrib/providers/go-feature-flag/pkg/controller"
 	"github.com/open-feature/go-sdk-contrib/providers/go-feature-flag/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"io"
-	"net/http"
-	"testing"
 )
 
 func Test_CollectDataAPI(t *testing.T) {
@@ -79,7 +80,7 @@ func Test_CollectDataAPI(t *testing.T) {
 			options: controller.GoFeatureFlagApiOptions{
 				Endpoint:         "http://localhost:1031",
 				APIKey:           "my-key",
-				CustomHeaders:    map[string]string{"User-Agent": "goff-sdk-tests"},
+				CustomHeaders:    map[string]string{"Authorization": "foo", "User-Agent": "goff-sdk-tests"},
 				ExporterMetadata: map[string]any{"openfeature": true, "provider": "go"},
 			},
 			events: []model.FeatureEvent{

providers/go-feature-flag/pkg/provider.go

@@ -52,9 +52,8 @@ func NewProviderWithContext(ctx context.Context, options ProviderOptions) (*Prov
 		return controller.ContentTypeHeader, controller.ApplicationJson
 	}))
 	for k, v := range options.CustomHeaders {
-		scopedK, scopedV := k, v
-		ofrepOptions = append(ofrepOptions, ofrep.WithHeaderProvider(func() (key string, value string) {
-			return scopedK, scopedV
+		ofrepOptions = append(ofrepOptions, ofrep.WithHeaderProvider(func() (string, string) {
+			return k, v
 		}))
 	}
 	ofrepProvider := ofrep.NewProvider(options.Endpoint, ofrepOptions...)