remove dead code

Signed-off-by: catsby <[email protected]>
defenseunicorns · Dec 13, 2024 · e2dfbbe · e2dfbbe
1 parent 6921d23
commit e2dfbbe
Showing 1 changed file with 177 additions and 196 deletions.
diff --git a/src/pepr/operator/controllers/network/generators/kubeNodes.spec.ts b/src/pepr/operator/controllers/network/generators/kubeNodes.spec.ts
@@ -6,212 +6,193 @@
 import { beforeEach, beforeAll, describe, expect, it, jest } from "@jest/globals";
 
 import {
-  initAllNodesTarget,
-  nodeCIDRs,
-  updateKubeNodesFromCreateUpdate,
-  updateKubeNodesFromDelete,
+	initAllNodesTarget,
+	nodeCIDRs,
+	updateKubeNodesFromCreateUpdate,
+	updateKubeNodesFromDelete,
 } from "./kubeNodes";
 import { K8s, kind } from "pepr";
 import { V1NetworkPolicyList } from "@kubernetes/client-node";
 import { anywhere } from "./anywhere";
-// import { Component, setupLogger } from "../../../../logger";
 
 type KubernetesList<T> = {
-  items: T[];
+	items: T[];
 };
 
-// // Mock logger if needed
-// jest.mock("../../../../logger", () => ({
-// 	Component: { OPERATOR_GENERATORS: "OPERATOR_GENERATORS" },
-// 	setupLogger: () => ({
-// 		info: jest.fn(),
-// 		warn: jest.fn(),
-// 		error: jest.fn(),
-// 		debug: jest.fn(),
-// 	}),
-// }));
-
 jest.mock("pepr", () => {
-  const originalModule = jest.requireActual("pepr") as object;
-  return {
-    ...originalModule,
-    K8s: jest.fn(),
-    kind: {
-      Node: "Node",
-      NetworkPolicy: "NetworkPolicy",
-    },
-  };
+	const originalModule = jest.requireActual("pepr") as object;
+	return {
+		...originalModule,
+		K8s: jest.fn(),
+		kind: {
+			Node: "Node",
+			NetworkPolicy: "NetworkPolicy",
+		},
+	};
 });
 
 describe("kubeNodes module", () => {
-  const mockNodeList = {
-    items: [
-      {
-        metadata: { name: "node1" },
-        status: {
-          addresses: [{ type: "InternalIP", address: "10.0.0.1" }],
-          conditions: [{ type: "Ready", status: "True" }],
-        },
-      },
-      {
-        metadata: { name: "node2" },
-        status: {
-          addresses: [{ type: "InternalIP", address: "10.0.0.2" }],
-          conditions: [{ type: "Ready", status: "True" }],
-        },
-      },
-    ],
-  };
-
-  const mockNetworkPolicyList: V1NetworkPolicyList = {
-    apiVersion: "networking.k8s.io/v1",
-    kind: "NetworkPolicyList",
-    items: [
-      {
-        apiVersion: "networking.k8s.io/v1",
-        kind: "NetworkPolicy",
-        metadata: {
-          name: "example-policy",
-          namespace: "default",
-        },
-        spec: {
-          podSelector: {}, // required field
-          policyTypes: ["Egress"], // or ["Ingress"], or both
-          egress: [
-            {
-              to: [{ ipBlock: { cidr: "0.0.0.0/0" } }], // an IP we don't want
-            },
-          ],
-        },
-      },
-    ],
-  };
-
-  const mockK8sGetNodes = jest.fn<() => Promise<KubernetesList<kind.Node>>>();
-  const mockGetNetworkPolicies = jest.fn<() => Promise<KubernetesList<kind.NetworkPolicy>>>();
-  const mockApply = jest.fn();
-
-  beforeAll(() => {
-    (K8s as jest.Mock).mockImplementation(() => ({
-      Get: mockK8sGetNodes,
-      WithLabel: jest.fn(() => ({
-        Get: mockGetNetworkPolicies,
-      })),
-      Apply: mockApply,
-    }));
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (K8s as jest.Mock).mockImplementation(() => ({
-      Get: mockK8sGetNodes,
-      WithLabel: jest.fn(() => ({
-        Get: mockGetNetworkPolicies,
-      })),
-      Apply: mockApply,
-    }));
-  });
-
-  describe("initAllNodesTarget", () => {
-    it("should initialize nodeSet with internal IPs from nodes", async () => {
-      mockK8sGetNodes.mockResolvedValue(mockNodeList);
-      await initAllNodesTarget();
-      const cidrs = nodeCIDRs();
-      // Should have two IPs from mockNodeList
-      expect(cidrs).toHaveLength(2);
-      expect(cidrs).toEqual(
-        expect.arrayContaining([
-          { ipBlock: { cidr: "10.0.0.1/32" } },
-          { ipBlock: { cidr: "10.0.0.2/32" } },
-        ]),
-      );
-    });
-  });
-
-  describe("nodeCIDRs", () => {
-    it("should return anywhere if no nodes known", async () => {
-      mockK8sGetNodes.mockResolvedValue({ items: [] });
-      await initAllNodesTarget();
-      const cidrs = nodeCIDRs();
-      // expect it to match "anywhere"
-      expect(cidrs).toEqual([anywhere]);
-    });
-  });
-
-  describe("updateKubeNodesFromCreateUpdate", () => {
-    it("should add a node IP if node is ready", async () => {
-      mockK8sGetNodes.mockResolvedValueOnce({ items: [] });
-      mockGetNetworkPolicies.mockResolvedValue(mockNetworkPolicyList);
-      await initAllNodesTarget(); // start empty
-      await updateKubeNodesFromCreateUpdate(mockNodeList.items[0]);
-      let cidrs = nodeCIDRs();
-      expect(cidrs).toHaveLength(1);
-      expect(cidrs[0].ipBlock?.cidr).toBe("10.0.0.1/32");
-      expect(mockApply).toHaveBeenCalled();
-
-      await updateKubeNodesFromCreateUpdate(mockNodeList.items[1]);
-      cidrs = nodeCIDRs();
-      expect(cidrs).toHaveLength(2);
-      expect(cidrs[1].ipBlock?.cidr).toBe("10.0.0.2/32");
-      expect(mockApply).toHaveBeenCalled();
-    });
-
-    it("should not add a node IP if node not ready", async () => {
-      const notReadyNode = {
-        metadata: { name: "node3" },
-        status: {
-          addresses: [{ type: "InternalIP", address: "10.0.0.3" }],
-          conditions: [{ type: "Ready", status: "False" }],
-        },
-      };
-      mockK8sGetNodes.mockResolvedValueOnce({ items: [] });
-      await initAllNodesTarget(); // start empty
-      await updateKubeNodesFromCreateUpdate(notReadyNode);
-      const cidrs = nodeCIDRs();
-      expect(cidrs).toEqual([anywhere]);
-      expect(mockApply).toHaveBeenCalled(); // Still called to update polices even if empty
-    });
-
-    it("should remove a node that's no longer ready", async () => {
-      mockK8sGetNodes.mockResolvedValue(mockNodeList);
-      await initAllNodesTarget();
-      let cidrs = nodeCIDRs();
-      // Should have two IPs from mockNodeList
-      expect(cidrs).toHaveLength(2);
-      expect(cidrs).toEqual(
-        expect.arrayContaining([
-          { ipBlock: { cidr: "10.0.0.1/32" } },
-          { ipBlock: { cidr: "10.0.0.2/32" } },
-        ]),
-      );
-
-      const notReadyNode = {
-        metadata: { name: "node2" },
-        status: {
-          addresses: [{ type: "InternalIP", address: "10.0.0.1" }],
-          conditions: [{ type: "Ready", status: "False" }],
-        },
-      };
-      await updateKubeNodesFromCreateUpdate(notReadyNode);
-      cidrs = nodeCIDRs();
-      expect(cidrs).toHaveLength(1);
-      expect(cidrs).toEqual(expect.arrayContaining([{ ipBlock: { cidr: "10.0.0.2/32" } }]));
-      expect(mockApply).toHaveBeenCalled(); // Still called to update polices even if empty
-    });
-  });
-
-  describe("updateKubeNodesFromDelete", () => {
-    it("should remove the node IP from nodeSet", async () => {
-      mockK8sGetNodes.mockResolvedValueOnce(mockNodeList);
-      await initAllNodesTarget();
-      const cidrsBeforeDelete = nodeCIDRs();
-      expect(cidrsBeforeDelete).toHaveLength(2);
-
-      await updateKubeNodesFromDelete(mockNodeList.items[0]);
-      const cidrsAfterDelete = nodeCIDRs();
-      expect(cidrsAfterDelete).toHaveLength(1);
-      expect(cidrsAfterDelete[0].ipBlock?.cidr).toBe("10.0.0.2/32");
-      expect(mockApply).toHaveBeenCalled();
-    });
-  });
+	const mockNodeList = {
+		items: [
+			{
+				metadata: { name: "node1" },
+				status: {
+					addresses: [{ type: "InternalIP", address: "10.0.0.1" }],
+					conditions: [{ type: "Ready", status: "True" }],
+				},
+			},
+			{
+				metadata: { name: "node2" },
+				status: {
+					addresses: [{ type: "InternalIP", address: "10.0.0.2" }],
+					conditions: [{ type: "Ready", status: "True" }],
+				},
+			},
+		],
+	};
+
+	const mockNetworkPolicyList: V1NetworkPolicyList = {
+		apiVersion: "networking.k8s.io/v1",
+		kind: "NetworkPolicyList",
+		items: [
+			{
+				apiVersion: "networking.k8s.io/v1",
+				kind: "NetworkPolicy",
+				metadata: {
+					name: "example-policy",
+					namespace: "default",
+				},
+				spec: {
+					podSelector: {}, // required field
+					policyTypes: ["Egress"], // or ["Ingress"], or both
+					egress: [
+						{
+							to: [{ ipBlock: { cidr: "0.0.0.0/0" } }], // an IP we don't want
+						},
+					],
+				},
+			},
+		],
+	};
+
+	const mockK8sGetNodes = jest.fn<() => Promise<KubernetesList<kind.Node>>>();
+	const mockGetNetworkPolicies = jest.fn<() => Promise<KubernetesList<kind.NetworkPolicy>>>();
+	const mockApply = jest.fn();
+
+	beforeAll(() => {
+		(K8s as jest.Mock).mockImplementation(() => ({
+			Get: mockK8sGetNodes,
+			WithLabel: jest.fn(() => ({
+				Get: mockGetNetworkPolicies,
+			})),
+			Apply: mockApply,
+		}));
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe("initAllNodesTarget", () => {
+		it("should initialize nodeSet with internal IPs from nodes", async () => {
+			mockK8sGetNodes.mockResolvedValue(mockNodeList);
+			await initAllNodesTarget();
+			const cidrs = nodeCIDRs();
+			// Should have two IPs from mockNodeList
+			expect(cidrs).toHaveLength(2);
+			expect(cidrs).toEqual(
+				expect.arrayContaining([
+					{ ipBlock: { cidr: "10.0.0.1/32" } },
+					{ ipBlock: { cidr: "10.0.0.2/32" } },
+				]),
+			);
+		});
+	});
+
+	describe("nodeCIDRs", () => {
+		it("should return anywhere if no nodes known", async () => {
+			mockK8sGetNodes.mockResolvedValue({ items: [] });
+			await initAllNodesTarget();
+			const cidrs = nodeCIDRs();
+			// expect it to match "anywhere"
+			expect(cidrs).toEqual([anywhere]);
+		});
+	});
+
+	describe("updateKubeNodesFromCreateUpdate", () => {
+		it("should add a node IP if node is ready", async () => {
+			mockK8sGetNodes.mockResolvedValueOnce({ items: [] });
+			mockGetNetworkPolicies.mockResolvedValue(mockNetworkPolicyList);
+			await initAllNodesTarget(); // start empty
+			await updateKubeNodesFromCreateUpdate(mockNodeList.items[0]);
+			let cidrs = nodeCIDRs();
+			expect(cidrs).toHaveLength(1);
+			expect(cidrs[0].ipBlock?.cidr).toBe("10.0.0.1/32");
+			expect(mockApply).toHaveBeenCalled();
+
+			await updateKubeNodesFromCreateUpdate(mockNodeList.items[1]);
+			cidrs = nodeCIDRs();
+			expect(cidrs).toHaveLength(2);
+			expect(cidrs[1].ipBlock?.cidr).toBe("10.0.0.2/32");
+			expect(mockApply).toHaveBeenCalled();
+		});
+
+		it("should not add a node IP if node not ready", async () => {
+			const notReadyNode = {
+				metadata: { name: "node3" },
+				status: {
+					addresses: [{ type: "InternalIP", address: "10.0.0.3" }],
+					conditions: [{ type: "Ready", status: "False" }],
+				},
+			};
+			mockK8sGetNodes.mockResolvedValueOnce({ items: [] });
+			await initAllNodesTarget(); // start empty
+			await updateKubeNodesFromCreateUpdate(notReadyNode);
+			const cidrs = nodeCIDRs();
+			expect(cidrs).toEqual([anywhere]);
+			expect(mockApply).toHaveBeenCalled(); // Still called to update polices even if empty
+		});
+
+		it("should remove a node that's no longer ready", async () => {
+			mockK8sGetNodes.mockResolvedValue(mockNodeList);
+			await initAllNodesTarget();
+			let cidrs = nodeCIDRs();
+			// Should have two IPs from mockNodeList
+			expect(cidrs).toHaveLength(2);
+			expect(cidrs).toEqual(
+				expect.arrayContaining([
+					{ ipBlock: { cidr: "10.0.0.1/32" } },
+					{ ipBlock: { cidr: "10.0.0.2/32" } },
+				]),
+			);
+
+			const notReadyNode = {
+				metadata: { name: "node2" },
+				status: {
+					addresses: [{ type: "InternalIP", address: "10.0.0.1" }],
+					conditions: [{ type: "Ready", status: "False" }],
+				},
+			};
+			await updateKubeNodesFromCreateUpdate(notReadyNode);
+			cidrs = nodeCIDRs();
+			expect(cidrs).toHaveLength(1);
+			expect(cidrs).toEqual(expect.arrayContaining([{ ipBlock: { cidr: "10.0.0.2/32" } }]));
+			expect(mockApply).toHaveBeenCalled(); // Still called to update polices even if empty
+		});
+	});
+
+	describe("updateKubeNodesFromDelete", () => {
+		it("should remove the node IP from nodeSet", async () => {
+			mockK8sGetNodes.mockResolvedValueOnce(mockNodeList);
+			await initAllNodesTarget();
+			const cidrsBeforeDelete = nodeCIDRs();
+			expect(cidrsBeforeDelete).toHaveLength(2);
+
+			await updateKubeNodesFromDelete(mockNodeList.items[0]);
+			const cidrsAfterDelete = nodeCIDRs();
+			expect(cidrsAfterDelete).toHaveLength(1);
+			expect(cidrsAfterDelete[0].ipBlock?.cidr).toBe("10.0.0.2/32");
+			expect(mockApply).toHaveBeenCalled();
+		});
+	});
 });