fix artifact tests

Signed-off-by: nikpivkin <[email protected]>
aquasecurity · Aug 12, 2024 · d46a0fe · d46a0fe
1 parent aaef1b3
commit d46a0fe
Show file tree

Hide file tree

Showing 16 changed files with 270 additions and 225 deletions.
diff --git a/pkg/fanal/analyzer/analyzer.go b/pkg/fanal/analyzer/analyzer.go
@@ -214,7 +214,11 @@ func (r *AnalysisResult) Sort() {
 
 	// Misconfigurations
 	sort.Slice(r.Misconfigurations, func(i, j int) bool {
-		return r.Misconfigurations[i].FilePath < r.Misconfigurations[j].FilePath
+		if r.Misconfigurations[i].FileType != r.Misconfigurations[j].FileType {
+			return r.Misconfigurations[i].FileType < r.Misconfigurations[j].FileType
+		} else {
+			return r.Misconfigurations[i].FilePath < r.Misconfigurations[j].FilePath
+		}
 	})
 
 	// Secrets

diff --git a/pkg/fanal/artifact/local/fs_test.go b/pkg/fanal/artifact/local/fs_test.go
diff --git a/pkg/fanal/artifact/local/testdata/misconfig/azurearm/multiple-failures/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/azurearm/multiple-failures/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/azurearm/no-results/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/azurearm/no-results/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/azurearm/passed/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/azurearm/passed/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/azurearm/single-failure/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/azurearm/single-failure/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/...fanal/artifact/local/testdata/misconfig/cloudformation/multiple-failures/rego/policy.rego b/...fanal/artifact/local/testdata/misconfig/cloudformation/multiple-failures/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/no-results/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/no-results/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/params/code/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/params/code/rego/policy.rego
@@ -12,7 +12,9 @@
 #   severity: HIGH
 #   short_code: foo-bar-baz
 #   recommended_action: "Remove bad stuff"
-
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
 deny[res] {

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/passed/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/passed/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/single-failure/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/cloudformation/single-failure/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: cloud
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/multiple-failures/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/multiple-failures/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: kubernetes
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/no-results/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/no-results/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: kubernetes
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/passed/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/passed/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - "https://trivy.dev/"
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-buckets
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: kubernetes
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-buckets",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)

diff --git a/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/single-failure/rego/policy.rego b/pkg/fanal/artifact/local/testdata/misconfig/kubernetes/single-failure/rego/policy.rego
@@ -1,16 +1,19 @@
+# METADATA
+# title: Test policy
+# description: This is a test policy.
+# related_resources:
+# - https://trivy.dev/
+# custom:
+#   id: TEST001
+#   avd_id: AVD-TEST-0001
+#   severity: LOW
+#   short_code: no-evil
+#   recommended_actions: Have a cup of tea.
+#   input:
+#     selector:
+#     - type: kubernetes
 package user.something
 
-__rego_metadata__ := {
-	"id": "TEST001",
-	"avd_id": "AVD-TEST-0001",
-	"title": "Test policy",
-	"short_code": "no-evil",
-	"severity": "LOW",
-	"description": "This is a test policy.",
-	"recommended_actions": "Have a cup of tea.",
-	"url": "https://trivy.dev/",
-}
-
 # taken from defsec rego lib to mimic behaviour
 result(msg, cause) = result {
 	metadata := object.get(cause, "__defsec_metadata", cause)