From ca05239caf32d9fcda32bb0f8d53e134c290e3df Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Wed, 29 Mar 2023 08:51:14 +0200 Subject: [PATCH] feat: remove warning when the config file is explicitly stdin (#3740) --- pkg/config/reader.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkg/config/reader.go b/pkg/config/reader.go index 2dfd3c06c9b0..2199fdd2de33 100644 --- a/pkg/config/reader.go +++ b/pkg/config/reader.go @@ -72,13 +72,21 @@ func (r *FileReader) parseConfig() error { return nil } - usedConfigFile, err := fsutils.ShortestRelPath(usedConfigFile, "") - if err != nil { - r.log.Warnf("Can't pretty print config file path: %s", err) + if usedConfigFile == os.Stdin.Name() { + usedConfigFile = "" + r.log.Infof("Reading config file stdin") + } else { + var err error + usedConfigFile, err = fsutils.ShortestRelPath(usedConfigFile, "") + if err != nil { + r.log.Warnf("Can't pretty print config file path: %v", err) + } + + r.log.Infof("Used config file %s", usedConfigFile) } - r.log.Infof("Used config file %s", usedConfigFile) - usedConfigDir := filepath.Dir(usedConfigFile) - if usedConfigDir, err = filepath.Abs(usedConfigDir); err != nil { + + usedConfigDir, err := filepath.Abs(filepath.Dir(usedConfigFile)) + if err != nil { return errors.New("can't get config directory") } r.cfg.cfgDir = usedConfigDir