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

Fix Todo:convert sequence to table

Browse source
This commit is contained in:
zhengjiajin 2017-08-16 16:46:08 +08:00
parent 7891ed6607
commit ce3abe22b8
1 changed files with 98 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

237
core/pkg/ingress/annotations/ipwhitelist/main_test.go
View file

@ -17,7 +17,6 @@ limitations under the License.
package ipwhitelist package ipwhitelist
import ( import (
"reflect"
"testing" "testing"
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
@ -26,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress/core/pkg/ingress/defaults" "k8s.io/ingress/core/pkg/ingress/defaults"
"k8s.io/ingress/core/pkg/ingress/errors"
) )
func buildIngress() *extensions.Ingress { func buildIngress() *extensions.Ingress {
@ -73,157 +71,118 @@ func (m mockBackend) GetDefaultBackend() defaults.Backend {
} }
func TestParseAnnotations(t *testing.T) { func TestParseAnnotations(t *testing.T) {
// TODO: convert test cases to tables
ing := buildIngress() ing := buildIngress()
tests := map[string]struct {
testNet := "10.0.0.0/24" net string
enet := []string{testNet} expectCidr []string
expectErr bool
data := map[string]string{} errOut string
data[whitelist] = testNet }{
ing.SetAnnotations(data) "test parse a valid net": {
net: "10.0.0.0/24",
expected := &SourceRange{ expectCidr: []string{"10.0.0.0/24"},
CIDR: enet, expectErr: false,
},
"test parse a invalid net": {
net: "ww",
expectErr: true,
errOut: "the annotation does not contain a valid IP address or network: invalid CIDR address: ww",
},
"test parse a empty net": {
net: "",
expectErr: true,
errOut: "the annotation does not contain a valid IP address or network: invalid CIDR address: ",
},
"test parse multiple valid cidr": {
net: "2.2.2.2/32,1.1.1.1/32,3.3.3.0/24",
expectCidr: []string{"1.1.1.1/32", "2.2.2.2/32", "3.3.3.0/24"},
expectErr: false,
},
} }
p := NewParser(mockBackend{}) for testName, test := range tests {
data := map[string]string{}
i, err := p.Parse(ing) data[whitelist] = test.net
if err != nil { ing.SetAnnotations(data)
t.Errorf("unexpected error: %v", err) p := NewParser(mockBackend{})
} i, err := p.Parse(ing)
sr, ok := i.(*SourceRange) if err != nil && !test.expectErr {
if !ok { t.Errorf("%v:unexpected error: %v", testName, err)
t.Errorf("expected a SourceRange type") }
} if test.expectErr {
if err.Error() != test.errOut {
if !reflect.DeepEqual(sr, expected) { t.Errorf("%v:expected error: %v but %v return", testName, test.errOut, err.Error())
t.Errorf("expected %v but returned %s", sr, expected) }
} }
if !test.expectErr {
data[whitelist] = "www" sr, ok := i.(*SourceRange)
_, err = p.Parse(ing) if !ok {
if err == nil { t.Errorf("%v:expected a SourceRange type", testName)
t.Errorf("expected error parsing an invalid cidr") }
} if !strsEquals(sr.CIDR, test.expectCidr) {
t.Errorf("%v:expected %v CIDR but %v returned", testName, test.expectCidr, sr.CIDR)
if !errors.IsLocationDenied(err) { }
t.Errorf("expected LocationDenied error: %+v", err) }
}
delete(data, whitelist)
i, err = p.Parse(ing)
if err != nil {
t.Errorf("unexpected error when no annotation present: %v", err)
}
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
if !strsEquals(sr.CIDR, []string{}) {
t.Errorf("expected empty CIDR but %v returned", sr.CIDR)
}
i, _ = p.Parse(&extensions.Ingress{})
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
if !strsEquals(sr.CIDR, []string{}) {
t.Errorf("expected empty CIDR but %v returned", sr.CIDR)
}
data[whitelist] = "2.2.2.2/32,1.1.1.1/32,3.3.3.0/24"
i, _ = p.Parse(ing)
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
ecidr := []string{"1.1.1.1/32", "2.2.2.2/32", "3.3.3.0/24"}
if !strsEquals(sr.CIDR, ecidr) {
t.Errorf("Expected %v CIDR but %v returned", ecidr, sr.CIDR)
} }
} }
// Test that when we have a whitelist set on the Backend that is used when we // Test that when we have a whitelist set on the Backend that is used when we
// don't have the annotation // don't have the annotation
func TestParseAnnotationsWithDefaultConfig(t *testing.T) { func TestParseAnnotationsWithDefaultConfig(t *testing.T) {
// TODO: convert test cases to tables
ing := buildIngress() ing := buildIngress()
mockBackend := mockBackend{} mockBackend := mockBackend{}
mockBackend.Backend.WhitelistSourceRange = []string{"4.4.4.0/24", "1.2.3.4/32"} mockBackend.Backend.WhitelistSourceRange = []string{"4.4.4.0/24", "1.2.3.4/32"}
testNet := "10.0.0.0/24" tests := map[string]struct {
enet := []string{testNet} net string
expectCidr []string
data := map[string]string{} expectErr bool
data[whitelist] = testNet errOut string
ing.SetAnnotations(data) }{
"test parse a valid net": {
expected := &SourceRange{ net: "10.0.0.0/24",
CIDR: enet, expectCidr: []string{"10.0.0.0/24"},
expectErr: false,
},
"test parse a invalid net": {
net: "ww",
expectErr: true,
errOut: "the annotation does not contain a valid IP address or network: invalid CIDR address: ww",
},
"test parse a empty net": {
net: "",
expectErr: true,
errOut: "the annotation does not contain a valid IP address or network: invalid CIDR address: ",
},
"test parse multiple valid cidr": {
net: "2.2.2.2/32,1.1.1.1/32,3.3.3.0/24",
expectCidr: []string{"1.1.1.1/32", "2.2.2.2/32", "3.3.3.0/24"},
expectErr: false,
},
} }
p := NewParser(mockBackend) for testName, test := range tests {
data := map[string]string{}
i, err := p.Parse(ing) data[whitelist] = test.net
if err != nil { ing.SetAnnotations(data)
t.Errorf("unexpected error: %v", err) p := NewParser(mockBackend)
} i, err := p.Parse(ing)
sr, ok := i.(*SourceRange) if err != nil && !test.expectErr {
if !ok { t.Errorf("%v:unexpected error: %v", testName, err)
t.Errorf("expected a SourceRange type") }
} if test.expectErr {
if err.Error() != test.errOut {
if !reflect.DeepEqual(sr, expected) { t.Errorf("%v:expected error: %v but %v return", testName, test.errOut, err.Error())
t.Errorf("expected %v but returned %s", sr, expected) }
} }
if !test.expectErr {
data[whitelist] = "www" sr, ok := i.(*SourceRange)
_, err = p.Parse(ing) if !ok {
if err == nil { t.Errorf("%v:expected a SourceRange type", testName)
t.Errorf("expected error parsing an invalid cidr") }
} if !strsEquals(sr.CIDR, test.expectCidr) {
if !errors.IsLocationDenied(err) { t.Errorf("%v:expected %v CIDR but %v returned", testName, test.expectCidr, sr.CIDR)
t.Errorf("expected LocationDenied error: %+v", err) }
} }
delete(data, whitelist)
i, err = p.Parse(ing)
if err != nil {
t.Errorf("unexpected error when no annotation present: %v", err)
}
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
if !strsEquals(sr.CIDR, mockBackend.WhitelistSourceRange) {
t.Errorf("expected fallback CIDR but %v returned", sr.CIDR)
}
i, _ = p.Parse(&extensions.Ingress{})
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
if !strsEquals(sr.CIDR, mockBackend.WhitelistSourceRange) {
t.Errorf("expected fallback CIDR but %v returned", sr.CIDR)
}
data[whitelist] = "2.2.2.2/32,1.1.1.1/32,3.3.3.0/24"
i, _ = p.Parse(ing)
sr, ok = i.(*SourceRange)
if !ok {
t.Errorf("expected a SourceRange type")
}
ecidr := []string{"1.1.1.1/32", "2.2.2.2/32", "3.3.3.0/24"}
if !strsEquals(sr.CIDR, ecidr) {
t.Errorf("Expected %v CIDR but %v returned", ecidr, sr.CIDR)
} }
} }