From d0bfeea8b2e782f2a0f10d52564f8bf3615de26c Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 12:41:45 +0530
Subject: [PATCH 1/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 cmd/serve.go |  8 ++++++++
 cmd/test.go  |  7 +++++++
 pkg/util.go  | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/cmd/serve.go b/cmd/serve.go
index b12c2f9a3..e652cb869 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -5,6 +5,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
+	"go.keploy.io/server/pkg"
 	"go.keploy.io/server/pkg/service/serve"
 	"go.uber.org/zap"
 )
@@ -56,6 +57,13 @@ func (s *Serve) GetCmd() *cobra.Command {
 			path += "/keploy"
 
 			testReportPath := path + "/testReports"
+			subDirPrefix := "test-report-"
+
+			testReportPath, err = pkg.GetNextTestReportDir(testReportPath, subDirPrefix)
+			if err != nil {
+				s.logger.Error("failed to get the next test report directory", zap.Error(err))
+				return
+			}
 
 			s.logger.Info("", zap.Any("keploy test and mock path", path), zap.Any("keploy testReport path", testReportPath))
 
diff --git a/cmd/test.go b/cmd/test.go
index 5ba6fda21..fd0bd280f 100755
--- a/cmd/test.go
+++ b/cmd/test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"go.keploy.io/server/pkg"
 	"go.keploy.io/server/pkg/models"
 	"go.keploy.io/server/pkg/service/test"
 	"go.keploy.io/server/utils"
@@ -249,6 +250,12 @@ func (t *Test) GetCmd() *cobra.Command {
 			path += "/keploy"
 
 			testReportPath := path + "/testReports"
+			subDirPrefix := "test-report-"
+			testReportPath, err = pkg.GetNextTestReportDir(testReportPath, subDirPrefix)
+			if err != nil {
+				t.logger.Error("failed to get the next test report directory", zap.Error(err))
+				return err
+			}
 
 			t.logger.Info("", zap.Any("keploy test and mock path", path), zap.Any("keploy testReport path", testReportPath))
 
diff --git a/pkg/util.go b/pkg/util.go
index fedb7edc8..bc0567aca 100755
--- a/pkg/util.go
+++ b/pkg/util.go
@@ -7,6 +7,9 @@ import (
 	"io"
 	"math/rand"
 	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -180,3 +183,36 @@ func MakeCurlCommand(method string, url string, header map[string]string, body s
 	}
 	return curl
 }
+
+func GetNextTestReportDir(testReportPath, subDirPrefix string) (string, error) {
+	latestReportNumber := 0
+
+	if _, err := os.Stat(testReportPath); !os.IsNotExist(err) {
+		file, err := os.Open(testReportPath)
+		if err != nil {
+			return "", fmt.Errorf("failed to open directory: %w", err)
+		}
+		defer file.Close()
+
+		files, err := file.Readdir(-1) // -1 to read all files and directories
+		if err != nil {
+			return "", fmt.Errorf("failed to read directory: %w", err)
+		}
+
+		for _, f := range files {
+			if f.IsDir() && strings.HasPrefix(f.Name(), subDirPrefix) {
+				reportNumber, err := strconv.Atoi(strings.TrimPrefix(f.Name(), subDirPrefix))
+				if err != nil {
+					return "", fmt.Errorf("failed to parse report number: %w", err)
+				}
+				if reportNumber > latestReportNumber {
+					latestReportNumber = reportNumber
+				}
+			}
+		}
+		latestReportNumber++ // increment to create a new report directory
+	}
+
+	newTestReportPath := filepath.Join(testReportPath, fmt.Sprintf("%s%d", subDirPrefix, latestReportNumber))
+	return newTestReportPath, nil
+}

From 18dc702a1b6e4916a96ed1141880a9c2dd265306 Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 12:59:19 +0530
Subject: [PATCH 2/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 .github/workflows/golang-linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/golang-linux.sh b/.github/workflows/golang-linux.sh
index debc5a57f..5f0664599 100644
--- a/.github/workflows/golang-linux.sh
+++ b/.github/workflows/golang-linux.sh
@@ -72,9 +72,9 @@ done
 sudo -E env PATH="$PATH" ./../../keployv2 test -c "./ginApp" --delay 7
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-1.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.

From 2403cc3f48c34e3a5078c065874db88bb39196c2 Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 13:06:10 +0530
Subject: [PATCH 3/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 .github/workflows/java-linux.sh   |  4 ++--
 .github/workflows/node-linux.sh   | 12 ++++++------
 .github/workflows/python-linux.sh |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/java-linux.sh b/.github/workflows/java-linux.sh
index 2fd6a6455..2306e17aa 100644
--- a/.github/workflows/java-linux.sh
+++ b/.github/workflows/java-linux.sh
@@ -64,9 +64,9 @@ done
 sudo -E env PATH=$PATH ./../../../keployv2 test -c './mvnw spring-boot:run' --delay 20
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/node-linux.sh b/.github/workflows/node-linux.sh
index 3258b6b00..0ba7587d0 100644
--- a/.github/workflows/node-linux.sh
+++ b/.github/workflows/node-linux.sh
@@ -77,17 +77,17 @@ sed -i '/tests:/a \        "test-set-0": ["test-1", "test-2"]' "$config_file"
 sudo -E env PATH=$PATH ./../../keployv2 test -c 'npm start' --delay 10
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
-report_file3="./keploy/testReports/report-3.yaml"
+report_file3="./keploy/testReports/test-report-0/report-3.yaml"
 test_status3=$(grep 'status:' "$report_file3" | head -n 1 | awk '{print $2}')
-report_file4="./keploy/testReports/report-4.yaml"
+report_file4="./keploy/testReports/test-report-0/report-4.yaml"
 test_status4=$(grep 'status:' "$report_file4" | head -n 1 | awk '{print $2}')
-report_file5="./keploy/testReports/report-5.yaml"
+report_file5="./keploy/testReports/test-report-0/report-5.yaml"
 test_status5=$(grep 'status:' "$report_file5" | head -n 1 | awk '{print $2}')
-report_file6="./keploy/testReports/report-6.yaml"
+report_file6="./keploy/testReports/test-report-0/report-6.yaml"
 test_status6=$(grep 'status:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_total6=$(grep 'total:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_failure=$(grep 'failure:' "$report_file6" | head -n 1 | awk '{print $2}')
diff --git a/.github/workflows/python-linux.sh b/.github/workflows/python-linux.sh
index d0d30c929..33d9be31f 100644
--- a/.github/workflows/python-linux.sh
+++ b/.github/workflows/python-linux.sh
@@ -90,9 +90,9 @@ done
 sudo -E env PATH="$PATH" ./../../../keployv2 test -c "python3 manage.py runserver" --delay 10
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.

From 83ec736c164585b51053013c8f576e2df71b9c7b Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 15:05:24 +0530
Subject: [PATCH 4/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 .../workflows/test_workflow_scripts/golang-docker.sh |  4 ++--
 .../workflows/test_workflow_scripts/golang-linux.sh  |  4 ++--
 .../workflows/test_workflow_scripts/java-linux.sh    |  4 ++--
 .../workflows/test_workflow_scripts/node-docker.sh   |  4 ++--
 .../workflows/test_workflow_scripts/node-linux.sh    | 12 ++++++------
 .../workflows/test_workflow_scripts/python-docker.sh |  6 +++---
 .../workflows/test_workflow_scripts/python-linux.sh  |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test_workflow_scripts/golang-docker.sh b/.github/workflows/test_workflow_scripts/golang-docker.sh
index d1dffec04..2542fbb9d 100755
--- a/.github/workflows/test_workflow_scripts/golang-docker.sh
+++ b/.github/workflows/test_workflow_scripts/golang-docker.sh
@@ -61,9 +61,9 @@ done
 docker run  --name keploy-v2 -p 16789:16789 --privileged --pid=host -v "$(pwd)":/files -v /sys/fs/cgroup:/sys/fs/cgroup -v /sys/kernel/debug:/sys/kernel/debug -v /sys/fs/bpf:/sys/fs/bpf -v /var/run/docker.sock:/var/run/docker.sock --rm keployv2 test -c 'docker run -p8080:8080 --net keploy-network --name ginApp gin-mongo' --apiTimeout 60 --delay 10
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/test_workflow_scripts/golang-linux.sh b/.github/workflows/test_workflow_scripts/golang-linux.sh
index 0c1f83b1b..6a76ef0ed 100755
--- a/.github/workflows/test_workflow_scripts/golang-linux.sh
+++ b/.github/workflows/test_workflow_scripts/golang-linux.sh
@@ -74,9 +74,9 @@ done
 sudo -E env PATH="$PATH" ./../../keployv2 test -c "./ginApp" --apiTimeout 30 --delay 7
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/test_workflow_scripts/java-linux.sh b/.github/workflows/test_workflow_scripts/java-linux.sh
index 03e798d6c..ffdc61059 100755
--- a/.github/workflows/test_workflow_scripts/java-linux.sh
+++ b/.github/workflows/test_workflow_scripts/java-linux.sh
@@ -75,9 +75,9 @@ done
 sudo -E env PATH=$PATH ./../../../keployv2 test -c 'java -jar target/spring-petclinic-rest-3.0.2.jar' --delay 20
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/test_workflow_scripts/node-docker.sh b/.github/workflows/test_workflow_scripts/node-docker.sh
index 6b3cf2b5d..42efdac03 100755
--- a/.github/workflows/test_workflow_scripts/node-docker.sh
+++ b/.github/workflows/test_workflow_scripts/node-docker.sh
@@ -58,9 +58,9 @@ done
 docker run  --name keploy-v2 -p 16789:16789 --privileged --pid=host -v "$(pwd)":/files -v /sys/fs/cgroup:/sys/fs/cgroup -v /sys/kernel/debug:/sys/kernel/debug -v /sys/fs/bpf:/sys/fs/bpf -v /var/run/docker.sock:/var/run/docker.sock --rm keployv2 test -c "docker run -p 8000:8000 --name nodeMongoApp --network keploy-network node-app:1.0" --containerName nodeMongoApp --apiTimeout 30 --delay 30
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/test_workflow_scripts/node-linux.sh b/.github/workflows/test_workflow_scripts/node-linux.sh
index 23fcd035e..a7626b4e4 100755
--- a/.github/workflows/test_workflow_scripts/node-linux.sh
+++ b/.github/workflows/test_workflow_scripts/node-linux.sh
@@ -79,17 +79,17 @@ sed -i '/tests:/a \        "test-set-0": ["test-1", "test-2"]' "$config_file"
 sudo -E env PATH=$PATH ./../../keployv2 test -c 'npm start' --apiTimeout 30 --delay 10
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
-report_file3="./keploy/testReports/report-3.yaml"
+report_file3="./keploy/testReports/test-report-0/report-3.yaml"
 test_status3=$(grep 'status:' "$report_file3" | head -n 1 | awk '{print $2}')
-report_file4="./keploy/testReports/report-4.yaml"
+report_file4="./keploy/testReports/test-report-0/report-4.yaml"
 test_status4=$(grep 'status:' "$report_file4" | head -n 1 | awk '{print $2}')
-report_file5="./keploy/testReports/report-5.yaml"
+report_file5="./keploy/testReports/test-report-0/report-5.yaml"
 test_status5=$(grep 'status:' "$report_file5" | head -n 1 | awk '{print $2}')
-report_file6="./keploy/testReports/report-6.yaml"
+report_file6="./keploy/testReports/test-report-0/report-6.yaml"
 test_status6=$(grep 'status:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_total6=$(grep 'total:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_failure=$(grep 'failure:' "$report_file6" | head -n 1 | awk '{print $2}')
diff --git a/.github/workflows/test_workflow_scripts/python-docker.sh b/.github/workflows/test_workflow_scripts/python-docker.sh
index 24abee2f7..381750c8f 100755
--- a/.github/workflows/test_workflow_scripts/python-docker.sh
+++ b/.github/workflows/test_workflow_scripts/python-docker.sh
@@ -53,13 +53,13 @@ done
 docker run --name keploy-v2 -p 16789:16789 --privileged --pid=host -v "$(pwd)":/files -v /sys/fs/cgroup:/sys/fs/cgroup -v /sys/kernel/debug:/sys/kernel/debug -v /sys/fs/bpf:/sys/fs/bpf -v /var/run/docker.sock:/var/run/docker.sock --rm keployv2 test -c "docker compose up" --containerName flask-app --buildDelay 40s --apiTimeout 60 --delay 20
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.
diff --git a/.github/workflows/test_workflow_scripts/python-linux.sh b/.github/workflows/test_workflow_scripts/python-linux.sh
index 17ab51fd0..19ebc2114 100755
--- a/.github/workflows/test_workflow_scripts/python-linux.sh
+++ b/.github/workflows/test_workflow_scripts/python-linux.sh
@@ -92,9 +92,9 @@ done
 sudo -E env PATH="$PATH" ./../../../keployv2 test -c "python3 manage.py runserver" --apiTimeout 30 --delay 20
 
 # Get the test results from the testReport file.
-report_file="./keploy/testReports/report-1.yaml"
+report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
-report_file2="./keploy/testReports/report-2.yaml"
+report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
 
 # Return the exit code according to the status.

From b953b8dc54e877dcc6efeb98c9cfbce972eb798c Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 16:06:28 +0530
Subject: [PATCH 5/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 .github/workflows/test_workflow_scripts/node-linux.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_workflow_scripts/node-linux.sh b/.github/workflows/test_workflow_scripts/node-linux.sh
index a7626b4e4..528c5deef 100755
--- a/.github/workflows/test_workflow_scripts/node-linux.sh
+++ b/.github/workflows/test_workflow_scripts/node-linux.sh
@@ -83,13 +83,13 @@ report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
 report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
-report_file3="./keploy/testReports/test-report-0/report-3.yaml"
+report_file3="./keploy/testReports/test-report-1/report-3.yaml"
 test_status3=$(grep 'status:' "$report_file3" | head -n 1 | awk '{print $2}')
-report_file4="./keploy/testReports/test-report-0/report-4.yaml"
+report_file4="./keploy/testReports/test-report-1/report-4.yaml"
 test_status4=$(grep 'status:' "$report_file4" | head -n 1 | awk '{print $2}')
-report_file5="./keploy/testReports/test-report-0/report-5.yaml"
+report_file5="./keploy/testReports/test-report-1/report-5.yaml"
 test_status5=$(grep 'status:' "$report_file5" | head -n 1 | awk '{print $2}')
-report_file6="./keploy/testReports/test-report-0/report-6.yaml"
+report_file6="./keploy/testReports/test-report-1/report-6.yaml"
 test_status6=$(grep 'status:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_total6=$(grep 'total:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_failure=$(grep 'failure:' "$report_file6" | head -n 1 | awk '{print $2}')

From 24ee6fb019df7b19db51044cb122aa6548d836ba Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Sun, 21 Jan 2024 16:38:49 +0530
Subject: [PATCH 6/7] updated file structure for test reports

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 .github/workflows/test_workflow_scripts/node-linux.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_workflow_scripts/node-linux.sh b/.github/workflows/test_workflow_scripts/node-linux.sh
index 528c5deef..a7626b4e4 100755
--- a/.github/workflows/test_workflow_scripts/node-linux.sh
+++ b/.github/workflows/test_workflow_scripts/node-linux.sh
@@ -83,13 +83,13 @@ report_file="./keploy/testReports/test-report-0/report-1.yaml"
 test_status1=$(grep 'status:' "$report_file" | head -n 1 | awk '{print $2}')
 report_file2="./keploy/testReports/test-report-0/report-2.yaml"
 test_status2=$(grep 'status:' "$report_file2" | head -n 1 | awk '{print $2}')
-report_file3="./keploy/testReports/test-report-1/report-3.yaml"
+report_file3="./keploy/testReports/test-report-0/report-3.yaml"
 test_status3=$(grep 'status:' "$report_file3" | head -n 1 | awk '{print $2}')
-report_file4="./keploy/testReports/test-report-1/report-4.yaml"
+report_file4="./keploy/testReports/test-report-0/report-4.yaml"
 test_status4=$(grep 'status:' "$report_file4" | head -n 1 | awk '{print $2}')
-report_file5="./keploy/testReports/test-report-1/report-5.yaml"
+report_file5="./keploy/testReports/test-report-0/report-5.yaml"
 test_status5=$(grep 'status:' "$report_file5" | head -n 1 | awk '{print $2}')
-report_file6="./keploy/testReports/test-report-1/report-6.yaml"
+report_file6="./keploy/testReports/test-report-0/report-6.yaml"
 test_status6=$(grep 'status:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_total6=$(grep 'total:' "$report_file6" | head -n 1 | awk '{print $2}')
 test_failure=$(grep 'failure:' "$report_file6" | head -n 1 | awk '{print $2}')

From bd3dc5e97506fc9ef5a03f2670673a224d27c7b6 Mon Sep 17 00:00:00 2001
From: EraKin575 <tejaskumar574@gmail.com>
Date: Tue, 23 Jan 2024 12:22:43 +0530
Subject: [PATCH 7/7] resolving conflicts

Signed-off-by: EraKin575 <tejaskumar574@gmail.com>
---
 go.mod |  6 +-----
 go.sum | 11 -----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index 7942a603a..dc46f500e 100755
--- a/go.mod
+++ b/go.mod
@@ -74,9 +74,8 @@ require (
 	github.com/99designs/gqlgen v0.17.36
 	github.com/TheZeroSlave/zapsentry v1.18.0
 	github.com/agnivade/levenshtein v1.1.1
+	github.com/emirpasic/gods v1.18.1
 	github.com/getsentry/sentry-go v0.17.0
-	github.com/google/uuid v1.5.0
-	github.com/hashicorp/go-memdb v1.3.4
 	github.com/jackc/pgproto3/v2 v2.3.2
 	github.com/vektah/gqlparser/v2 v2.5.8
 	github.com/xdg-go/pbkdf2 v1.0.0
@@ -86,10 +85,7 @@ require (
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.3 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
diff --git a/go.sum b/go.sum
index 4cff5e10b..dced455fb 100755
--- a/go.sum
+++ b/go.sum
@@ -70,19 +70,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c=
-github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
-github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru/v2 v2.0.3 h1:kmRrRLlInXvng0SmLxmQpQkpbYAvcXm7NPDrgxJa9mE=
 github.com/hashicorp/golang-lru/v2 v2.0.3/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=