Merge branch 'main' into kube-lease-fixes

elastic · Apr 18, 2022 · 6109a9f · 6109a9f
2 parents fd8393a + 52b3c1e
commit 6109a9f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
@@ -43,16 +43,25 @@ type Finding struct {
 
 type Result struct {
 	Evaluation string      `json:"evaluation"`
+	Expected   interface{} `json:"expected"`
 	Evidence   interface{} `json:"evidence"`
 }
 
 type Rule struct {
-	Benchmark   Benchmark `json:"benchmark"`
-	Description string    `json:"description"`
-	Impact      string    `json:"impact"`
-	Name        string    `json:"name"`
-	Remediation string    `json:"remediation"`
-	Tags        []string  `json:"tags"`
+	Id        				 string    `json:"id"`
+	Name        			 string    `json:"name"`
+	Profile_Applicability    string    `json:"profile_applicability"`
+	Description 			 string    `json:"description"`
+	Rationale        		 string    `json:"rationale"`
+	Audit        			 string    `json:"audit"`
+	Remediation 			 string    `json:"remediation"`
+	Impact      			 string    `json:"impact"`
+	Default_Value        	 string    `json:"default_value"`
+	References        		 string    `json:"references"`
+	Section        			 string    `json:"section"`
+	Version 				 string    `json:"version"`
+	Tags        			 []string  `json:"tags"`
+	Benchmark   			 Benchmark `json:"benchmark"`
 }
 
 type Benchmark struct {

diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5
-	github.com/elastic/csp-security-policies v0.0.10-go-lib
+	github.com/elastic/csp-security-policies v0.0.13-go-lib
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-ini/ini v1.66.4 // indirect
 	github.com/go-logr/logr v1.2.2 // indirect

diff --git a/go.sum b/go.sum
@@ -515,8 +515,8 @@ github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+J
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5 h1:kINUJJmzJyws37K/4TXyUI9Odv/2vTjHlg8BXTXCtBA=
 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5/go.mod h1:PhsCH91qJN33+rN/L8q2jWILmswlezJ6T+MMM6EDc8g=
-github.com/elastic/csp-security-policies v0.0.10-go-lib h1:gZBxYdRIKsbrZ8swTN23N0FCxfQ7j2zA+IUEcNRaB90=
-github.com/elastic/csp-security-policies v0.0.10-go-lib/go.mod h1:24NNr0b/5HTGtndJOmhrefb59rd7NjuqI/To39tgn+w=
+github.com/elastic/csp-security-policies v0.0.13-go-lib h1:8xpTdtzJ3Cgdh2Gf+JCTqtjgjVusBAwaBHWsD+687y4=
+github.com/elastic/csp-security-policies v0.0.13-go-lib/go.mod h1:24NNr0b/5HTGtndJOmhrefb59rd7NjuqI/To39tgn+w=
 github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6 h1:nFvXHBjYK3e9+xF0WKDeAKK4aOO51uC28s+L9rBmilo=
 github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6/go.mod h1:uh/Gj9a0XEbYoM4NYz4LvaBVARz3QXLmlNjsrKY9fTc=
 github.com/elastic/elastic-agent-libs v0.1.1/go.mod h1:h8K/f7RcdxM2f19VahcS1jeco170ItqV9N7HyYsn9Ss=