Skip to content

Commit

Permalink
update mock for tests based on merging of ports (#213)
Browse files Browse the repository at this point in the history 
* add tests

Signed-off-by: Daniel Grunberger <[email protected]>

* more tests

Signed-off-by: Daniel Grunberger <[email protected]>

* add comment

Signed-off-by: Daniel Grunberger <[email protected]>

* add known servers

Signed-off-by: Daniel Grunberger <[email protected]>

* fixes

Signed-off-by: Daniel Grunberger <[email protected]>

* fix server

Signed-off-by: Daniel Grunberger <[email protected]>

* update mocks

Signed-off-by: Daniel Grunberger <[email protected]>

---------

Signed-off-by: Daniel Grunberger <[email protected]>
Co-authored-by: Daniel Grunberger <[email protected]>
  • Loading branch information
@Daniel-GrunbergerCA
Daniel-GrunbergerCA and Daniel Grunberger authored Dec 18, 2023
1 parent 3a59f45 commit 277174e
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 84 deletions.
64 changes: 28 additions & 36 deletions configurations/network-policy/expected-generated-network-policy/busybox-known-server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,30 @@
"apiVersion": "spdx.softwarecomposition.kubescape.io/v1beta1",
"kind": "GeneratedNetworkPolicy",
"metadata": {
"creationTimestamp": "2023-12-14T09:45:53Z",
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "busybox-deployment"
},
"name": "deployment-busybox-deployment",
"namespace": "systest-ns-d3qk"
"namespace": "systest-ns-z9z7"
},
"policyRef": [
{
"dns": "www.google.com.",
"ipBlock": "64.233.183.104/32",
"name": "",
"originalIP": "64.233.183.104",
"server": ""
},
{
"dns": "",
"ipBlock": "142.250.1.104/24",
"name": "github-workflows",
"originalIP": "142.250.1.104",
"server": "github.com"
},
{
"dns": "www.google.com.",
"ipBlock": "209.85.146.106/32",
"name": "",
"originalIP": "209.85.146.106",
"server": ""
}
],
"spec": {
Expand All @@ -34,39 +35,18 @@
"annotations": {
"generated-by": "kubescape"
},
"creationTimestamp": null,
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "busybox-deployment"
},
"name": "deployment-busybox-deployment",
"namespace": "systest-ns-d3qk"
"namespace": "systest-ns-z9z7"
},
"spec": {
"egress": [
{
"ports": [
{
"port": 53,
"protocol": "UDP"
}
],
"to": [
{
"namespaceSelector": {
"matchLabels": {
"kubernetes.io/metadata.name": "kube-system"
}
},
"podSelector": {
"matchLabels": {
"k8s-app": "kube-dns"
}
}
}
]
},
{
"ports": [
{
Expand All @@ -77,22 +57,34 @@
"to": [
{
"ipBlock": {
"cidr": "64.233.183.104/32"
"cidr": "142.250.1.104/24"
}
},
{
"ipBlock": {
"cidr": "209.85.146.106/32"
}
}
]
},
{
"ports": [
{
"port": 80,
"protocol": "TCP"
"port": 53,
"protocol": "UDP"
}
],
"to": [
{
"ipBlock": {
"cidr": "142.250.1.104/24"
"namespaceSelector": {
"matchLabels": {
"kubernetes.io/metadata.name": "kube-system"
}
},
"podSelector": {
"matchLabels": {
"k8s-app": "kube-dns"
}
}
}
]
Expand Down
34 changes: 12 additions & 22 deletions configurations/network-policy/expected-generated-network-policy/busybox.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
"apiVersion": "spdx.softwarecomposition.kubescape.io/v1beta1",
"kind": "GeneratedNetworkPolicy",
"metadata": {
"creationTimestamp": "2023-12-03T16:33:18Z",
"creationTimestamp": "2023-12-14T09:42:24Z",
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "busybox-deployment"
},
"name": "deployment-busybox-deployment",
"namespace": "systest-ns-7vi4"
"namespace": "systest-ns-2ffb"
},
"policyRef": [
{
"dns": "google.com.",
"ipBlock": "142.251.171.102/32",
"ipBlock": "142.250.125.102/32",
"name": "",
"server": "",
"originalIP": "142.251.171.102"
"originalIP": "142.250.125.102",
"server": ""
},
{
"dns": "www.google.com.",
"ipBlock": "173.194.192.99/32",
"ipBlock": "108.177.111.103/32",
"name": "",
"server": "",
"originalIP": "173.194.192.99"
"originalIP": "108.177.111.103",
"server": ""
}
],
"spec": {
Expand All @@ -43,7 +43,7 @@
"kubescape.io/workload-name": "busybox-deployment"
},
"name": "deployment-busybox-deployment",
"namespace": "systest-ns-7vi4"
"namespace": "systest-ns-2ffb"
},
"spec": {
"egress": [
Expand All @@ -57,22 +57,12 @@
"to": [
{
"ipBlock": {
"cidr": "142.251.171.102/32"
"cidr": "108.177.111.103/32"
}
}
]
},
{
"ports": [
{
"port": 80,
"protocol": "TCP"
}
],
"to": [
},
{
"ipBlock": {
"cidr": "173.194.192.99/32"
"cidr": "142.250.125.102/32"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions configurations/network-policy/expected-generated-network-policy/deployment-mariadb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"apiVersion": "spdx.softwarecomposition.kubescape.io/v1beta1",
"kind": "GeneratedNetworkPolicy",
"metadata": {
"creationTimestamp": "2023-11-30T09:41:41Z",
"creationTimestamp": "2023-12-14T09:24:41Z",
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "mariadb"
},
"name": "deployment-mariadb",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"policyRef": [],
"spec": {
Expand All @@ -28,7 +28,7 @@
"kubescape.io/workload-name": "mariadb"
},
"name": "deployment-mariadb",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"spec": {
"ingress": [
Expand Down
6 changes: 3 additions & 3 deletions configurations/network-policy/expected-generated-network-policy/deployment-nginx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"apiVersion": "spdx.softwarecomposition.kubescape.io/v1beta1",
"kind": "GeneratedNetworkPolicy",
"metadata": {
"creationTimestamp": "2023-11-30T09:41:27Z",
"creationTimestamp": "2023-12-14T09:25:02Z",
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "nginx"
},
"name": "deployment-nginx",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"policyRef": [],
"spec": {
Expand All @@ -28,7 +28,7 @@
"kubescape.io/workload-name": "nginx"
},
"name": "deployment-nginx",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"spec": {
"egress": [
Expand Down
30 changes: 10 additions & 20 deletions configurations/network-policy/expected-generated-network-policy/deployment-wikijs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
"apiVersion": "spdx.softwarecomposition.kubescape.io/v1beta1",
"kind": "GeneratedNetworkPolicy",
"metadata": {
"creationTimestamp": "2023-11-30T09:41:13Z",
"creationTimestamp": "2023-12-14T09:22:59Z",
"labels": {
"kubescape.io/workload-api-group": "apps",
"kubescape.io/workload-api-version": "v1",
"kubescape.io/workload-kind": "deployment",
"kubescape.io/workload-name": "wikijs"
},
"name": "deployment-wikijs",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"policyRef": [
{
"dns": "google.com.",
"ipBlock": "74.125.201.138/32",
"ipBlock": "108.177.120.100/32",
"name": "",
"server": "",
"originalIP": "74.125.201.138"
"originalIP": "108.177.120.100",
"server": ""
},
{
"dns": "wikipedia.org.",
"ipBlock": "208.80.154.224/32",
"name": "",
"server": "",
"originalIP": "208.80.154.224"
"originalIP": "208.80.154.224",
"server": ""
}
],
"spec": {
Expand All @@ -43,7 +43,7 @@
"kubescape.io/workload-name": "wikijs"
},
"name": "deployment-wikijs",
"namespace": "systest-ns-ggjg"
"namespace": "systest-ns-pjqm"
},
"spec": {
"egress": [
Expand All @@ -57,19 +57,9 @@
"to": [
{
"ipBlock": {
"cidr": "74.125.201.138/32"
"cidr": "108.177.120.100/32"
}
}
]
},
{
"ports": [
{
"port": 443,
"protocol": "TCP"
}
],
"to": [
},
{
"ipBlock": {
"cidr": "208.80.154.224/32"
Expand Down

0 comments on commit 277174e

Please sign in to comment.