Add local storage constructor

This will parallel with the Artifactory constructor which will need to
instantiate an Artifactory client.

Author: code-asher

cli/add.go

@@ -47,11 +47,7 @@ func add() *cobra.Command {
 			}
 
 			// Always local storage for now.
-			store := &storage.Local{
-				ExtDir: extdir,
-				Logger: logger,
-			}
-
+			store := storage.NewLocalStorage(ctx, extdir, logger)
 			ext, err := store.AddExtension(ctx, args[0])
 			if err != nil {
 				return err

cli/remove.go

@@ -47,11 +47,7 @@ func remove() *cobra.Command {
 			}
 
 			// Always local storage for now.
-			store := &storage.Local{
-				ExtDir: extdir,
-				Logger: logger,
-			}
-
+			store := storage.NewLocalStorage(ctx, extdir, logger)
 			removed, err := store.RemoveExtension(ctx, args[0], all)
 			if err != nil {
 				return err

cli/server.go

@@ -69,10 +69,7 @@ func server() *cobra.Command {
 			}
 
 			// Always local storage for now.
-			store := &storage.Local{
-				ExtDir: extdir,
-				Logger: logger,
-			}
+			store := storage.NewLocalStorage(ctx, extdir, logger)
 
 			// Always no database for now.
 			database := &database.NoDB{

storage/local.go

@@ -27,6 +27,13 @@ type Local struct {
 	Logger slog.Logger
 }
 
+func NewLocalStorage(_ context.Context, extdir string, logger slog.Logger) *Local {
+	return &Local{
+		ExtDir: extdir,
+		Logger: logger,
+	}
+}
+
 func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, error) {
 	vsixBytes, err := readVSIX(ctx, source)
 	if err != nil {

storage/storage_test.go

@@ -20,10 +20,17 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/mod/semver"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/code-marketplace/storage"
 	"github.com/coder/code-marketplace/testutil"
 )
 
+func newStorage(t *testing.T, dir string) storage.Storage {
+	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
+	return storage.NewLocalStorage(context.Background(), dir, logger)
+}
+
 func TestFileServer(t *testing.T) {
 	t.Parallel()
 
@@ -32,7 +39,8 @@ func TestFileServer(t *testing.T) {
 	err := os.WriteFile(file, []byte("bar"), 0o644)
 	require.NoError(t, err)
 
-	server := (&storage.Local{ExtDir: dir}).FileServer()
+	s := newStorage(t, dir)
+	server := s.FileServer()
 
 	req := httptest.NewRequest("GET", "/foo", nil)
 	rec := httptest.NewRecorder()
@@ -81,7 +89,7 @@ func TestManifest(t *testing.T) {
 		ext := testutil.Extensions[0]
 		expected := addExtension(t, ext, extdir, "some-version")
 
-		s := &storage.Local{ExtDir: extdir}
+		s := newStorage(t, extdir)
 		manifest, err := s.Manifest(context.Background(), ext.Publisher, ext.Name, "some-version")
 		require.NoError(t, err)
 		require.Equal(t, expected, manifest)
@@ -99,19 +107,15 @@ func TestManifest(t *testing.T) {
 		err = os.WriteFile(file, []byte("invalid"), 0o644)
 		require.NoError(t, err)
 
-		s := &storage.Local{ExtDir: extdir}
-
+		s := newStorage(t, extdir)
 		_, err = s.Manifest(context.Background(), "foo", "bar", "baz")
 		require.Error(t, err)
 	})
 
 	t.Run("Missing", func(t *testing.T) {
 		t.Parallel()
 
-		extdir := t.TempDir()
-		s := &storage.Local{
-			ExtDir: extdir,
-		}
+		s := newStorage(t, t.TempDir())
 		_, err := s.Manifest(context.Background(), "foo", "bar", "baz")
 		require.Error(t, err)
 	})
@@ -151,7 +155,7 @@ func TestWalkExtensions(t *testing.T) {
 	t.Run("NoExtensions", func(t *testing.T) {
 		t.Parallel()
 
-		s := &storage.Local{ExtDir: t.TempDir()}
+		s := newStorage(t, t.TempDir())
 		called := false
 		err := s.WalkExtensions(context.Background(), func(manifest *storage.VSIXManifest, versions []string) error {
 			called = true
@@ -164,7 +168,7 @@ func TestWalkExtensions(t *testing.T) {
 	t.Run("PropagateError", func(t *testing.T) {
 		t.Parallel()
 
-		s := &storage.Local{ExtDir: extdir}
+		s := newStorage(t, extdir)
 		ran := 0
 		expected := errors.New("error")
 		err := s.WalkExtensions(context.Background(), func(manifest *storage.VSIXManifest, versions []string) error {
@@ -179,7 +183,7 @@ func TestWalkExtensions(t *testing.T) {
 		t.Parallel()
 
 		got := []extension{}
-		s := &storage.Local{ExtDir: extdir}
+		s := newStorage(t, extdir)
 		err := s.WalkExtensions(context.Background(), func(manifest *storage.VSIXManifest, versions []string) error {
 			got = append(got, extension{
 				manifest: manifest,
@@ -353,8 +357,7 @@ func TestAddExtension(t *testing.T) {
 					extdir, err = test.setup(extdir)
 					require.NoError(t, err)
 				}
-				s := &storage.Local{ExtDir: extdir}
-
+				s := newStorage(t, extdir)
 				got, err := s.AddExtension(context.Background(), server.URL)
 				if test.error != "" {
 					require.Error(t, err)
@@ -425,8 +428,7 @@ func TestAddExtension(t *testing.T) {
 				}
 
 				extdir := t.TempDir()
-				s := &storage.Local{ExtDir: extdir}
-
+				s := newStorage(t, extdir)
 				source, err := test.source(extdir)
 				require.NoError(t, err)
 
@@ -522,8 +524,7 @@ func TestAddExtension(t *testing.T) {
 				err = os.WriteFile(vsixPath, vsix, 0o644)
 				require.NoError(t, err)
 
-				s := &storage.Local{ExtDir: extdir}
-
+				s := newStorage(t, extdir)
 				got, err := s.AddExtension(context.Background(), vsixPath)
 				require.Error(t, err)
 				require.Regexp(t, test.error, err.Error())
@@ -633,8 +634,7 @@ func TestRemoveExtension(t *testing.T) {
 			addExtension(t, ext, extdir, "b")
 			addExtension(t, ext, extdir, "c")
 
-			s := &storage.Local{ExtDir: extdir}
-
+			s := newStorage(t, extdir)
 			removed, err := s.RemoveExtension(context.Background(), test.remove, test.all)
 			if test.error != "" {
 				require.Error(t, err)