Merge pull request #121 from armosec/dev

Fixed issues, update windows support

.github/workflows/build.yaml

@@ -5,6 +5,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+    types: [ closed ]
 jobs:
   once:
     name: Create release
@@ -36,10 +37,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
-
-      - name: Test
-        run: go test -v ./...
-
       - name: Build
         env:
           RELEASE: v1.0.${{ github.run_number }} 

.gitignore

@@ -1,4 +1,5 @@
 *.vs*
+*go.sum*
 *kubescape*
 *debug*
 .idea

cautils/apis/login_test.go

@@ -0,0 +1,41 @@
+package apis
+
+// func TestLogin2BE(t *testing.T) {
+
+// 	loginDetails := CustomerLoginDetails{Email: "lalafi@cyberarmor.io", Password: "***", CustomerName: "CyberArmorTests"}
+// 	res, err := BELogin(loginDetails, "login")
+// 	if err != nil {
+// 		t.Errorf("failed to get raw audit is different ")
+// 	}
+// 	k := res.ToLoginObject()
+
+// 	fmt.Printf("%v\n", k)
+
+// }
+
+// func TestGetMicroserviceOverview(t *testing.T) {
+// 	// client := &http.Client{}
+// 	loginDetails := CustomerLoginDetails{Email: "lalafi@cyberarmor.io", Password: "***", CustomerName: "CyberArmorTests"}
+// 	loginobj, err := BELogin(loginDetails, "login")
+// 	if err != nil {
+// 		t.Errorf("failed to get raw audit is different ")
+// 	}
+// 	k := loginobj.ToLoginObject()
+// 	beURL := GetBEInfo("")
+
+// 	res, err := BEHttpRequest(k, beURL,
+// 		"GET",
+// 		"v1/microservicesOverview",
+// 		nil,
+// 		BasicBEQuery,
+// 		k)
+
+// 	if err != nil {
+// 		t.Errorf("failed to get raw audit is different ")
+// 	}
+
+// 	s := string(res)
+
+// 	fmt.Printf("%v\n", s)
+
+// }

cautils/cautils/armometadata.go

@@ -191,7 +191,7 @@ func (clusterConfig *ClusterConfig) LoadConfigToEnv() {
 func SetEnv(key, value string) {
 	if e := os.Getenv(key); e == "" {
 		if err := os.Setenv(key, value); err != nil {
-			glog.Warningf("%s: %s", key, err.Error())
+			glog.Warning("%s: %s", key, err.Error())
 		}
 	}
 }

cautils/customerloader.go

@@ -88,7 +88,7 @@ func (c *ClusterConfig) GenerateURL() {
 		return
 	}
 	if c.configObj.CustomerAdminEMail != "" {
-		msgStr := fmt.Sprintf("To view all controls and get remediation's ask access permissions to %s from %s", u.String(), c.configObj.CustomerAdminEMail)
+		msgStr := fmt.Sprintf("To view all controls and get remediations ask access permissions to %s from %s", u.String(), c.configObj.CustomerAdminEMail)
 		InfoTextDisplay(os.Stdout, msgStr+"\n")
 		return
 	}
@@ -98,7 +98,7 @@ func (c *ClusterConfig) GenerateURL() {
 	q.Add("customerGUID", c.configObj.CustomerGUID)
 
 	u.RawQuery = q.Encode()
-	fmt.Println("To view all controls and get remediation's visit:")
+	fmt.Println("To view all controls and get remediations visit:")
 	InfoTextDisplay(os.Stdout, u.String()+"\n")
 
 }

cautils/display.go

@@ -24,8 +24,8 @@ var FailureDisplay = color.New(color.Bold, color.FgHiRed).FprintfFunc()
 var WarningDisplay = color.New(color.Bold, color.FgCyan).FprintfFunc()
 var FailureTextDisplay = color.New(color.Faint, color.FgHiRed).FprintfFunc()
 var InfoDisplay = color.New(color.Bold, color.FgHiYellow).FprintfFunc()
-var InfoTextDisplay = color.New(color.Bold, color.FgHiYellow).FprintfFunc()
-var SimpleDisplay = color.New().FprintfFunc()
+var InfoTextDisplay = color.New(color.Faint, color.FgHiYellow).FprintfFunc()
+var SimpleDisplay = color.New(color.Bold, color.FgHiWhite).FprintfFunc()
 var SuccessDisplay = color.New(color.Bold, color.FgHiGreen).FprintfFunc()
 var DescriptionDisplay = color.New(color.Faint, color.FgWhite).FprintfFunc()
 

cautils/opapolicy/resources/resourcesutils_test.go

@@ -1 +1,17 @@
 package resources
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestLoadRegoDependenciesFromDir(t *testing.T) {
+	dir, _ := os.Getwd()
+	t.Errorf("%s", filepath.Join(dir, "rego/dependencies"))
+	return
+	// modules := LoadRegoDependenciesFromDir("")
+	// if len(modules) == 0 {
+	// 	t.Errorf("modules len == 0")
+	// }
+}

policyhandler/filesloader_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/armosec/kubescape/cautils"
 )
 
