DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return specific type (#4840)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-12-17 12:06:17 -03:00 committed by GitHub
parent 0976d3307f
commit facf841992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/template/template.go
View file

@ -1009,7 +1009,7 @@ type errorLocation struct {
// of errorLocations, each of which contain the upstream name and a list of // of errorLocations, each of which contain the upstream name and a list of
// error codes for that given upstream, so that sufficiently unique // error codes for that given upstream, so that sufficiently unique
// @custom error location blocks can be created in the template // @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) server, ok := input.(*ingress.Server)
if !ok { if !ok {
klog.Errorf("expected a '*ingress.Server' type but %T was returned", input) klog.Errorf("expected a '*ingress.Server' type but %T was returned", input)

8
internal/ingress/controller/template/template_test.go
View file

@ -1108,12 +1108,8 @@ func TestBuildCustomErrorLocationsPerServer(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
response := buildCustomErrorLocationsPerServer(c.server) response := buildCustomErrorLocationsPerServer(c.server)
if results, ok := response.([]errorLocation); ok { if !reflect.DeepEqual(c.expectedResults, response) {
if !reflect.DeepEqual(c.expectedResults, results) { t.Errorf("Expected %+v but got %+v", c.expectedResults, response)
t.Errorf("Expected %+v but got %+v", c.expectedResults, results)
}
} else {
t.Error("Unable to convert to []errorLocation")
} }
} }
} }