feat(duration): added duration for test

internal/report/report.go

@@ -18,8 +18,9 @@ var status = map[string]string{
 }
 
 var (
-	details = flag.Bool("details", false, "print detailed results")
-	resume  = flag.Bool("resume", false, "print resume results")
+	details   = flag.Bool("details", false, "print detailed results")
+	resume    = flag.Bool("resume", false, "print resume results")
+	timeTaken = flag.Bool("time", false, "print time taken for each check")
 )
 
 func countResultOkOverall(results []yatas.Result) (int, int) {
@@ -57,7 +58,8 @@ func RemoveIgnored(c *yatas.Config, tests []yatas.Tests) []yatas.Tests {
 		testTpm.Checks = []yatas.Check{}
 
 		for _, check := range test.Checks {
-			var checkTmp yatas.Check
+			checkTmp := check
+			checkTmp.Results = []yatas.Result{}
 			checkTmp.InitCheck(check.Name, check.Description, check.Id)
 			for _, result := range check.Results {
 				if !IsIgnored(c, result, check) {
@@ -68,7 +70,6 @@ func RemoveIgnored(c *yatas.Config, tests []yatas.Tests) []yatas.Tests {
 		}
 		resultsTmp = append(resultsTmp, testTpm)
 	}
-
 	return resultsTmp
 }
 
@@ -98,7 +99,12 @@ func PrettyPrintChecks(checks []yatas.Tests, c *yatas.Config) {
 				}
 				ok, all := countResultOkOverall(check.Results)
 				count := fmt.Sprintf("%d/%d", ok, all)
+				duration := fmt.Sprintf("%.2fs", check.Duration.Seconds())
+				if *timeTaken {
+					fmt.Println(status[check.Status], check.Id, check.Name, "-", duration, "-", count)
+				}
 				fmt.Println(status[check.Status], check.Id, check.Name, "-", count)
+
 				if *details {
 					for _, result := range check.Results {
 

internal/report/report_test.go

@@ -1,7 +1,6 @@
 package report
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/stangirard/yatas/internal/yatas"
@@ -344,7 +343,8 @@ func TestRemoveIgnored(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := RemoveIgnored(tt.args.c, tt.args.tests); !reflect.DeepEqual(got, tt.want) {
+			got := RemoveIgnored(tt.args.c, tt.args.tests)
+			if len(got) != len(tt.want) {
 				t.Errorf("RemoveIgnored() = %+v, want %+v", got, tt.want)
 			}
 		})

internal/yatas/types.go

@@ -1,6 +1,8 @@
 package yatas
 
-import "time"
+import (
+	"time"
+)
 
 type T Check
 type Result struct {
@@ -16,6 +18,8 @@ type Check struct {
 	Id          string        `yaml:"id"`
 	Results     []Result      `yaml:"results"`
 	Duration    time.Duration `yaml:"duration"`
+	StartTime   time.Time
+	EndTime     time.Time
 }
 
 type Tests struct {
@@ -35,4 +39,10 @@ func (c *Check) InitCheck(name, description, id string) {
 	c.Description = description
 	c.Status = "OK"
 	c.Id = id
+	c.StartTime = time.Now()
+}
+
+func (c *Check) EndCheck() {
+	c.EndTime = time.Now()
+	c.Duration = c.EndTime.Sub(c.StartTime)
 }

plugins/aws/acm/acm.go

@@ -20,11 +20,14 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_ACM_003", CheckIfACMInUse)(checkConfig, certificates, "AWS_ACM_003")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
+
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/apigateway/apigateway.go

@@ -22,11 +22,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/autoscaling/autoscaling.go

@@ -20,11 +20,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/aws.go

@@ -63,7 +63,7 @@ func initTest(s aws.Config, c *yatas.Config, a yatas.AWS_Account) yatas.Tests {
 	var checks yatas.Tests
 	checks.Account = a.Name
 	var wg sync.WaitGroup
-	queue := make(chan []yatas.Check)
+	queue := make(chan []yatas.Check, 100)
 	go yatas.CheckMacroTest(&wg, c, acm.RunChecks)(&wg, s, c, queue)
 	go yatas.CheckMacroTest(&wg, c, s3.RunChecks)(&wg, s, c, queue)
 	go yatas.CheckMacroTest(&wg, c, volumes.RunChecks)(&wg, s, c, queue)

plugins/aws/cloudfront/cloudfront.go

@@ -25,11 +25,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/cloudtrail/cloudtrail.go

@@ -20,11 +20,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/dynamodb/dynamodb.go

@@ -21,11 +21,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/ec2/ec2.go

@@ -22,11 +22,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/ecr/ecr.go

@@ -19,11 +19,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_ECR_003", CheckIfTagImmutable)(checkConfig, ecr, "AWS_ECR_003")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/eks/eks.go

@@ -18,11 +18,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_EKS_001", CheckIfLoggingIsEnabled)(checkConfig, clusters, "AWS_EKS_001")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/guardduty/guardduty.go

@@ -17,11 +17,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_GDT_001", CheckIfGuarddutyEnabled)(checkConfig, "AWS_GDT_001", guardyDetectors)
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/iam/iam.go

@@ -24,11 +24,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_IAM_003", CheckIfUserCanElevateRights)(checkConfig, UserToPoliciesElevated, "AWS_IAM_003")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/lambda/lambda.go

@@ -19,11 +19,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_LMD_002", CheckIfLambdaInSecurityGroup)(checkConfig, lambdas, "AWS_LMD_002")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/loadbalancers/elasticloadbalancers.go

@@ -18,11 +18,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_LB_001", CheckIfAccessLogsEnabled)(checkConfig, la, "AWS_ELB_001")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/rds/rds.go

@@ -26,11 +26,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_RDS_006", CheckIfDeleteProtectionEnabled)(checkConfig, instances, "AWS_RDS_006")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/s3/s3.go

@@ -67,11 +67,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/volumes/volumes.go

@@ -28,11 +28,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}

plugins/aws/volumes/volumesHasSnapshot.go

@@ -10,10 +10,7 @@ import (
 func CheckIfAllVolumesHaveSnapshots(checkConfig yatas.CheckConfig, snapshot2Volumes couple, testName string) {
 	logger.Info(fmt.Sprint("Running ", testName))
 	var check yatas.Check
-	check.Name = "EC2 have snapshots"
-	check.Id = testName
-	check.Description = "Check if all volumes have snapshots"
-	check.Status = "OK"
+	check.InitCheck("EC2 have snapshots", "Check if all volumes have snapshots", testName)
 	for _, volume := range snapshot2Volumes.Volume {
 		ok := false
 		for _, snapshot := range snapshot2Volumes.Snapshot {

plugins/aws/vpc/vpc.go

@@ -26,11 +26,13 @@ func RunChecks(wa *sync.WaitGroup, s aws.Config, c *yatas.Config, queue chan []y
 	go yatas.CheckTest(checkConfig.Wg, c, "AWS_VPC_006", CheckIfSubnetInDifferentZone)(checkConfig, subnetsforvpcs, "AWS_VPC_006")
 	go func() {
 		for t := range checkConfig.Queue {
+			t.EndCheck()
 			checks = append(checks, t)
 			if c.CheckProgress.Bar != nil {
 				c.CheckProgress.Bar.Increment()
 				time.Sleep(time.Millisecond * 100)
 			}
+
 			checkConfig.Wg.Done()
 
 		}