fix e2e-tests

tenable · Apr 18, 2021 · d3ff6be · d3ff6be
1 parent 1825779
commit d3ff6be
Show file tree

Hide file tree

Showing 25 changed files with 206 additions and 52 deletions.
diff --git a/pkg/results/types.go b/pkg/results/types.go
@@ -34,7 +34,7 @@ type Violation struct {
 	ResourceType string      `json:"resource_type" yaml:"resource_type" xml:"resource_type,attr"`
 	ResourceData interface{} `json:"-" yaml:"-" xml:"-"`
 	File         string      `json:"file" yaml:"file" xml:"file,attr"`
-	RootPath     string      `json:"root_path,omitempty" yaml:"root_path,omitempty" xml:"root_path,omitempty"`
+	RootPath     string      `json:"root_path,omitempty" yaml:"root_path,omitempty" xml:"root_path,attr,omitempty"`
 	LineNumber   int         `json:"line" yaml:"line" xml:"line,attr"`
 }
 

diff --git a/test/e2e/scan/golden/resource_skipping/terraform_file_resource_skipping.txt b/test/e2e/scan/golden/resource_skipping/terraform_file_resource_skipping.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi6",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 85
       },
       {
@@ -21,6 +22,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -32,6 +34,7 @@
         "resource_name": "PtShGgAdi1",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 10
       },
       {
@@ -43,6 +46,7 @@
         "resource_name": "PtShGgAdi2",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 25
       },
       {
@@ -54,6 +58,7 @@
         "resource_name": "PtShGgAdi5",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 71
       },
       {
@@ -65,6 +70,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -76,6 +82,7 @@
         "resource_name": "PtShGgAdi6",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 85
       },
       {
@@ -87,6 +94,7 @@
         "resource_name": "PtShGgAdi2",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 25
       },
       {
@@ -98,6 +106,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -109,6 +118,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -120,6 +130,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],
@@ -134,6 +145,7 @@
         "resource_name": "PtShGgAdi4",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 55
       },
       {
@@ -146,6 +158,7 @@
         "resource_name": "PtShGgAdi4",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 55
       },
       {
@@ -158,6 +171,7 @@
         "resource_name": "PtShGgAdi5",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 71
       }
     ],

diff --git a/test/e2e/scan/golden/rules_filtering/scan_and_skip_rules.txt b/test/e2e/scan/golden/rules_filtering/scan_and_skip_rules.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -21,6 +22,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],

diff --git a/test/e2e/scan/golden/rules_filtering/scan_multiple_rules.txt b/test/e2e/scan/golden/rules_filtering/scan_multiple_rules.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -21,6 +22,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -32,6 +34,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -43,6 +46,7 @@
         "resource_name": "PtShGgAdi2",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 25
       },
       {
@@ -54,6 +58,7 @@
         "resource_name": "PtShGgAdi4",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 55
       },
       {
@@ -65,6 +70,7 @@
         "resource_name": "PtShGgAdi5",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 69
       },
       {
@@ -76,6 +82,7 @@
         "resource_name": "PtShGgAdi6",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 82
       },
       {
@@ -87,6 +94,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],

diff --git a/test/e2e/scan/golden/rules_filtering/scan_single_rule.txt b/test/e2e/scan/golden/rules_filtering/scan_single_rule.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],

diff --git a/test/e2e/scan/golden/rules_filtering/skip_multiple_rules.txt b/test/e2e/scan/golden/rules_filtering/skip_multiple_rules.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],

diff --git a/test/e2e/scan/golden/rules_filtering/skip_single_rule.txt b/test/e2e/scan/golden/rules_filtering/skip_single_rule.txt
@@ -10,6 +10,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -21,6 +22,7 @@
         "resource_name": "PtShGgAdi6",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 82
       },
       {
@@ -32,6 +34,7 @@
         "resource_name": "PtShGgAdi2",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 25
       },
       {
@@ -43,6 +46,7 @@
         "resource_name": "PtShGgAdi5",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 69
       },
       {
@@ -54,6 +58,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       },
       {
@@ -65,6 +70,7 @@
         "resource_name": "PtShGgAdi4",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 55
       },
       {
@@ -76,6 +82,7 @@
         "resource_name": "PtShGgAdi1",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 10
       },
       {
@@ -87,6 +94,7 @@
         "resource_name": "PtShGgAdi3",
         "resource_type": "aws_db_instance",
         "file": "main.tf",
+        "root_path": "./",
         "line": 39
       }
     ],

