POC

Signed-off-by: Austin Abro <[email protected]>

src/pkg/packager/filters/deploy.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/agnivade/levenshtein"
 	"github.com/defenseunicorns/pkg/helpers/v2"
-	"github.com/zarf-dev/zarf/src/api/v1alpha1"
+	"github.com/zarf-dev/zarf/src/api/v1beta1"
 	"github.com/zarf-dev/zarf/src/pkg/interactive"
 )
 
@@ -40,9 +40,9 @@ var (
 )
 
 // Apply applies the filter.
-func (f *deploymentFilter) Apply(pkg v1alpha1.ZarfPackage) ([]v1alpha1.ZarfComponent, error) {
-	var selectedComponents []v1alpha1.ZarfComponent
-	groupedComponents := map[string][]v1alpha1.ZarfComponent{}
+func (f *deploymentFilter) Apply(pkg v1beta1.ZarfPackage) ([]v1beta1.ZarfComponent, error) {
+	var selectedComponents []v1beta1.ZarfComponent
+	groupedComponents := map[string][]v1beta1.ZarfComponent{}
 	orderedComponentGroups := []string{}
 
 	// Group the components by Name and Group while maintaining order
@@ -66,16 +66,16 @@ func (f *deploymentFilter) Apply(pkg v1alpha1.ZarfPackage) ([]v1alpha1.ZarfCompo
 
 		// NOTE: This does not use forIncludedComponents as it takes group, default and required status into account.
 		for _, groupKey := range orderedComponentGroups {
-			var groupDefault *v1alpha1.ZarfComponent
-			var groupSelected *v1alpha1.ZarfComponent
+			var groupDefault *v1beta1.ZarfComponent
+			var groupSelected *v1beta1.ZarfComponent
 
 			for _, component := range groupedComponents[groupKey] {
 				// Ensure we have a local version of the component to point to (otherwise the pointer might change on us)
 				component := component
 
 				selectState, matchedRequest := includedOrExcluded(component.Name, f.requestedComponents)
 
-				if !component.IsRequired() {
+				if component.IsOptional() {
 					if selectState == excluded {
 						// If the component was explicitly excluded, record the match and continue
 						matchedRequests[matchedRequest] = true
@@ -161,7 +161,7 @@ func (f *deploymentFilter) Apply(pkg v1alpha1.ZarfPackage) ([]v1alpha1.ZarfCompo
 			} else {
 				component := groupedComponents[groupKey][0]
 
-				if component.IsRequired() {
+				if !component.IsOptional() {
 					selectedComponents = append(selectedComponents, component)
 					continue
 				}