-func combineYamlFile(base, rel string) string {
+func combine(base, rel string) string {
 	finalPath := []string{}
 	sBase := strings.Split(base, "/")
 	sRel := strings.Split(rel, "/")
@@ -25,30 +25,30 @@ func combineYamlFile(base, rel string) string {
 }
 func onlineBoutiquePath() string {
 	o, _ := os.Getwd()
-	return combineYamlFile(o, "kubescape/examples/online-boutique/*")
+	return combine(o, "github.com/armosec/kubescape/examples/online-boutique/*")
 }
 func TestListFiles(t *testing.T) {
-	// files, errs := listFiles([]string{onlineBoutiquePath()})
-	// if len(errs) > 0 {
-	// 	t.Error(errs)
-	// }
-	// expected := 12
-	// if len(files) != expected {
-	// 	t.Errorf("wrong number of files, expected: %d, found: %d", expected, len(files))
-	// }
+	files, errs := listFiles([]string{onlineBoutiquePath()})
+	if len(errs) > 0 {
+		t.Error(errs)
+	}
+	expected := 12
+	if len(files) != expected {
+		t.Errorf("wrong number of files, expected: %d, found: %d", expected, len(files))
+	}
 }
 
 func TestLoadFiles(t *testing.T) {
-	// files, _ := listFiles([]string{onlineBoutiquePath()})
-	// loadFiles(files)
+	files, _ := listFiles([]string{onlineBoutiquePath()})
+	loadFiles(files)
 }
 
 func TestLoadFile(t *testing.T) {
-	// files, _ := listFiles([]string{strings.Replace(onlineBoutiquePath(), "*", "adservice.yaml", 1)})
-	// _, err := loadFile(files[0])
-	// if err != nil {
-	// 	t.Errorf("%v", err)
-	// }
+	files, _ := listFiles([]string{strings.Replace(onlineBoutiquePath(), "*", "bi-monitor.yaml", 1)})
+	_, err := loadFile(files[0])
+	if err != nil {
+		t.Errorf("%v", err)
+	}
 }
 func TestLoadResources(t *testing.T) {
 

resultshandling/printer/printresults.go

@@ -134,7 +134,7 @@ func (printer *Printer) PrintResults() {
 func (printer *Printer) printSummary(controlName string, controlSummary *ControlSummary) {
 	cautils.SimpleDisplay(printer.writer, "Summary - ")
 	cautils.SuccessDisplay(printer.writer, "Passed:%v   ", controlSummary.TotalResources-controlSummary.TotalFailed)
-	cautils.WarningDisplay(printer.writer, "Excluded:%v   ", controlSummary.TotalWarnign)
+	cautils.WarningDisplay(printer.writer, "Warning:%v   ", controlSummary.TotalWarnign)
 	cautils.FailureDisplay(printer.writer, "Failed:%v   ", controlSummary.TotalFailed)
 	cautils.InfoDisplay(printer.writer, "Total:%v\n", controlSummary.TotalResources)
 	if controlSummary.TotalFailed > 0 {
@@ -151,7 +151,7 @@ func (printer *Printer) printTitle(controlName string, controlSummary *ControlSu
 	} else if controlSummary.TotalFailed != 0 {
 		cautils.FailureDisplay(printer.writer, "failed %v\n", emoji.SadButRelievedFace)
 	} else if controlSummary.TotalWarnign != 0 {
-		cautils.WarningDisplay(printer.writer, "excluded %v\n", emoji.NeutralFace)
+		cautils.WarningDisplay(printer.writer, "warning %v\n", emoji.NeutralFace)
 	} else {
 		cautils.SuccessDisplay(printer.writer, "passed %v\n", emoji.ThumbsUp)
 	}
@@ -194,7 +194,7 @@ func generateRow(control string, cs ControlSummary) []string {
 }
 
 func generateHeader() []string {
-	return []string{"Control Name", "Failed Resources", "Excluded Resources", "All Resources", "% success"}
+	return []string{"Control Name", "Failed Resources", "Warning Resources", "All Resources", "% success"}
 }
 
 func percentage(big, small int) int {