fix artifactory mem files

Author: Emyrk

api/api.go

@@ -1,9 +1,7 @@
 package api
 
 import (
-	"context"
 	"encoding/json"
-	"io/fs"
 	"net/http"
 	"os"
 	"strconv"
@@ -114,13 +112,7 @@ func New(options *Options) *API {
 	r.Post("/api/extensionquery", api.extensionQuery)
 
 	// Endpoint for getting an extension's files or the extension zip.
-	r.Mount("/files", http.StripPrefix("/files", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		// Convert the storage into a fs.FS, including the request context
-		http.FileServerFS(&contextFs{
-			ctx:  r.Context(),
-			open: options.Storage.Open,
-		}).ServeHTTP(rw, r)
-	})))
+	r.Mount("/files", http.StripPrefix("/files", storage.HTTPFileServer(options.Storage)))
 
 	// VS Code can use the files in the response to get file paths but it will
 	// sometimes ignore that and use requests to /assets with hardcoded types to
@@ -264,12 +256,3 @@ func (api *API) assetRedirect(rw http.ResponseWriter, r *http.Request) {
 
 	http.Redirect(rw, r, url, http.StatusMovedPermanently)
 }
-
-type contextFs struct {
-	ctx  context.Context
-	open func(ctx context.Context, name string) (fs.File, error)
-}
-
-func (c *contextFs) Open(name string) (fs.File, error) {
-	return c.open(c.ctx, name)
-}

storage/artifactory.go

@@ -11,12 +11,12 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/spf13/afero/mem"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/xerrors"
 
@@ -300,10 +300,13 @@ func (s *Artifactory) Open(ctx context.Context, fp string) (fs.File, error) {
 		}
 	}
 
-	return artifactoryFile{
-		Response: resp,
-		path:     fp,
-	}, nil
+	f := mem.NewFileHandle(mem.CreateFile(fp))
+	_, err = io.Copy(f, resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	return f, nil
 }
 
 func (s *Artifactory) Manifest(ctx context.Context, publisher, name string, version Version) (*VSIXManifest, error) {
@@ -452,21 +455,3 @@ func (s *Artifactory) Versions(ctx context.Context, publisher, name string) ([]V
 	sort.Sort(ByVersion(versions))
 	return versions, nil
 }
-
-var _ fs.File = (*artifactoryFile)(nil)
-var _ fs.FileInfo = (*artifactoryFile)(nil)
-
-type artifactoryFile struct {
-	*http.Response
-	path string
-}
-
-func (a artifactoryFile) Name() string               { return filepath.Base(a.path) }
-func (a artifactoryFile) Size() int64                { return a.Response.ContentLength }
-func (a artifactoryFile) Mode() fs.FileMode          { return fs.FileMode(0) } // ?
-func (a artifactoryFile) ModTime() time.Time         { return time.Now() }
-func (a artifactoryFile) IsDir() bool                { return false }
-func (a artifactoryFile) Sys() any                   { return nil }
-func (a artifactoryFile) Stat() (fs.FileInfo, error) { return a, nil }
-func (a artifactoryFile) Read(i []byte) (int, error) { return a.Response.Body.Read(i) }
-func (a artifactoryFile) Close() error               { return a.Response.Body.Close() }

storage/storage.go

@@ -237,6 +237,17 @@ type Storage interface {
 	WalkExtensions(ctx context.Context, fn func(manifest *VSIXManifest, versions []Version) error) error
 }
 
+// HTTPFileServer creates an http.Handler that serves files from the provided
+// storage.
+func HTTPFileServer(s Storage) http.Handler {
+	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		http.FileServerFS(&contextFs{
+			ctx:  r.Context(),
+			open: s.Open,
+		}).ServeHTTP(rw, r)
+	})
+}
+
 type File struct {
 	RelativePath string
 	Content      []byte
@@ -429,3 +440,12 @@ func ParseExtensionID(id string) (string, string, string, error) {
 	}
 	return match[0][1], match[0][2], match[0][3], nil
 }
+
+type contextFs struct {
+	ctx  context.Context
+	open func(ctx context.Context, name string) (fs.File, error)
+}
+
+func (c *contextFs) Open(name string) (fs.File, error) {
+	return c.open(c.ctx, name)
+}

storage/storage_test.go

@@ -189,7 +189,7 @@ func testFileServer(t *testing.T, factory storageFactory) {
 			req := httptest.NewRequest("GET", test.path, nil)
 			rec := httptest.NewRecorder()
 
-			server := f.storage.FileServer()
+			server := storage.HTTPFileServer(f.storage)
 			server.ServeHTTP(rec, req)
 
 			resp := rec.Result()

testutil/mockstorage.go

@@ -3,10 +3,14 @@ package testutil
 import (
 	"context"
 	"errors"
+	"io/fs"
 	"net/http"
 	"os"
+	"path/filepath"
 	"sort"
 
+	"github.com/spf13/afero/mem"
+
 	"github.com/coder/code-marketplace/storage"
 )
 
@@ -22,6 +26,15 @@ func NewMockStorage() *MockStorage {
 func (s *MockStorage) AddExtension(ctx context.Context, manifest *storage.VSIXManifest, vsix []byte, extra ...storage.File) (string, error) {
 	return "", errors.New("not implemented")
 }
+func (s *MockStorage) Open(ctx context.Context, path string) (fs.File, error) {
+	if filepath.Base(path) == "/nonexistent" {
+		return nil, fs.ErrNotExist
+	}
+
+	f := mem.NewFileHandle(mem.CreateFile(path))
+	_, _ = f.Write([]byte("foobar"))
+	return f, nil
+}
 
 func (s *MockStorage) FileServer() http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {