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

Merge pull request #265 from aledbf/fix-redirect

Browse source 
Fix rewrite annotation parser
This commit is contained in:
Prashanth B 2017-02-15 00:48:14 +05:30 committed by GitHub
commit a9b57702a6
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/pkg/ingress/annotations/rewrite/main.go
View file

@ -52,11 +52,7 @@ func NewParser(br resolver.DefaultBackend) parser.IngressAnnotation {
// ParseAnnotations parses the annotations contained in the ingress // ParseAnnotations parses the annotations contained in the ingress
// rule used to rewrite the defined paths // rule used to rewrite the defined paths
func (a rewrite) Parse(ing *extensions.Ingress) (interface{}, error) { func (a rewrite) Parse(ing *extensions.Ingress) (interface{}, error) {
rt, err := parser.GetStringAnnotation(rewriteTo, ing) rt, _ := parser.GetStringAnnotation(rewriteTo, ing)
if err != nil {
return nil, err
}
sslRe, err := parser.GetBoolAnnotation(sslRedirect, ing) sslRe, err := parser.GetBoolAnnotation(sslRedirect, ing)
if err != nil { if err != nil {
sslRe = a.backendResolver.GetDefaultBackend().SSLRedirect sslRe = a.backendResolver.GetDefaultBackend().SSLRedirect

4
core/pkg/ingress/annotations/rewrite/main_test.go
View file

@ -76,8 +76,8 @@ func (m mockBackend) GetDefaultBackend() defaults.Backend {
func TestWithoutAnnotations(t *testing.T) { func TestWithoutAnnotations(t *testing.T) {
ing := buildIngress() ing := buildIngress()
_, err := NewParser(mockBackend{}).Parse(ing) _, err := NewParser(mockBackend{}).Parse(ing)
if err == nil { if err != nil {
t.Error("Expected error with ingress without annotations") t.Errorf("unexpected error with ingress without annotations: %v", err)
} }
} }