diff --git a/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_human.txt b/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_human.txt
@@ -2,6 +2,7 @@ Violation Details -
 
 	Description    :	Enable AWS AMI Encryption
 	File           :	main.tf
+	Root Path      :	./
 	Line           :	5
 	Severity       :	MEDIUM
 

diff --git a/...2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_human_verbose.txt b/...2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_human_verbose.txt
@@ -2,6 +2,7 @@ Violation Details -
 
 	Description    :	Enable AWS AMI Encryption
 	File           :	main.tf
+	Root Path      :	./
 	Line           :	5
 	Severity       :	MEDIUM
 	Rule Name      :	amiNotEncrypted

diff --git a/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_json.txt b/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_json.txt
@@ -10,6 +10,7 @@
         "resource_name": "awsAmiEncrypted",
         "resource_type": "aws_ami",
         "file": "main.tf",
+        "root_path": "./",
         "line": 5
       }
     ],

diff --git a/...e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_json_recursive.txt b/...e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_json_recursive.txt
@@ -0,0 +1,29 @@
+{
+  "results": {
+    "violations": [
+      {
+        "rule_name": "amiNotEncrypted",
+        "description": "Enable AWS AMI Encryption",
+        "rule_id": "AWS.EC2.Encryption\u0026KeyManagement.Medium.0688",
+        "severity": "MEDIUM",
+        "category": "Encryption \u0026 KeyManagement",
+        "resource_name": "awsAmiEncrypted",
+        "resource_type": "aws_ami",
+        "file": "subFolder1/subFolder2/main.tf",
+        "root_path": "subFolder1/subFolder2",
+        "line": 5
+      }
+    ],
+    "skipped_violations": null,
+    "scan_summary": {
+      "file/folder": "/Users/pankajpatil/go/src/github.com/patilpankaj212/terrascan/test/e2e/test_data/iac/terraform_recursive",
+      "iac_type": "terraform",
+      "scanned_at": "2021-04-18 12:45:51.597994 +0000 UTC",
+      "policies_validated": 7,
+      "violated_policies": 1,
+      "low": 0,
+      "medium": 1,
+      "high": 0
+    }
+  }
+}
diff --git a/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_xml.txt b/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_xml.txt
@@ -1,7 +1,7 @@
 <results>
   <passed_rules></passed_rules>
   <violations>
-    <violation rule_name="amiNotEncrypted" description="Enable AWS AMI Encryption" rule_id="AWS.EC2.Encryption&amp;KeyManagement.Medium.0688" severity="MEDIUM" category="Encryption &amp; KeyManagement" resource_name="awsAmiEncrypted" resource_type="aws_ami" file="main.tf" line="5"></violation>
+    <violation rule_name="amiNotEncrypted" description="Enable AWS AMI Encryption" rule_id="AWS.EC2.Encryption&amp;KeyManagement.Medium.0688" severity="MEDIUM" category="Encryption &amp; KeyManagement" resource_name="awsAmiEncrypted" resource_type="aws_ami" file="main.tf" root_path="./" line="5"></violation>
   </violations>
   <skipped_violations></skipped_violations>
   <scan_summary file_folder="/Users/apple/go/src/github.com/patilpankaj212/terrascan/test/e2e/test_data/iac/aws/aws_ami_violation" iac_type="terraform" scanned_at="2021-03-02 15:46:23.06028 +0000 UTC" policies_validated="7" violated_policies="1" low="0" medium="1" high="0"></scan_summary>

diff --git a/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_yaml.txt b/test/e2e/scan/golden/terraform_scans/aws/aws_ami_violations/aws_ami_violation_yaml.txt
@@ -8,6 +8,7 @@ results:
           resource_name: awsAmiEncrypted
           resource_type: aws_ami
           file: main.tf
+          root_path: ./
           line: 5
     skipped_violations: []
     scan_summary: