From 4488d684719512c1eef74ff889859b95e2fda7c0 Mon Sep 17 00:00:00 2001
From: Lucas Rodriguez <lucas.rodriguez@defenseunicorns.com>
Date: Wed, 22 May 2024 13:38:29 -0500
Subject: [PATCH 1/2] test: creator.ComposeComponents

---
 src/pkg/packager/creator/compose_test.go | 175 +++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 src/pkg/packager/creator/compose_test.go

diff --git a/src/pkg/packager/creator/compose_test.go b/src/pkg/packager/creator/compose_test.go
new file mode 100644
index 0000000000..fb2a9fae99
--- /dev/null
+++ b/src/pkg/packager/creator/compose_test.go
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+// Package creator contains functions for creating Zarf packages.
+package creator
+
+import (
+	"testing"
+
+	"github.com/defenseunicorns/zarf/src/types"
+	"github.com/stretchr/testify/require"
+)
+
+func TestComposeComponents(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name        string
+		pkg         types.ZarfPackage
+		flavor      string
+		expectedPkg types.ZarfPackage
+		expectedErr string
+	}{
+		{
+			name: "filter by architecture match",
+			pkg: types.ZarfPackage{
+				Metadata: types.ZarfMetadata{Architecture: "amd64"},
+				Components: []types.ZarfComponent{
+					{
+						Name: "component1",
+						Only: types.ZarfComponentOnlyTarget{
+							Cluster: types.ZarfComponentOnlyCluster{
+								Architecture: "amd64",
+							},
+						},
+					},
+					{
+						Name: "component2",
+						Only: types.ZarfComponentOnlyTarget{
+							Cluster: types.ZarfComponentOnlyCluster{
+								Architecture: "amd64",
+							},
+						},
+					},
+				},
+			},
+			expectedPkg: types.ZarfPackage{
+				Components: []types.ZarfComponent{
+					{Name: "component1"},
+					{Name: "component2"},
+				},
+			},
+			expectedErr: "",
+		},
+		{
+			name: "filter by architecture mismatch",
+			pkg: types.ZarfPackage{
+				Metadata: types.ZarfMetadata{Architecture: "amd64"},
+				Components: []types.ZarfComponent{
+					{
+						Name: "component1",
+						Only: types.ZarfComponentOnlyTarget{
+							Cluster: types.ZarfComponentOnlyCluster{
+								Architecture: "amd64",
+							},
+						},
+					},
+					{
+						Name: "component2",
+						Only: types.ZarfComponentOnlyTarget{
+							Cluster: types.ZarfComponentOnlyCluster{
+								Architecture: "arm64",
+							},
+						},
+					},
+				},
+			},
+			expectedPkg: types.ZarfPackage{
+				Components: []types.ZarfComponent{
+					{Name: "component1"},
+				},
+			},
+			expectedErr: "",
+		},
+		{
+			name: "filter by flavor match",
+			pkg: types.ZarfPackage{
+				Metadata: types.ZarfMetadata{Architecture: "amd64"},
+				Components: []types.ZarfComponent{
+					{
+						Name: "component1",
+						Only: types.ZarfComponentOnlyTarget{
+							Flavor: "default",
+						},
+					},
+					{
+						Name: "component2",
+						Only: types.ZarfComponentOnlyTarget{
+							Flavor: "default",
+						},
+					},
+				},
+			},
+			flavor: "default",
+			expectedPkg: types.ZarfPackage{
+				Components: []types.ZarfComponent{
+					{Name: "component1"},
+					{Name: "component2"},
+				},
+			},
+			expectedErr: "",
+		},
+		{
+			name: "filter by flavor mismatch",
+			pkg: types.ZarfPackage{
+				Metadata: types.ZarfMetadata{Architecture: "amd64"},
+				Components: []types.ZarfComponent{
+					{
+						Name: "component1",
+						Only: types.ZarfComponentOnlyTarget{
+							Flavor: "default",
+						},
+					},
+					{
+						Name: "component2",
+						Only: types.ZarfComponentOnlyTarget{
+							Flavor: "special",
+						},
+					},
+				},
+			},
+			flavor: "default",
+			expectedPkg: types.ZarfPackage{
+				Components: []types.ZarfComponent{
+					{Name: "component1"},
+				},
+			},
+			expectedErr: "",
+		},
+		{
+			name: "no architecture set error",
+			pkg: types.ZarfPackage{
+				Components: []types.ZarfComponent{
+					{
+						Name: "component1",
+						Only: types.ZarfComponentOnlyTarget{
+							Flavor: "default",
+						},
+					},
+				},
+			},
+			flavor:      "default",
+			expectedPkg: types.ZarfPackage{},
+			expectedErr: "cannot build import chain: architecture must be provided",
+		},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			pkg, _, err := ComposeComponents(tt.pkg, tt.flavor)
+
+			if tt.expectedErr == "" {
+				require.NoError(t, err)
+				require.Equal(t, tt.expectedPkg.Components, pkg.Components)
+				return
+			}
+
+			require.EqualError(t, err, tt.expectedErr)
+			require.Equal(t, tt.expectedPkg.Components, pkg.Components)
+		})
+	}
+}

From 55ac6aa7f3e7f1404aef6a50803ba998c05916ce Mon Sep 17 00:00:00 2001
From: Lucas Rodriguez <lucas.rodriguez@defenseunicorns.com>
Date: Wed, 22 May 2024 14:46:21 -0500
Subject: [PATCH 2/2] require empty pkg on error

---
 src/pkg/packager/creator/compose_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pkg/packager/creator/compose_test.go b/src/pkg/packager/creator/compose_test.go
index fb2a9fae99..7d1310bf3e 100644
--- a/src/pkg/packager/creator/compose_test.go
+++ b/src/pkg/packager/creator/compose_test.go
@@ -169,7 +169,7 @@ func TestComposeComponents(t *testing.T) {
 			}
 
 			require.EqualError(t, err, tt.expectedErr)
-			require.Equal(t, tt.expectedPkg.Components, pkg.Components)
+			require.Empty(t, tt.expectedPkg)
 		})
 	}
 }