Address review comments.

Signed-off-by: Pushpalanka Jayawardhana <pushpalanka.jayawardhana@zalando.de>

envoyauth/response.go

@@ -34,11 +34,8 @@ type StopFunc = func()
 // TransactionCloser should be called to abort the transaction
 type TransactionCloser func(ctx context.Context, err error) error
 
-// An Opt allowing externally setting the decision ID
-type Opt func(*EvalResult)
-
 // NewEvalResult creates a new EvalResult and a StopFunc that is used to stop the timer for metrics
-func NewEvalResult(opts ...Opt) (*EvalResult, StopFunc, error) {
+func NewEvalResult(opts ...func(*EvalResult)) (*EvalResult, StopFunc, error) {
 	var err error
 
 	er := &EvalResult{
@@ -412,10 +409,3 @@ func transformHTTPHeaderToEnvoyHeaderValueOption(headers http.Header) ([]*ext_co
 
 	return responseHeaders, nil
 }
-
-// WithDecisionID  sets the externally sent decision ID
-func WithDecisionID(decisionID string) Opt {
-	return func(result *EvalResult) {
-		result.DecisionID = decisionID
-	}
-}

envoyauth/response_test.go

@@ -398,20 +398,21 @@ func TestGetDynamicMetadataWithBooleanDecision(t *testing.T) {
 }
 
 func TestNewEvalResultWithDecisionID(t *testing.T) {
+	type Opt func(*EvalResult)
+
+	withDecisionID := func(decisionID string) Opt {
+		return func(result *EvalResult) {
+			result.DecisionID = decisionID
+		}
+	}
+
 	expectedDecisionID := "some-decision-id"
 
-	er, _, err := NewEvalResult(WithDecisionID(expectedDecisionID))
+	er, _, err := NewEvalResult(withDecisionID(expectedDecisionID))
 	if err != nil {
 		t.Fatalf("NewEvalResult() error = %v, wantErr %v", err, false)
 	}
 	if er.DecisionID != expectedDecisionID {
 		t.Errorf("Expected DecisionID to be '%v', got '%v'", expectedDecisionID, er.DecisionID)
 	}
 }
-
-func TestNewEvalResultWithoutOptDecisionID(t *testing.T) {
-	_, _, err := NewEvalResult()
-	if err != nil {
-		t.Fatalf("NewEvalResult() error = %v", err)
-	}
-}