OH WINDOWS. PLEASE. STOP BEING STRANGE

Author: daveshanley

index/rolodex_file_loader.go

@@ -494,7 +494,11 @@ func (l *LocalFS) extractFile(p string) (*LocalFile, error) {
 		var file fs.File
 		if config != nil && config.DirFS != nil {
 			l.logger.Debug("[rolodex file loader]: collecting file from dirFS", "file", extension, "location", abs)
-			file, _ = config.DirFS.Open(p)
+			var fileError error
+			file, fileError = config.DirFS.Open(p)
+			if fileError != nil {
+				return nil, fileError
+			}
 		} else {
 			l.logger.Debug("[rolodex file loader]: reading local file from OS", "file", extension, "location", abs)
 			var fileError error
@@ -503,8 +507,8 @@ func (l *LocalFS) extractFile(p string) (*LocalFile, error) {
 			if fileError != nil {
 				return nil, fileError
 			}
-			defer file.Close()
 		}
+		defer file.Close()
 
 		modTime := time.Now()
 		stat, _ := file.Stat()

index/rolodex_test.go

@@ -2346,6 +2346,21 @@ func TestRolodex_AsRemoteFile_ClosesAdaptedFile(t *testing.T) {
 	assert.True(t, file.closed)
 }
 
+func TestLocalFS_ExtractFile_ClosesDirFSFile(t *testing.T) {
+	lfs, err := NewLocalFSWithConfig(&LocalFSConfig{
+		BaseDirectory: "/tmp",
+		DirFS: &closeTrackingDirFS{
+			file: &closeTrackingFile{testFile: testFile{content: "hello"}},
+		},
+	})
+	assert.NoError(t, err)
+
+	localFile, extractErr := lfs.extractFile("spec.yaml")
+	assert.NoError(t, extractErr)
+	assert.NotNil(t, localFile)
+	assert.True(t, lfs.fsConfig.DirFS.(*closeTrackingDirFS).file.closed)
+}
+
 func TestRolodex_AsFileHelperErrors(t *testing.T) {
 	rolo := NewRolodex(CreateOpenAPIIndexConfig())
 
@@ -2464,6 +2479,10 @@ type closeTrackingFile struct {
 	closed bool
 }
 
+type closeTrackingDirFS struct {
+	file *closeTrackingFile
+}
+
 type errorReadFile struct{}
 
 func (e *errorReadFile) Read(_ []byte) (int, error) { return 0, fmt.Errorf("read failed") }
@@ -2494,6 +2513,12 @@ func (tf *closeTrackingFile) Close() error {
 	return nil
 }
 
+func (f *closeTrackingDirFS) Open(name string) (fs.File, error) {
+	f.file.offset = 0
+	f.file.closed = false
+	return f.file, nil
+}
+
 func (tf *testFile) Stat() (fs.FileInfo, error) {
 	return &testFileInfo{name: "test.yaml", size: int64(len(tf.content))}, nil
 }