fixing windows issues.

Author: daveshanley

index/rolodex.go

@@ -771,13 +771,9 @@ func (r *Rolodex) asLocalFile(file fs.File, fileLookup string) (*LocalFile, []er
 		return wrapped, errs
 	}
 
-	bytes, readErr := io.ReadAll(file)
-	if readErr != nil {
-		return nil, append(errorStack, readErr)
-	}
-	stat, statErr := file.Stat()
-	if statErr != nil {
-		return nil, append(errorStack, statErr)
+	bytes, stat, errs := consumeAdaptedFile(file)
+	if len(errs) > 0 {
+		return nil, append(errorStack, errs...)
 	}
 	if len(bytes) == 0 {
 		return nil, nil
@@ -843,13 +839,9 @@ func (r *Rolodex) asRemoteFile(file fs.File, location string) (*RemoteFile, []er
 		return remoteFile, nil
 	}
 
-	bytes, readErr := io.ReadAll(file)
-	if readErr != nil {
-		return nil, []error{readErr}
-	}
-	stat, statErr := file.Stat()
-	if statErr != nil {
-		return nil, []error{statErr}
+	bytes, stat, errs := consumeAdaptedFile(file)
+	if len(errs) > 0 {
+		return nil, errs
 	}
 	if len(bytes) == 0 {
 		return nil, nil
@@ -867,6 +859,28 @@ func (r *Rolodex) asRemoteFile(file fs.File, location string) (*RemoteFile, []er
 	}, nil
 }
 
+func consumeAdaptedFile(file fs.File) ([]byte, fs.FileInfo, []error) {
+	var errorStack []error
+
+	bytes, readErr := io.ReadAll(file)
+	if readErr != nil {
+		errorStack = append(errorStack, readErr)
+		_ = file.Close()
+		return nil, nil, errorStack
+	}
+
+	stat, statErr := file.Stat()
+	if statErr != nil {
+		errorStack = append(errorStack, statErr)
+		_ = file.Close()
+		return nil, nil, errorStack
+	}
+
+	_ = file.Close()
+
+	return bytes, stat, nil
+}
+
 func (r *Rolodex) wrapLocalRolodexFile(localFile *LocalFile) (RolodexFile, error) {
 	return &rolodexFile{
 		rolodex:   r,

index/rolodex_remote_loader.go

@@ -14,7 +14,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path/filepath"
+	"path"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -764,7 +764,7 @@ func (i *RemoteFS) createRemoteFile(remoteParsedURL *url.URL, fileExt FileExtens
 		lastModifiedTime = time.Now()
 	}
 	return &RemoteFile{
-		filename:         filepath.Base(remoteParsedURL.Path),
+		filename:         path.Base(remoteParsedURL.Path),
 		name:             remoteParsedURL.Path,
 		extension:        fileExt,
 		data:             responseBytes,
@@ -778,7 +778,7 @@ func (i *RemoteFS) createRemoteFile(remoteParsedURL *url.URL, fileExt FileExtens
 func (i *RemoteFS) createRemoteIndexConfig(remoteParsedURL, remoteParsedURLOriginal *url.URL) *SpecIndexConfig {
 	copiedCfg := *i.indexConfig
 	newBase := fmt.Sprintf("%s://%s%s", remoteParsedURLOriginal.Scheme, remoteParsedURLOriginal.Host,
-		filepath.Dir(remoteParsedURL.Path))
+		path.Dir(remoteParsedURL.Path))
 	newBaseURL, _ := url.Parse(newBase)
 	if newBaseURL != nil {
 		copiedCfg.BaseURL = newBaseURL

index/rolodex_test.go

@@ -2324,6 +2324,28 @@ func TestRolodex_AsRemoteFile_AndWrappers(t *testing.T) {
 	assert.Error(t, err)
 }
 
+func TestRolodex_AsLocalFile_ClosesAdaptedFile(t *testing.T) {
+	rolo := NewRolodex(CreateOpenAPIIndexConfig())
+	rolo.rootIndex = NewTestSpecIndex().Load().(*SpecIndex)
+
+	file := &closeTrackingFile{testFile: testFile{content: "hello"}}
+	localFile, errs := rolo.asLocalFile(file, "/tmp/spec.yaml")
+	assert.NotNil(t, localFile)
+	assert.Empty(t, errs)
+	assert.True(t, file.closed)
+}
+
+func TestRolodex_AsRemoteFile_ClosesAdaptedFile(t *testing.T) {
+	rolo := NewRolodex(CreateOpenAPIIndexConfig())
+	rolo.rootIndex = NewTestSpecIndex().Load().(*SpecIndex)
+
+	file := &closeTrackingFile{testFile: testFile{content: "hello"}}
+	remoteFile, errs := rolo.asRemoteFile(file, "http://example.com/spec.yaml")
+	assert.NotNil(t, remoteFile)
+	assert.Empty(t, errs)
+	assert.True(t, file.closed)
+}
+
 func TestRolodex_AsFileHelperErrors(t *testing.T) {
 	rolo := NewRolodex(CreateOpenAPIIndexConfig())
 
@@ -2437,6 +2459,11 @@ type testFile struct {
 	offset  int64
 }
 
+type closeTrackingFile struct {
+	testFile
+	closed bool
+}
+
 type errorReadFile struct{}
 
 func (e *errorReadFile) Read(_ []byte) (int, error) { return 0, fmt.Errorf("read failed") }
@@ -2462,6 +2489,11 @@ func (tf *testFile) Read(p []byte) (n int, err error) {
 
 func (tf *testFile) Close() error { return nil }
 
+func (tf *closeTrackingFile) Close() error {
+	tf.closed = true
+	return nil
+}
+
 func (tf *testFile) Stat() (fs.FileInfo, error) {
 	return &testFileInfo{name: "test.yaml", size: int64(len(tf.content))}, nil
 }