github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-07-17 18:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Try to load the config YAML from CWD first

Browse Source
This commit is contained in:
M. Mert Yildiran 2023-02-05 22:36:40 +03:00
parent eee641082e
commit e62ebea8d8
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -61,3 +61,6 @@ bin
# Scripts
scripts/
# CWD config YAML
kubeshark.yaml

25
config/config.go
View File

@ -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 {