Make NewFileSystemPath return error

2 files changed, 9 insertions, 6 deletions

diff --git a/internal/httpfs/http_fs.go b/internal/httpfs/http_fs.go
index ae9aa269..274bca57 100644
--- a/internal/httpfs/http_fs.go
+++ b/internal/httpfs/http_fs.go
@@ -8,7 +8,6 @@ package httpfs
 
 import (
 	"errors"
-	"log"
 	"net/http"
 	"os"
 	"path"
@@ -27,19 +26,19 @@ type fileSystemPaths struct {
 
 // NewFileSystemPath creates a new fileSystemPaths that can be used to register
 // a file:// protocol with an http.Transport
-func NewFileSystemPath(allowedPaths []string) http.FileSystem {
+func NewFileSystemPath(allowedPaths []string) (http.FileSystem, error) {
 	for k, path := range allowedPaths {
 		var err error
 
 		allowedPaths[k], err = filepath.Abs(path)
 		if err != nil {
-			log.Fatal(err)
+			return nil, err
 		}
 	}
 
 	return &fileSystemPaths{
 		allowedPaths: allowedPaths,
-	}
+	}, nil
 }
 
 // Open a file by name if it exists inside the allowedPaths
diff --git a/internal/httpfs/http_fs_test.go b/internal/httpfs/http_fs_test.go
index b8606d9d..3d1092b6 100644
--- a/internal/httpfs/http_fs_test.go
+++ b/internal/httpfs/http_fs_test.go
@@ -62,7 +62,8 @@ func TestFSOpen(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := NewFileSystemPath(test.allowedPaths)
+			p, err := NewFileSystemPath(test.allowedPaths)
+			require.NoError(t, err)
 
 			got, err := p.Open(test.fileName)
 			if test.expectedErrMsg != "" {
@@ -140,7 +141,10 @@ func TestFileSystemPathCanServeHTTP(t *testing.T) {
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			transport := httptransport.NewTransport()
-			transport.RegisterProtocol("file", http.NewFileTransport(NewFileSystemPath([]string{test.path})))
+			fs, err := NewFileSystemPath([]string{test.path})
+			require.NoError(t, err)
+
+			transport.RegisterProtocol("file", http.NewFileTransport(fs))
 
 			client := &http.Client{
 				Transport: transport,