diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go index 85f9eae5f..79d130bf1 100644 --- a/internal/ingress/controller/template/template.go +++ b/internal/ingress/controller/template/template.go @@ -1009,7 +1009,7 @@ type errorLocation struct { // of errorLocations, each of which contain the upstream name and a list of // error codes for that given upstream, so that sufficiently unique // @custom error location blocks can be created in the template -func buildCustomErrorLocationsPerServer(input interface{}) interface{} { +func buildCustomErrorLocationsPerServer(input interface{}) []errorLocation { server, ok := input.(*ingress.Server) if !ok { klog.Errorf("expected a '*ingress.Server' type but %T was returned", input) diff --git a/internal/ingress/controller/template/template_test.go b/internal/ingress/controller/template/template_test.go index c24e355d6..062da89b8 100644 --- a/internal/ingress/controller/template/template_test.go +++ b/internal/ingress/controller/template/template_test.go @@ -1108,12 +1108,8 @@ func TestBuildCustomErrorLocationsPerServer(t *testing.T) { for _, c := range testCases { response := buildCustomErrorLocationsPerServer(c.server) - if results, ok := response.([]errorLocation); ok { - if !reflect.DeepEqual(c.expectedResults, results) { - t.Errorf("Expected %+v but got %+v", c.expectedResults, results) - } - } else { - t.Error("Unable to convert to []errorLocation") + if !reflect.DeepEqual(c.expectedResults, response) { + t.Errorf("Expected %+v but got %+v", c.expectedResults, response) } } }