test (kubescape#99)

* test

Signed-off-by: David Wertenteil <[email protected]>

* adding to PR review

Signed-off-by: David Wertenteil <[email protected]>

* fixed race testing

Signed-off-by: David Wertenteil <[email protected]>

* fixing coverage function

* fixing coverage function in pr.yaml

---------

Signed-off-by: David Wertenteil <[email protected]>
Co-authored-by: Yuval Leibovich <[email protected]>

Author: David Wertenteil

.github/workflows/pr.yaml

@@ -17,12 +17,22 @@ jobs:
       uses: actions/setup-go@v2
       with:
         go-version: 1.19
-    
-    - name: Test
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Test race
       run: go test -v -race ./...
-        
+      
+    - name: Test units
+      run: go test -v ./... -covermode=count -coverprofile=coverage.out
+
+    - name: Convert coverage to lcov
+      uses: jandelgado/gcov2lcov-action@v1
+      
+    - name: Coveralls
+      uses: coverallsapp/github-action@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: coverage.lcov
+
     - name: Build
       run: go build -v ./...
 

.github/workflows/release.yaml

@@ -19,6 +19,9 @@ jobs:
     - name: Test
       run: go test -v ./... -covermode=count -coverprofile=coverage.out
 
+    - name: Convert coverage to lcov
+      uses: jandelgado/gcov2lcov-action@v1
+
     - name: Coveralls
       uses: coverallsapp/github-action@v1
       with:

reporthandling/datastructures.go

@@ -53,19 +53,18 @@ type PolicyRule struct {
 
 // Control represents a collection of rules which are combined together to single purpose
 type Control struct {
-	armotypes.PortalBase `json:",inline" bson:"inline"`
-	Control_ID           string              `json:"id,omitempty" bson:"id,omitempty"  ` // to be Deprecated
-	ControlID            string              `json:"controlID" bson:"controlID"`
-	CreationTime         string              `json:"creationTime" bson:"creationTime"`
-	Description          string              `json:"description" bson:"description"`
-	Remediation          string              `json:"remediation" bson:"remediation"`
-	Rules                []PolicyRule        `json:"rules" bson:"rules,omitempty"`
-	FrameworkNames       []string            `json:"frameworkNames,omitempty" bson:"frameworkNames,omitempty"` // frameworks this control is part of
-	FixedInput           map[string][]string `json:"fixedInput,omitempty"`                                     // DEPRECATED
-	// for new list of  rules in POST/UPADTE requests
-	RulesIDs              *[]string `json:"rulesIDs,omitempty" bson:"rulesIDs,omitempty"`
-	BaseScore             float32   `json:"baseScore,omitempty" bson:"baseScore,omitempty"`
-	ARMOImprovementFactor float32   `json:"ARMOImprovementFactor,omitempty" bson:"ARMOImprovementFactor,omitempty"`
+	FixedInput            map[string][]string `json:"fixedInput,omitempty"`
+	RulesIDs              *[]string           `json:"rulesIDs,omitempty" bson:"rulesIDs,omitempty"`
+	armotypes.PortalBase  `json:",inline" bson:"inline"`
+	Control_ID            string       `json:"id,omitempty" bson:"id,omitempty"  `
+	ControlID             string       `json:"controlID" bson:"controlID"`
+	CreationTime          string       `json:"creationTime" bson:"creationTime"`
+	Description           string       `json:"description" bson:"description"`
+	Remediation           string       `json:"remediation" bson:"remediation"`
+	Rules                 []PolicyRule `json:"rules" bson:"rules,omitempty"`
+	FrameworkNames        []string     `json:"frameworkNames,omitempty" bson:"frameworkNames,omitempty"`
+	BaseScore             float32      `json:"baseScore,omitempty" bson:"baseScore,omitempty"`
+	ARMOImprovementFactor float32      `json:"ARMOImprovementFactor,omitempty" bson:"ARMOImprovementFactor,omitempty"`
 }
 
 type UpdatedControl struct {