Return specific type (#4840)

kubernetes · Dec 17, 2019 · facf841 · facf841
1 parent 0976d33
commit facf841
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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)
 		}
 	}
 }