Skip to content

Commit ca05239

Browse files
authored
feat: remove warning when the config file is explicitly stdin (#3740)
1 parent 1e70073 commit ca05239

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

pkg/config/reader.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,21 @@ func (r *FileReader) parseConfig() error {
7272
return nil
7373
}
7474

75-
usedConfigFile, err := fsutils.ShortestRelPath(usedConfigFile, "")
76-
if err != nil {
77-
r.log.Warnf("Can't pretty print config file path: %s", err)
75+
if usedConfigFile == os.Stdin.Name() {
76+
usedConfigFile = ""
77+
r.log.Infof("Reading config file stdin")
78+
} else {
79+
var err error
80+
usedConfigFile, err = fsutils.ShortestRelPath(usedConfigFile, "")
81+
if err != nil {
82+
r.log.Warnf("Can't pretty print config file path: %v", err)
83+
}
84+
85+
r.log.Infof("Used config file %s", usedConfigFile)
7886
}
79-
r.log.Infof("Used config file %s", usedConfigFile)
80-
usedConfigDir := filepath.Dir(usedConfigFile)
81-
if usedConfigDir, err = filepath.Abs(usedConfigDir); err != nil {
87+
88+
usedConfigDir, err := filepath.Abs(filepath.Dir(usedConfigFile))
89+
if err != nil {
8290
return errors.New("can't get config directory")
8391
}
8492
r.cfg.cfgDir = usedConfigDir

0 commit comments

Comments
 (0)