From 48eecb610e56a573b2416cece9259ac7c086a1d5 Mon Sep 17 00:00:00 2001
From: Austin Abro <AustinAbro321@gmail.com>
Date: Mon, 20 May 2024 14:25:27 +0000
Subject: [PATCH] refactored tests and added tests

---
 src/pkg/cluster/zarf_test.go | 51 ++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/pkg/cluster/zarf_test.go b/src/pkg/cluster/zarf_test.go
index 5fee88e2df..b9451f3e72 100644
--- a/src/pkg/cluster/zarf_test.go
+++ b/src/pkg/cluster/zarf_test.go
@@ -202,35 +202,48 @@ func TestPackageSecretNeedsWait(t *testing.T) {
 
 func TestGetDeployedPackage(t *testing.T) {
 	t.Parallel()
+	ctx := context.Background()
+	c := &Cluster{&k8s.K8s{Clientset: fake.NewSimpleClientset()}}
 
-	packageName := "test"
-	expected := &types.DeployedPackage{
-		Name: packageName,
+	packages := []types.DeployedPackage{
+		{Name: "package1"},
+		{Name: "package2"},
 	}
-	b, err := json.Marshal(expected)
-	require.NoError(t, err)
-	data := map[string][]byte{
-		"data": b,
+
+	for _, p := range packages {
+		b, err := json.Marshal(p)
+		require.NoError(t, err)
+		data := map[string][]byte{
+			"data": b,
+		}
+		secret := corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      strings.Join([]string{config.ZarfPackagePrefix, p.Name}, ""),
+				Namespace: "zarf",
+				Labels: map[string]string{
+					ZarfPackageInfoLabel: p.Name,
+				},
+			},
+			Data: data,
+		}
+		c.Clientset.CoreV1().Secrets("zarf").Create(ctx, &secret, metav1.CreateOptions{})
+		actual, err := c.GetDeployedPackage(ctx, p.Name)
+		require.NoError(t, err)
+		require.Equal(t, p, *actual)
 	}
-	secret := corev1.Secret{
+
+	nonPackageSecret := corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      strings.Join([]string{config.ZarfPackagePrefix, packageName}, ""),
+			Name:      "hello-world",
 			Namespace: "zarf",
 			Labels: map[string]string{
-				ZarfPackageInfoLabel: packageName,
+				ZarfPackageInfoLabel: "whatever",
 			},
 		},
-		Data: data,
 	}
-	ctx := context.Background()
-	c := &Cluster{&k8s.K8s{Clientset: fake.NewSimpleClientset()}}
-	c.Clientset.CoreV1().Secrets("zarf").Create(ctx, &secret, metav1.CreateOptions{})
-	actual, err := c.GetDeployedPackage(ctx, packageName)
-	require.NoError(t, err)
-	require.Equal(t, expected, actual)
+	c.Clientset.CoreV1().Secrets("zarf").Create(ctx, &nonPackageSecret, metav1.CreateOptions{})
 
 	actualList, err := c.GetDeployedZarfPackages(ctx)
 	require.NoError(t, err)
-	require.Equal(t, *expected, actualList[0])
-
+	require.ElementsMatch(t, packages, actualList)
 }