github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix empty setter logic

Browse Source 
Signed-off-by: Daniela Lins <danielamlins@gmail.com>
This commit is contained in:
Daniela Lins 2021-03-07 13:04:10 +01:00
parent 0444bdc944
commit 36e040f86e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/apis/networking/validation/validation_test.go
View File

@ -76,15 +76,14 @@ func TestValidateNetworkPolicy(t *testing.T) {
// Tweaks used below. // Tweaks used below.
setIngressEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) { setIngressEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) {
networkPolicy.Spec.Ingress = make([]networking.NetworkPolicyIngressRule, 1) networkPolicy.Spec.Ingress = []networking.NetworkPolicyIngressRule{{}}
} }
setIngressFromEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) { setIngressFromEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) {
networkPolicy.Spec.Ingress = []networking.NetworkPolicyIngressRule{ if networkPolicy.Spec.Ingress == nil {
{ setIngressEmptyFirstElement(networkPolicy)
From: []networking.NetworkPolicyPeer{{}},
},
} }
networkPolicy.Spec.Ingress[0].From = []networking.NetworkPolicyPeer{{}}
} }
setIngressFromIfEmpty := func(networkPolicy *networking.NetworkPolicy) { setIngressFromIfEmpty := func(networkPolicy *networking.NetworkPolicy) {
@ -95,6 +94,7 @@ func TestValidateNetworkPolicy(t *testing.T) {
setIngressFromEmptyFirstElement(networkPolicy) setIngressFromEmptyFirstElement(networkPolicy)
} }
} }
setIngressEmptyPorts := func(networkPolicy *networking.NetworkPolicy) { setIngressEmptyPorts := func(networkPolicy *networking.NetworkPolicy) {
networkPolicy.Spec.Ingress = []networking.NetworkPolicyIngressRule{ networkPolicy.Spec.Ingress = []networking.NetworkPolicyIngressRule{
{ {
@ -130,8 +130,8 @@ func TestValidateNetworkPolicy(t *testing.T) {
}, },
} }
} }
} }
setIngressFromNamespaceSelector := func(networkPolicy *networking.NetworkPolicy) { setIngressFromNamespaceSelector := func(networkPolicy *networking.NetworkPolicy) {
setIngressFromIfEmpty(networkPolicy) setIngressFromIfEmpty(networkPolicy)
networkPolicy.Spec.Ingress[0].From[0].NamespaceSelector = &metav1.LabelSelector{ networkPolicy.Spec.Ingress[0].From[0].NamespaceSelector = &metav1.LabelSelector{
@ -156,15 +156,14 @@ func TestValidateNetworkPolicy(t *testing.T) {
} }
setEgressEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) { setEgressEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) {
networkPolicy.Spec.Egress = make([]networking.NetworkPolicyEgressRule, 1) networkPolicy.Spec.Egress = []networking.NetworkPolicyEgressRule{{}}
} }
setEgressToEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) { setEgressToEmptyFirstElement := func(networkPolicy *networking.NetworkPolicy) {
networkPolicy.Spec.Egress = []networking.NetworkPolicyEgressRule{ if networkPolicy.Spec.Egress == nil {
{ setEgressEmptyFirstElement(networkPolicy)
To: []networking.NetworkPolicyPeer{{}},
},
} }
networkPolicy.Spec.Egress[0].To = []networking.NetworkPolicyPeer{{}}
} }
setEgressToIfEmpty := func(networkPolicy *networking.NetworkPolicy) { setEgressToIfEmpty := func(networkPolicy *networking.NetworkPolicy) {
@ -175,6 +174,7 @@ func TestValidateNetworkPolicy(t *testing.T) {
setEgressToEmptyFirstElement(networkPolicy) setEgressToEmptyFirstElement(networkPolicy)
} }
} }
setEgressToNamespaceSelector := func(networkPolicy *networking.NetworkPolicy) { setEgressToNamespaceSelector := func(networkPolicy *networking.NetworkPolicy) {
setEgressToIfEmpty(networkPolicy) setEgressToIfEmpty(networkPolicy)
networkPolicy.Spec.Egress[0].To[0].NamespaceSelector = &metav1.LabelSelector{ networkPolicy.Spec.Egress[0].To[0].NamespaceSelector = &metav1.LabelSelector{