update: remove unused function and move helpers to internal

internal/helpers/headers_to_proxy.go

@@ -0,0 +1,30 @@
+// Copyright 2021 Mia srl
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package helpers
+
+import (
+	"net/http"
+)
+
+func GetHeadersToProxy(r *http.Request, headerNamesToAdd []string) http.Header {
+	headersToProxy := http.Header{}
+	for _, headerNameToAdd := range headerNamesToAdd {
+		headerValue := r.Header.Get(headerNameToAdd)
+		if len(headerValue) > 0 {
+			headersToProxy.Set(headerNameToAdd, headerValue)
+		}
+	}
+	return headersToProxy
+}

internal/helpers/headers_to_proxy_test.go

@@ -0,0 +1,52 @@
+// Copyright 2021 Mia srl
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package helpers
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetHeadersToProxy(t *testing.T) {
+	t.Run("not set header if empty headers to proxy", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/", nil)
+		actual := GetHeadersToProxy(req, nil)
+
+		expected := http.Header{}
+
+		require.Equal(t, actual, expected)
+	})
+
+	t.Run("get headers to proxy correctly", func(t *testing.T) {
+		requestHeaders := http.Header{}
+		requestHeaders.Set("foo", "bar")
+		requestHeaders.Set("taz", "ok")
+		requestHeaders.Set("proxy", "me")
+
+		req := httptest.NewRequest(http.MethodGet, "/", nil)
+		req.Header = requestHeaders
+
+		actual := GetHeadersToProxy(req, []string{"foo", "proxy"})
+
+		expected := http.Header{}
+		expected.Set("foo", "bar")
+		expected.Set("proxy", "me")
+
+		require.Equal(t, actual, expected)
+	})
+}

main.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rond-authz/rond/core"
-	"github.com/rond-authz/rond/helpers"
 	"github.com/rond-authz/rond/internal/config"
+	"github.com/rond-authz/rond/internal/helpers"
 	"github.com/rond-authz/rond/internal/mongoclient"
 	"github.com/rond-authz/rond/openapi"
 	"github.com/rond-authz/rond/service"

service/router.go

@@ -27,7 +27,6 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rond-authz/rond/core"
-	"github.com/rond-authz/rond/helpers"
 	"github.com/rond-authz/rond/internal/config"
 	"github.com/rond-authz/rond/internal/metrics"
 	"github.com/rond-authz/rond/internal/mongoclient"
@@ -116,8 +115,6 @@ func SetupRouter(
 
 	evalRouter := router.NewRoute().Subrouter()
 	if env.Standalone {
-		router.Use(helpers.AddHeadersToProxyMiddleware(log, env.GetAdditionalHeadersToProxy()))
-
 		swaggerRouter, err := swagger.NewRouter(gorilla.NewRouter(router), swagger.Options{
 			Context: context.Background(),
 			Openapi: &openapi3.T{

service/standalone_apis.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/rond-authz/rond/helpers"
 	"github.com/rond-authz/rond/internal/config"
+	"github.com/rond-authz/rond/internal/helpers"
 	"github.com/rond-authz/rond/internal/utils"
 	"github.com/rond-authz/rond/types"