From e62ebea8d85cedc475785dc5e113fb36e10fb374 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Sun, 5 Feb 2023 22:36:40 +0300
Subject: [PATCH] :sparkles: Try to load the config YAML from CWD first

---
 .gitignore       |  3 +++
 config/config.go | 25 +++++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6990187a7..6ec498773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,6 @@ bin
 
 # Scripts
 scripts/
+
+# CWD config YAML
+kubeshark.yaml
diff --git a/config/config.go b/config/config.go
index f5acd350a..10ab35742 100644
--- a/config/config.go
+++ b/config/config.go
@@ -5,11 +5,13 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
 
 	"github.com/creasty/defaults"
+	"github.com/kubeshark/kubeshark/misc"
 	"github.com/kubeshark/kubeshark/misc/version"
 	"github.com/kubeshark/kubeshark/utils"
 	"github.com/rs/zerolog"
@@ -100,14 +102,25 @@ func WriteConfig(config *ConfigStruct) error {
 }
 
 func loadConfigFile(configFilePath string, config *ConfigStruct) error {
-	reader, openErr := os.Open(configFilePath)
-	if openErr != nil {
-		return openErr
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
 	}
 
-	buf, readErr := io.ReadAll(reader)
-	if readErr != nil {
-		return readErr
+	cwdConfig := filepath.Join(cwd, fmt.Sprintf("%s.yaml", misc.Program))
+	reader, err := os.Open(cwdConfig)
+	if err != nil {
+		reader, err = os.Open(configFilePath)
+		if err != nil {
+			return err
+		}
+	} else {
+		configFilePath = cwdConfig
+	}
+
+	buf, err := io.ReadAll(reader)
+	if err != nil {
+		return err
 	}
 
 	if err := yaml.Unmarshal(buf, config); err != nil {