From d8109dc49becf9dbfb749e618b0cd8e48e0a57fb Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 8 Apr 2022 08:00:37 +0200 Subject: [PATCH 1/2] Add missing close when reading CSV file Signed-off-by: Evan Lezar --- internal/discover/csv/csv.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/discover/csv/csv.go b/internal/discover/csv/csv.go index f3625571..997b6fc0 100644 --- a/internal/discover/csv/csv.go +++ b/internal/discover/csv/csv.go @@ -87,6 +87,8 @@ func ParseFile(logger *logrus.Logger, filename string) ([]*MountSpec, error) { if err != nil { return nil, fmt.Errorf("failed to open %v for reading: %v", filename, err) } + defer csvFile.Close() + return parseCSVFromReader(logger, csvFile), nil } From d1a38f10a51b3bba911bdf295f0f5d9d4ce41626 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 8 Apr 2022 08:11:10 +0200 Subject: [PATCH 2/2] Refactor CSV file parsing Signed-off-by: Evan Lezar --- internal/discover/csv.go | 2 +- internal/discover/csv/csv.go | 44 ++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/internal/discover/csv.go b/internal/discover/csv.go index 59a1eed4..06d62e94 100644 --- a/internal/discover/csv.go +++ b/internal/discover/csv.go @@ -68,7 +68,7 @@ func NewFromCSVFiles(logger *logrus.Logger, files []string, root string) (Discov // MountSpecType. func NewFromCSVFile(logger *logrus.Logger, locators map[csv.MountSpecType]lookup.Locator, filename string) (Discover, error) { // Create a discoverer for each file-kind combination - targets, err := csv.ParseFile(logger, filename) + targets, err := csv.NewCSVFileParser(logger, filename).Parse() if err != nil { return nil, fmt.Errorf("failed to parse CSV file: %v", err) } diff --git a/internal/discover/csv/csv.go b/internal/discover/csv/csv.go index 997b6fc0..4aa50828 100644 --- a/internal/discover/csv/csv.go +++ b/internal/discover/csv/csv.go @@ -81,19 +81,39 @@ func BaseFilesOnly(filenames []string) []string { return selected } -// ParseFile parses the specified file and returns a list of required jetson mounts -func ParseFile(logger *logrus.Logger, filename string) ([]*MountSpec, error) { - csvFile, err := os.Open(filename) - if err != nil { - return nil, fmt.Errorf("failed to open %v for reading: %v", filename, err) - } - defer csvFile.Close() - - return parseCSVFromReader(logger, csvFile), nil +// Parser specifies an interface for parsing MountSpecs +type Parser interface { + Parse() ([]*MountSpec, error) } -// parseCSVFromReader parses the specified file and returns a list of required jetson mounts -func parseCSVFromReader(logger *logrus.Logger, reader io.Reader) []*MountSpec { +type csv struct { + logger *logrus.Logger + filename string +} + +// NewCSVFileParser creates a new parser for reading MountSpecs from the specified CSV file +func NewCSVFileParser(logger *logrus.Logger, filename string) Parser { + p := csv{ + logger: logger, + filename: filename, + } + + return &p +} + +// Parse parses the csv file and returns a list of MountSpecs in the file +func (p csv) Parse() ([]*MountSpec, error) { + reader, err := os.Open(p.filename) + if err != nil { + return nil, fmt.Errorf("failed to open %v for reading: %v", p.filename, err) + } + defer reader.Close() + + return p.parseFromReader(reader), nil +} + +// parseFromReader parses the specified file and returns a list of required jetson mounts +func (p csv) parseFromReader(reader io.Reader) []*MountSpec { var targets []*MountSpec scanner := bufio.NewScanner(reader) @@ -101,7 +121,7 @@ func parseCSVFromReader(logger *logrus.Logger, reader io.Reader) []*MountSpec { line := scanner.Text() target, err := NewMountSpecFromLine(line) if err != nil { - logger.Debugf("Skipping invalid mount spec '%v': %v", line, err) + p.logger.Debugf("Skipping invalid mount spec '%v': %v", line, err) continue } targets = append(targets, target)