fix(sensor): remove redundant warnings (#52)

* fix(sensor): remove redundant warnings Signed-off-by: Alessio Greggi <ale_grey_91@hotmail.it> * test(e2e): modify controlplaneinfo data Signed-off-by: Alessio Greggi <ale_grey_91@hotmail.it> * add kubescape logger Signed-off-by: Alessio Greggi <ale_grey_91@hotmail.it> --------- Signed-off-by: Alessio Greggi <ale_grey_91@hotmail.it>
kubescape · Jul 6, 2023 · ff7255f · ff7255f
1 parent 270945d
commit ff7255f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 31 deletions.
diff --git a/e2e/controlplaneinfo_kind_test.go b/e2e/controlplaneinfo_kind_test.go
@@ -11,58 +11,61 @@ var pkiFiles = &sensor.ControlPlaneInfo{
 	PKIDIr: &ds.FileInfo{Path: "/etc/kubernetes/pki"},
 	PKIFiles: []*ds.FileInfo{
 		{
-			Path: "/etc/kubernetes/pki/etcd/peer.crt",
+			Path: "/etc/kubernetes/pki/apiserver-etcd-client.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/healthcheck-client.crt",
+			Path: "/etc/kubernetes/pki/apiserver-etcd-client.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/ca.crt",
+			Path: "/etc/kubernetes/pki/apiserver-kubelet-client.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/ca.key",
+			Path: "/etc/kubernetes/pki/apiserver-kubelet-client.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/server.crt",
+			Path: "/etc/kubernetes/pki/apiserver.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/server.key",
+			Path: "/etc/kubernetes/pki/apiserver.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/healthcheck-client.key",
+			Path: "/etc/kubernetes/pki/ca.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/etcd/peer.key",
+			Path: "/etc/kubernetes/pki/ca.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/ca.crt",
+			Path: "/etc/kubernetes/pki/etcd/ca.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/apiserver.crt",
+			Path: "/etc/kubernetes/pki/etcd/ca.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/ca.key",
+			Path: "/etc/kubernetes/pki/etcd/healthcheck-client.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/front-proxy-client.crt",
+			Path: "/etc/kubernetes/pki/etcd/healthcheck-client.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/front-proxy-ca.key",
+			Path: "/etc/kubernetes/pki/etcd/peer.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/apiserver-etcd-client.crt",
+			Path: "/etc/kubernetes/pki/etcd/peer.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/front-proxy-ca.crt",
+			Path: "/etc/kubernetes/pki/etcd/server.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/apiserver-kubelet-client.crt",
+			Path: "/etc/kubernetes/pki/etcd/server.key",
 		},
 		{
-			Path: "/etc/kubernetes/pki/apiserver-etcd-client.key",
+			Path: "/etc/kubernetes/pki/front-proxy-ca.crt",
 		},
 		{
-			Path: "/etc/kubernetes/pki/apiserver.key",
+			Path: "/etc/kubernetes/pki/front-proxy-ca.key",
+		},
+		{
+			Path: "/etc/kubernetes/pki/front-proxy-client.crt",
 		},
 		{
 			Path: "/etc/kubernetes/pki/front-proxy-client.key",
@@ -73,9 +76,6 @@ var pkiFiles = &sensor.ControlPlaneInfo{
 		{
 			Path: "/etc/kubernetes/pki/sa.pub",
 		},
-		{
-			Path: "/etc/kubernetes/pki/apiserver-kubelet-client.key",
-		},
 	},
 }
 

diff --git a/e2e/controlplaneinfo_test.go b/e2e/controlplaneinfo_test.go
@@ -11,6 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	sensor "github.com/kubescape/host-scanner/sensor"
+	"github.com/kubescape/go-logger"
 )
 
 var _ = Describe("ControlPlaneInfo", func() {
@@ -41,9 +42,9 @@ var _ = Describe("ControlPlaneInfo", func() {
 			Expect(resultBody.PKIDIr.Path).To(Equal(pkiFiles.PKIDIr.Path))
 
 			// (leave it there for debugging)
-			//for i := range resultBody.PKIFiles {
-			//	fmt.Println(resultBody.PKIFiles[i].Path)
-			//}
+			for i := range resultBody.PKIFiles {
+				logger.L().Info(resultBody.PKIFiles[i].Path)
+			}
 			for i := range resultBody.PKIFiles {
 				Expect(resultBody.PKIFiles[i].Path).To(Equal(pkiFiles.PKIFiles[i].Path))
 			}

diff --git a/sensor/CNI.go b/sensor/CNI.go
@@ -86,19 +86,16 @@ func getCNINames(ctx context.Context) []string {
 	}
 
 	for _, cni := range supportedCNIs {
-		p, err := utils.LocateProcessByExecSuffix(cni.processSuffix)
+		p, _ := utils.LocateProcessByExecSuffix(cni.processSuffix)
 
 		if p != nil {
 			logger.L().Debug("CNI process found", helpers.String("name", cni.name))
 			CNIs = append(CNIs, cni.name)
 		}
+	}
 
-		if err != nil {
-			logger.L().Ctx(ctx).Warning("getCNIName- Failed to locate process for cni",
-				helpers.String("cni name", cni.name),
-				helpers.Error(err))
-		}
-
+	if len(CNIs) == 0 {
+		logger.L().Warning("No CNI found")
 	}
 
 	return CNIs

diff --git a/sensor/verboseutils.go b/sensor/verboseutils.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"sort"
 
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
@@ -79,6 +80,8 @@ func makeHostDirFilesInfoVerbose(ctx context.Context, dir string, recursive bool
 
 	var fileNames []string
 	for fileNames, err = dirInfo.Readdirnames(100); err == nil; fileNames, err = dirInfo.Readdirnames(100) {
+		// add sorting to make tests deterministic
+		sort.Strings(fileNames)
 		for i := range fileNames {
 			filePath := path.Join(dir, fileNames[i])