add ability to parse network policy list from file

Author: mattfenwick

pkg/cli/utils.go

@@ -1,13 +1,16 @@
 package cli
 
 import (
+	"os"
+	"path/filepath"
+
+	"github.com/mattfenwick/collections/pkg/builtin"
+	"github.com/mattfenwick/collections/pkg/slice"
 	"github.com/mattfenwick/cyclonus/pkg/kube"
 	"github.com/mattfenwick/cyclonus/pkg/utils"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	networkingv1 "k8s.io/api/networking/v1"
-	"os"
-	"path/filepath"
 )
 
 func readPoliciesFromPath(policyPath string) ([]*networkingv1.NetworkPolicy, error) {
@@ -26,15 +29,25 @@ func readPoliciesFromPath(policyPath string) ([]*networkingv1.NetworkPolicy, err
 			return err
 		}
 
-		// try parsing a list first
+		// try parsing multiple policies separated by '---' lines
 		policies, err := utils.ParseYaml[[]*networkingv1.NetworkPolicy](bytes)
 		if err == nil {
 			log.Debugf("parsed %d policies from %s", len(*policies), path)
 			allPolicies = append(allPolicies, *policies...)
 			return nil
 		}
 
-		log.Debugf("failed to parse list from %s, falling back to parsing single policy", path)
+		log.Debugf("unable to parse multiple policies separated by '---' lines: %+v", err)
+
+		// try parsing a list
+		policyList, err := utils.ParseYamlStrict[networkingv1.NetworkPolicyList](bytes)
+		if err == nil {
+			allPolicies = append(allPolicies, slice.Map(builtin.Reference[networkingv1.NetworkPolicy], policyList.Items)...)
+			return nil
+		}
+
+		log.Debugf("unable to parse list of policies: %+v", err)
+
 		policy, err := utils.ParseYamlStrict[networkingv1.NetworkPolicy](bytes)
 		if err != nil {
 			return errors.WithMessagef(err, "unable to parse single policy from yaml at %s", path)

pkg/matcher/simplifier_tests.go

@@ -123,7 +123,7 @@ func RunSimplifierTests() {
 			}
 			port99OnUdp := &PortProtocolMatcher{
 				Port:     &port99,
-				Protocol: v1.ProtocolSCTP, // TODO should this be udp?
+				Protocol: v1.ProtocolUDP,
 			}
 
 			allMatcher := &AllPortMatcher{}