Skip to content

fix checkIsEmptyDir #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+2 −2
Open

fix checkIsEmptyDir #1978

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e26e84
fix checkIsEmptyDir
mcarbonneaux Dec 18, 2024
87227b7
simplify
mcarbonneaux Dec 18, 2024
fcb5d79
remove debug log
mcarbonneaux Dec 20, 2024
4b0cdad
remove comment
mcarbonneaux Dec 20, 2024
6dcc6df
fix test
mcarbonneaux Dec 22, 2024
ffbe054
force call of checkIsEmptyDir only if is dir
mcarbonneaux Dec 22, 2024
ba5480a
Merge branch 'kubernetes:main' into main
mcarbonneaux May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/transformer/kubernetes/k8sutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ func isConfigFile(filePath string) (useConfigMap bool, readonly bool, skip bool)
return
}

if !fi.Mode().IsRegular() { // is dir
if fi.Mode().IsDir() { // is dir
isDirEmpty, err := checkIsEmptyDir(filePath)
if err != nil {
log.Warnf("Failed to check if the directory is empty: %v", err)
Expand Down Expand Up @@ -1278,7 +1278,7 @@ func checkIsEmptyDir(filePath string) (bool, error) {
if !file.IsDir() {
return false, nil
}
_, err := checkIsEmptyDir(file.Name())
_, err := checkIsEmptyDir(filepath.Join(filePath, file.Name()))
if err != nil {
return false, err
}
Expand Down