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

Annotations cannot being empty

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-12-02 15:35:12 -03:00
parent f78e2e3849
commit 497246f8ba
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
9 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/ingress/annotations/parser/main.go
View file

@ -52,6 +52,10 @@ func (a ingAnnotations) parseBool(name string) (bool, error) {
func (a ingAnnotations) parseString(name string) (string, error) {
val, ok := a[name]
if ok {
if len(val) == 0 {
return "", errors.NewInvalidAnnotationContent(name, val)
}
return val, nil
}
return "", errors.ErrMissingAnnotations
@ -97,6 +101,7 @@ func GetStringAnnotation(name string, ing *extensions.Ingress) (string, error) {
if err != nil {
return "", err
}
return ingAnnotations(ing.GetAnnotations()).parseString(v)
}

5
internal/ingress/annotations/parser/main_test.go
View file

@ -79,7 +79,7 @@ func TestGetStringAnnotation(t *testing.T) {
_, err := GetStringAnnotation("", nil)
if err == nil {
t.Errorf("expected error but retuned nil")
t.Errorf("expected error but none returned")
}
tests := []struct {
@ -91,6 +91,7 @@ func TestGetStringAnnotation(t *testing.T) {
}{
{"valid - A", "string", "A", "A", false},
{"valid - B", "string", "B", "B", false},
{"empty", "string", "", "", true},
}
data := map[string]string{}
@ -102,7 +103,7 @@ func TestGetStringAnnotation(t *testing.T) {
s, err := GetStringAnnotation(test.field, ing)
if test.expErr {
if err == nil {
t.Errorf("%v: expected error but retuned nil", test.name)
t.Errorf("%v: expected error but none returned", test.name)
}
continue
}