Issue 110 tests improvements connlist pkg

cmd/netpolicy/cmd/diff.go

@@ -98,7 +98,7 @@ func newCommandDiff() *cobra.Command {
 	c.Flags().StringVarP(&dir1, "dir1", "", "", "Original Resources path to be compared")
 	c.Flags().StringVarP(&dir2, "dir2", "", "", "New Resources path to compare with original resources path")
 	supportedDiffFormats := strings.Join(diff.ValidDiffFormats, ",")
-	c.Flags().StringVarP(&outFormat, "output", "o", common.DefaultFormat, "Required output format ("+supportedDiffFormats+")")
+	c.Flags().StringVarP(&outFormat, "output", "o", common.DefaultFormat, getOutputFormatDescription(supportedDiffFormats))
 	// out file
 	c.Flags().StringVarP(&outFile, "file", "f", "", "Write output to specified file")
 	return c

cmd/netpolicy/cmd/list.go

@@ -32,6 +32,10 @@ var (
 	outFile       string // output file
 )
 
+func getOutputFormatDescription(validFormats string) string {
+	return fmt.Sprintf("Required output format (%s)", validFormats)
+}
+
 func runListCommand() error {
 	var conns []connlist.Peer2PeerConnection
 	var err error
@@ -131,7 +135,7 @@ defined`,
 		"Focus connections of specified workload in the output (<workload-name> or <workload-namespace/workload-name>)")
 	// output format - default txt
 	supportedFormats := strings.Join(connlist.ValidFormats, ",")
-	c.Flags().StringVarP(&output, "output", "o", common.DefaultFormat, "Required output format ("+supportedFormats+")")
+	c.Flags().StringVarP(&output, "output", "o", common.DefaultFormat, getOutputFormatDescription(supportedFormats))
 	// out file
 	c.Flags().StringVarP(&outFile, "file", "f", "", "Write output to specified file")
 	return c

pkg/netpol/common/netpol_commands_common.go

@@ -1,5 +1,7 @@
 package common
 
+import "os"
+
 // NetpolError holds information about a single error/warning that occurred during running
 // connectivity analysis command (list or diff)
 type NetpolError interface {
@@ -24,3 +26,16 @@ const (
 	DotHeader  = "digraph {"
 	DotClosing = "}"
 )
+
+// WriteToFile generates output to given file
+func WriteToFile(output, filePath string) error {
+	fp, err := os.Create(filePath)
+	if err != nil {
+		return err
+	}
+	_, err = fp.WriteString(output)
+	if err != nil {
+		return err
+	}
+	return nil
+}

pkg/netpol/eval/eval_test.go

@@ -1039,15 +1039,8 @@ func addNewPod(namespace, name string, labels map[string]string) (*v1.Pod, error
 }
 
 func writeRes(res, fileName string) {
-	_, err := os.Create(fileName)
-	if err != nil {
-		fmt.Printf("error creating file: %v", err)
-		return
-	}
-	b := []byte(res)
-	err = os.WriteFile(fileName, b, 0o600)
-	if err != nil {
-		fmt.Printf("error WriteFile: %v", err)
+	if err := common.WriteToFile(res, fileName); err != nil {
+		fmt.Printf("error writing to file: %v", err)
 	}
 }
 

tests/acs-security-demos-added-workloads/asset-cache_connlist_output.txt

@@ -0,0 +1 @@
+{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080

tests/acs-security-demos-added-workloads/backend_recommendation_connlist_output.txt

@@ -0,0 +1,4 @@
+backend/checkout[Deployment] => backend/recommendation[Deployment] : TCP 8080
+backend/recommendation[Deployment] => backend/catalog[Deployment] : TCP 8080
+backend/reports[Deployment] => backend/recommendation[Deployment] : TCP 8080
+frontend/webapp[Deployment] => backend/recommendation[Deployment] : TCP 8080

tests/acs-security-demos-added-workloads/frontend_asset-cache_connlist_output.txt

@@ -0,0 +1 @@
+{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080

tests/acs-security-demos-added-workloads/ingress-controller_connlist_output.txt

@@ -0,0 +1,4 @@
+{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
+{ingress-controller} => frontend/blog[Deployment] : TCP 8080
+{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
+{ingress-controller} => zeroday/zeroday[Deployment] : TCP 8080

tests/k8s_ingress_test/details-v1-79f774bdb9_connlist_output.txt

@@ -0,0 +1,13 @@
+0.0.0.0-255.255.255.255 => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => 0.0.0.0-255.255.255.255 : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => default/productpage-v1-6b746f74dc[ReplicaSet] : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => default/ratings-v1-b6994bb9[ReplicaSet] : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => default/reviews-v1-545db77b95[ReplicaSet] : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => default/reviews-v2-7bf8c9648f[ReplicaSet] : All Connections
+default/details-v1-79f774bdb9[ReplicaSet] => default/reviews-v3-84779c7bbc[ReplicaSet] : All Connections
+default/productpage-v1-6b746f74dc[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+default/ratings-v1-b6994bb9[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+default/reviews-v1-545db77b95[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+default/reviews-v2-7bf8c9648f[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+default/reviews-v3-84779c7bbc[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
+{ingress-controller} => default/details-v1-79f774bdb9[ReplicaSet] : TCP 9080

tests/onlineboutique_workloads/emailservice_connlist_output.txt

@@ -0,0 +1 @@
+default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080