Skip to content

Commit b7aa0b2

Browse files
authored
Merge pull request #1351 from marquiz/devel/local-refactor
source/local: simplify feature file size checking
2 parents bcdee7b + a5e78f0 commit b7aa0b2

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

source/local/local.go

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -324,23 +324,6 @@ func getFeaturesFromFiles() (map[string]string, error) {
324324

325325
for _, file := range files {
326326
fileName := file.Name()
327-
328-
fileInfo, err := file.Info()
329-
if err != nil {
330-
klog.ErrorS(err, "failed to get file info", "fileName", fileName)
331-
continue
332-
}
333-
334-
fileSize := fileInfo.Size()
335-
if fileSize > MaxFeatureFileSize {
336-
klog.ErrorS(
337-
fmt.Errorf("file size limit exceeded: %d bytes > %d bytes", fileSize, MaxFeatureFileSize),
338-
"skipping too big feature file",
339-
"fileName", fileName, "fileSize", fileSize,
340-
)
341-
continue
342-
}
343-
344327
lines, err := getFileContent(fileName)
345328
if err != nil {
346329
klog.ErrorS(err, "failed to read file", "fileName", fileName)
@@ -374,6 +357,10 @@ func getFileContent(fileName string) ([][]byte, error) {
374357
}
375358

376359
if filestat.Mode().IsRegular() {
360+
if filestat.Size() > MaxFeatureFileSize {
361+
return lines, fmt.Errorf("file size limit exceeded: %d bytes > %d bytes", filestat.Size(), MaxFeatureFileSize)
362+
}
363+
377364
fileContent, err := os.ReadFile(path)
378365

379366
// Do not return any lines if an error occurred

0 commit comments

Comments
 (0)