Skip to content

Commit 42f4bab

Browse files
authored
Merge pull request #749 from Mirantis/ivan4th/diag-fix
Fix bad diag result on dotfiles in log dirs
2 parents 89b947f + 973cb7b commit 42f4bab

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

pkg/diag/diag.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,9 @@ func (s *LogDirSource) DiagnosticInfo() (Result, error) {
430430
continue
431431
}
432432
name := fi.Name()
433+
if strings.HasPrefix(name, ".") {
434+
continue
435+
}
433436
ext := filepath.Ext(name)
434437
cur := Result{
435438
Name: name,

pkg/diag/diag_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ func setupLogDir(t *testing.T, baseDir string) string {
4646
t.Fatalf("MkdirAll(): %v", err)
4747
}
4848
for name, contents := range map[string]string{
49-
"log1.txt": "log1 contents",
50-
"log2.txt": "log2 contents",
49+
"log1.txt": "log1 contents",
50+
"log2.txt": "log2 contents",
51+
".placeholder": "ignored file",
52+
".place.holder": "another ignored file",
5153
} {
5254
if err := ioutil.WriteFile(filepath.Join(logDir, name), []byte(contents), 0777); err != nil {
5355
t.Fatalf("WriteFile(): %v", err)

0 commit comments

Comments
 (0)