From 277174ebd55a9040760bef76626f97bd5e1a70ed Mon Sep 17 00:00:00 2001 From: Daniel Grunberger <84905812+Daniel-GrunbergerCA@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:16:16 -0800 Subject: [PATCH] update mock for tests based on merging of ports (#213) * add tests Signed-off-by: Daniel Grunberger * more tests Signed-off-by: Daniel Grunberger * add comment Signed-off-by: Daniel Grunberger * add known servers Signed-off-by: Daniel Grunberger * fixes Signed-off-by: Daniel Grunberger * fix server Signed-off-by: Daniel Grunberger * update mocks Signed-off-by: Daniel Grunberger --------- Signed-off-by: Daniel Grunberger Co-authored-by: Daniel Grunberger --- .../busybox-known-server.json | 64 ++++++++----------- .../busybox.json | 34 ++++------ .../deployment-mariadb.json | 6 +- .../deployment-nginx.json | 6 +- .../deployment-wikijs.json | 30 +++------ 5 files changed, 56 insertions(+), 84 deletions(-) diff --git a/configurations/network-policy/expected-generated-network-policy/busybox-known-server.json b/configurations/network-policy/expected-generated-network-policy/busybox-known-server.json index 43439e41..d69f1fbc 100644 --- a/configurations/network-policy/expected-generated-network-policy/busybox-known-server.json +++ b/configurations/network-policy/expected-generated-network-policy/busybox-known-server.json @@ -2,6 +2,7 @@ "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", @@ -9,22 +10,22 @@ "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": { @@ -34,6 +35,7 @@ "annotations": { "generated-by": "kubescape" }, + "creationTimestamp": null, "labels": { "kubescape.io/workload-api-group": "apps", "kubescape.io/workload-api-version": "v1", @@ -41,32 +43,10 @@ "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": [ { @@ -77,7 +57,12 @@ "to": [ { "ipBlock": { - "cidr": "64.233.183.104/32" + "cidr": "142.250.1.104/24" + } + }, + { + "ipBlock": { + "cidr": "209.85.146.106/32" } } ] @@ -85,14 +70,21 @@ { "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" + } } } ] diff --git a/configurations/network-policy/expected-generated-network-policy/busybox.json b/configurations/network-policy/expected-generated-network-policy/busybox.json index f87a3047..6526ec7d 100644 --- a/configurations/network-policy/expected-generated-network-policy/busybox.json +++ b/configurations/network-policy/expected-generated-network-policy/busybox.json @@ -2,7 +2,7 @@ "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", @@ -10,22 +10,22 @@ "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": { @@ -43,7 +43,7 @@ "kubescape.io/workload-name": "busybox-deployment" }, "name": "deployment-busybox-deployment", - "namespace": "systest-ns-7vi4" + "namespace": "systest-ns-2ffb" }, "spec": { "egress": [ @@ -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" } } ] diff --git a/configurations/network-policy/expected-generated-network-policy/deployment-mariadb.json b/configurations/network-policy/expected-generated-network-policy/deployment-mariadb.json index 7f1a61ba..373975e4 100644 --- a/configurations/network-policy/expected-generated-network-policy/deployment-mariadb.json +++ b/configurations/network-policy/expected-generated-network-policy/deployment-mariadb.json @@ -2,7 +2,7 @@ "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", @@ -10,7 +10,7 @@ "kubescape.io/workload-name": "mariadb" }, "name": "deployment-mariadb", - "namespace": "systest-ns-ggjg" + "namespace": "systest-ns-pjqm" }, "policyRef": [], "spec": { @@ -28,7 +28,7 @@ "kubescape.io/workload-name": "mariadb" }, "name": "deployment-mariadb", - "namespace": "systest-ns-ggjg" + "namespace": "systest-ns-pjqm" }, "spec": { "ingress": [ diff --git a/configurations/network-policy/expected-generated-network-policy/deployment-nginx.json b/configurations/network-policy/expected-generated-network-policy/deployment-nginx.json index 65c0e1f5..2ddb1cdf 100644 --- a/configurations/network-policy/expected-generated-network-policy/deployment-nginx.json +++ b/configurations/network-policy/expected-generated-network-policy/deployment-nginx.json @@ -2,7 +2,7 @@ "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", @@ -10,7 +10,7 @@ "kubescape.io/workload-name": "nginx" }, "name": "deployment-nginx", - "namespace": "systest-ns-ggjg" + "namespace": "systest-ns-pjqm" }, "policyRef": [], "spec": { @@ -28,7 +28,7 @@ "kubescape.io/workload-name": "nginx" }, "name": "deployment-nginx", - "namespace": "systest-ns-ggjg" + "namespace": "systest-ns-pjqm" }, "spec": { "egress": [ diff --git a/configurations/network-policy/expected-generated-network-policy/deployment-wikijs.json b/configurations/network-policy/expected-generated-network-policy/deployment-wikijs.json index 2be2db20..eb79af75 100644 --- a/configurations/network-policy/expected-generated-network-policy/deployment-wikijs.json +++ b/configurations/network-policy/expected-generated-network-policy/deployment-wikijs.json @@ -2,7 +2,7 @@ "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", @@ -10,22 +10,22 @@ "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": { @@ -43,7 +43,7 @@ "kubescape.io/workload-name": "wikijs" }, "name": "deployment-wikijs", - "namespace": "systest-ns-ggjg" + "namespace": "systest-ns-pjqm" }, "spec": { "egress": [ @@ -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"