updated table to use tablewriter

Author: rayaisaiah

tools/azure-npm-to-cilium-validator/azure-npm-to-cilium-validator.go

@@ -5,8 +5,10 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"os"
 	"strings"
 
+	"github.com/olekukonko/tablewriter"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -372,41 +374,33 @@ func difference(slice1, slice2 []string) []string {
 
 func printMigrationSummary(namespaces *corev1.NamespaceList, policiesByNamespace map[string][]*networkingv1.NetworkPolicy, servicesByNamespace map[string][]*corev1.Service) {
 	fmt.Println("Migration Summary:")
-	fmt.Println("+------------------------------+-------------------------------+")
-	fmt.Printf("%-30s | %-30s \n", "Breaking Change", "No Policy Changes Needed")
-	fmt.Println("+------------------------------+-------------------------------+")
+
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetHeader([]string{"Breaking Change", "No Policy Changes Needed", "Details"})
+	table.SetRowLine(true)
 
 	// Get the endports of the network policies
 	ingressEndportNetworkPolicy, egressEndportNetworkPolicy := getEndportNetworkPolicies(policiesByNamespace)
-
-	// Print the network policies with endport
-	printPoliciesWithEndport(ingressEndportNetworkPolicy, egressEndportNetworkPolicy)
-
-	fmt.Println("+------------------------------+-------------------------------+")
+	// Add the network policies with endport
+	addPoliciesWithEndportToTable(table, ingressEndportNetworkPolicy, egressEndportNetworkPolicy)
 
 	// Get the cidr of the network policies
 	ingressPoliciesWithCIDR, egressPoliciesWithCIDR := getCIDRNetworkPolicies(policiesByNamespace)
-
-	// Print the network policies with CIDR
-	printPoliciesWithCIDR(ingressPoliciesWithCIDR, egressPoliciesWithCIDR)
-
-	fmt.Println("+------------------------------+-------------------------------+")
+	// Add the network policies with CIDR
+	addPoliciesWithCIDRToTable(table, ingressPoliciesWithCIDR, egressPoliciesWithCIDR)
 
 	// Get the egress of the network policies
 	egressPolicies := getEgressPolicies(policiesByNamespace)
-
-	// Print the network policies with egress
-	printEgressPolicies(egressPolicies)
-
-	fmt.Println("+------------------------------+-------------------------------+")
+	// Add the network policies with egress
+	addEgressPoliciesToTable(table, egressPolicies)
 
 	// Get services that have externalTrafficPolicy!=Local
 	unsafeRiskServices, unsafeNoSelectorServices := getExternalTrafficPolicyClusterServices(namespaces, servicesByNamespace, policiesByNamespace)
+	// Add the services that are at risk
+	addUnsafeServicesToTable(table, unsafeRiskServices, unsafeNoSelectorServices)
 
-	// Print the services that are at risk
-	printUnsafeServices(unsafeRiskServices, unsafeNoSelectorServices)
+	table.Render()
 
-	fmt.Println("+------------------------------+-------------------------------+")
 	if len(ingressEndportNetworkPolicy) > 0 || len(egressEndportNetworkPolicy) > 0 ||
 		len(ingressPoliciesWithCIDR) > 0 || len(egressPoliciesWithCIDR) > 0 ||
 		len(egressPolicies) > 0 ||
@@ -420,88 +414,80 @@ func printMigrationSummary(namespaces *corev1.NamespaceList, policiesByNamespace
 	}
 }
 
-func printPoliciesWithEndport(ingressEndportNetworkPolicy, egressEndportNetworkPolicy []string) {
+func addPoliciesWithEndportToTable(table *tablewriter.Table, ingressEndportNetworkPolicy, egressEndportNetworkPolicy []string) {
 	if len(ingressEndportNetworkPolicy) == 0 && len(egressEndportNetworkPolicy) == 0 {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with endport", "✅")
+		table.Append([]string{"NetworkPolicy with endport", "✅", ""})
 	} else {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with endport", "❌")
-		fmt.Println("Policies affected:")
+		table.Append([]string{"NetworkPolicy with endport", "❌", "Policies affected:"})
 		for _, policy := range ingressEndportNetworkPolicy {
 			policyNamespace := strings.Split(policy, "/")[0]
 			policyName := strings.Split(policy, "/")[1]
-			fmt.Printf("❌ Found NetworkPolicy: \033[31m%s\033[0m with ingress endPort field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)
+			table.Append([]string{"", "❌", fmt.Sprintf("Found NetworkPolicy: \033[31m%s\033[0m with ingress endPort field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)})
 		}
 		for _, policy := range egressEndportNetworkPolicy {
 			policyNamespace := strings.Split(policy, "/")[0]
 			policyName := strings.Split(policy, "/")[1]
-			fmt.Printf("❌ Found NetworkPolicy: \033[31m%s\033[0m with engress endPort field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)
+			table.Append([]string{"", "❌", fmt.Sprintf("Found NetworkPolicy: \033[31m%s\033[0m\n with egress endPort field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)})
 		}
 	}
 }
 
-func printPoliciesWithCIDR(ingressPoliciesWithCIDR, egressPoliciesWithCIDR []string) {
+func addPoliciesWithCIDRToTable(table *tablewriter.Table, ingressPoliciesWithCIDR, egressPoliciesWithCIDR []string) {
 	if len(ingressPoliciesWithCIDR) == 0 && len(egressPoliciesWithCIDR) == 0 {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with CIDR", "✅")
+		table.Append([]string{"NetworkPolicy with CIDR", "✅", ""})
 	} else {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with CIDR", "❌")
-		fmt.Println("Policies affected:")
+		table.Append([]string{"NetworkPolicy with CIDR", "❌", "Policies affected:"})
 		for _, policy := range ingressPoliciesWithCIDR {
 			policyNamespace := strings.Split(policy, "/")[0]
 			policyName := strings.Split(policy, "/")[1]
-			fmt.Printf("❌ Found NetworkPolicy: \033[31m%s\033[0m with ingress CIDR field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)
+			table.Append([]string{"", "❌", fmt.Sprintf("Found NetworkPolicy: \033[31m%s\033[0m with ingress CIDR field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)})
 		}
 		for _, policy := range egressPoliciesWithCIDR {
 			policyNamespace := strings.Split(policy, "/")[0]
 			policyName := strings.Split(policy, "/")[1]
-			fmt.Printf("❌ Found NetworkPolicy: \033[31m%s\033[0m with egress CIDR field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)
+			table.Append([]string{"", "❌", fmt.Sprintf("Found NetworkPolicy: \033[31m%s\033[0m with egress CIDR field in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)})
 		}
 	}
 }
 
-func printEgressPolicies(egressPolicies []string) {
+func addEgressPoliciesToTable(table *tablewriter.Table, egressPolicies []string) {
 	if len(egressPolicies) == 0 {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with egress", "✅")
+		table.Append([]string{"NetworkPolicy with egress (Not allow all egress)", "✅", ""})
 	} else {
-		fmt.Printf("%-30s | %-30s \n", "NetworkPolicy with egress", "❌")
-		fmt.Printf("%-30s | %-30s \n", "(Not allow all egress)", "")
-		fmt.Println("Policies affected:")
+		table.Append([]string{"NetworkPolicy with egress (Not allow all egress)", "❌", "Policies affected:"})
 		for _, policy := range egressPolicies {
 			policyNamespace := strings.Split(policy, "/")[0]
 			policyName := strings.Split(policy, "/")[1]
-			fmt.Printf("❌ Found NetworkPolicy: \033[31m%s\033[0m with egress field (non-allow all) in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)
+			table.Append([]string{"", "❌", fmt.Sprintf("Found NetworkPolicy: \033[31m%s\033[0m with egress field (non-allow all) in namespace: \033[31m%s\033[0m\n", policyName, policyNamespace)})
 		}
 	}
 }
 
-func printUnsafeServices(unsafeRiskServices, unsafeNoSelectorServices []string) {
+func addUnsafeServicesToTable(table *tablewriter.Table, unsafeRiskServices, unsafeNoSelectorServices []string) {
 	// If there is no unsafe services and services with no selectors then migration is safe for services with extranalTrafficPolicy=Cluster
 	if len(unsafeRiskServices) == 0 {
-		fmt.Printf("%-30s | %-30s \n", "Disruption for some", "✅")
-		fmt.Printf("%-30s | %-30s \n", "Services with", "")
-		fmt.Printf("%-30s | %-30s \n", "externalTrafficPolicy=Cluster", "")
+		table.Append([]string{"Disruption for some Services with externalTrafficPolicy=Cluster", "✅", ""})
 	} else {
 		// Remove all no selector services from unsafe services to prevent repeating the same flagged service
 		unsafeRiskServices = difference(unsafeRiskServices, unsafeNoSelectorServices)
-		fmt.Printf("%-30s | %-30s \n", "Disruption for some", "❌")
-		fmt.Printf("%-30s | %-30s \n", "Services with", "")
-		fmt.Printf("%-30s | %-30s \n", "externalTrafficPolicy=Cluster", "")
+		table.Append([]string{"Disruption for some Services with externalTrafficPolicy=Cluster", "❌", "Services affected:"})
 		fmt.Println("Services affected:")
 		// If there are any no selector services or unsafe services then print them as they could be impacted by migration
 		if len(unsafeNoSelectorServices) > 0 {
 			for _, service := range unsafeNoSelectorServices {
 				serviceName := strings.Split(service, "/")[1]
 				serviceNamespace := strings.Split(service, "/")[0]
-				fmt.Printf("❌ Found Service: \033[31m%s\033[0m without selectors in namespace: \033[31m%s\033[0m\n", serviceName, serviceNamespace)
+				table.Append([]string{"", "❌", fmt.Sprintf("Found Service: \033[31m%s\033[0m without selectors in namespace: \033[31m%s\033[0m\n", serviceName, serviceNamespace)})
 			}
 		}
 		if len(unsafeRiskServices) > 0 {
 			for _, service := range unsafeRiskServices {
 				serviceName := strings.Split(service, "/")[1]
 				serviceNamespace := strings.Split(service, "/")[0]
-				fmt.Printf("❌ Found Service: \033[31m%s\033[0m with selectors in namespace: \033[31m%s\033[0m\n", serviceName, serviceNamespace)
+				table.Append([]string{"", "❌", fmt.Sprintf("Found Service: \033[31m%s\033[0m with selectors in namespace: \033[31m%s\033[0m\n", serviceName, serviceNamespace)})
 			}
 		}
-		fmt.Println("Manual investigation is required to evaluate if ingress is allowed to the service's backend Pods.")
-		fmt.Println("Please evaluate if these services would be impacted by migration.")
+		table.Append([]string{"", "", "Manual investigation is required to evaluate if ingress is allowed to the service's backend Pods."})
+		table.Append([]string{"", "", "Please evaluate if these services would be impacted by migration."})
 	}
 }

tools/azure-npm-to-cilium-validator/go.mod

@@ -3,6 +3,7 @@ module azure-npm-to-cilium-validator
 go 1.16
 
 require (
+	github.com/olekukonko/tablewriter v0.0.5
 	k8s.io/api v0.23.0
 	k8s.io/apimachinery v0.23.0
 	k8s.io/client-go v0.23.0

tools/azure-npm-to-cilium-validator/go.sum

@@ -186,6 +186,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -200,6 +202,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=