Split reading a VSIX from adding it

This allows future changes like reading a VSIX from stdin but it also
removes the overlap and duplication in tests.

Author: code-asher

api/api_test.go

@@ -26,7 +26,7 @@ import (
 
 type fakeStorage struct{}
 
-func (s *fakeStorage) AddExtension(ctx context.Context, source string) (*storage.Extension, error) {
+func (s *fakeStorage) AddExtension(ctx context.Context, vsix []byte) (*storage.Extension, error) {
 	return nil, errors.New("not implemented")
 }
 

cli/add.go

@@ -46,9 +46,15 @@ func add() *cobra.Command {
 				return err
 			}
 
+			// Read in the extension.  In the future we might support stdin as well.
+			vsix, err := storage.ReadVSIX(ctx, args[0])
+			if err != nil {
+				return err
+			}
+
 			// Always local storage for now.
 			store := storage.NewLocalStorage(ctx, extdir, logger)
-			ext, err := store.AddExtension(ctx, args[0])
+			ext, err := store.AddExtension(ctx, vsix)
 			if err != nil {
 				return err
 			}

database/database_test.go

@@ -20,7 +20,7 @@ import (
 
 type memoryStorage struct{}
 
-func (s *memoryStorage) AddExtension(ctx context.Context, source string) (*storage.Extension, error) {
+func (s *memoryStorage) AddExtension(ctx context.Context, vsix []byte) (*storage.Extension, error) {
 	return nil, errors.New("not implemented")
 }
 

storage/local.go

@@ -33,14 +33,8 @@ func NewLocalStorage(_ context.Context, extdir string, logger slog.Logger) *Loca
 		Logger: logger,
 	}
 }
-
-func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, error) {
-	vsixBytes, err := readVSIX(ctx, source)
-	if err != nil {
-		return nil, err
-	}
-
-	mr, err := GetZipFileReader(vsixBytes, "extension.vsixmanifest")
+func (s *Local) AddExtension(ctx context.Context, vsix []byte) (*Extension, error) {
+	mr, err := GetZipFileReader(vsix, "extension.vsixmanifest")
 	if err != nil {
 		return nil, err
 	}
@@ -59,7 +53,7 @@ func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, er
 	// Extract the zip to the correct path.
 	identity := manifest.Metadata.Identity
 	dir := filepath.Join(s.ExtDir, identity.Publisher, identity.ID, identity.Version)
-	err = ExtractZip(vsixBytes, func(name string) (io.WriteCloser, error) {
+	err = ExtractZip(vsix, func(name string) (io.WriteCloser, error) {
 		path := filepath.Join(dir, name)
 		err := os.MkdirAll(filepath.Dir(path), 0o755)
 		if err != nil {
@@ -79,7 +73,7 @@ func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, er
 		return nil, err
 	}
 	defer dst.Close()
-	_, err = io.Copy(dst, bytes.NewReader(vsixBytes))
+	_, err = io.Copy(dst, bytes.NewReader(vsix))
 	if err != nil {
 		return nil, err
 	}

storage/storage.go

@@ -98,10 +98,10 @@ type Extension struct {
 
 // TODO: Add Artifactory implementation of Storage.
 type Storage interface {
-	// AddExtension adds the extension found at the specified source by copying it
-	// into the extension storage directory and returns details about the added
-	// extension.  The source may be an URI or a local file path.
-	AddExtension(ctx context.Context, source string) (*Extension, error)
+	// AddExtension adds the provided VSIX by copying it into the extension
+	// storage directory and returns details about the added extension.  The
+	// source may be an URI or a local file path.
+	AddExtension(ctx context.Context, vsix []byte) (*Extension, error)
 	// RemoveExtension removes the extension by id (publisher, name, and version)
 	// or all versions if all is true (in which case the id should omit the
 	// version) and returns the IDs removed.
@@ -160,9 +160,9 @@ func validateManifest(manifest *VSIXManifest) error {
 	return nil
 }
 
-// readVSIX reads the bytes of a VSIX from the specified source.  The source
+// ReadVSIX reads the bytes of a VSIX from the specified source.  The source
 // might be a URI or a local file path.
-func readVSIX(ctx context.Context, source string) ([]byte, error) {
+func ReadVSIX(ctx context.Context, source string) ([]byte, error) {
 	if !strings.HasPrefix(source, "http://") && !strings.HasPrefix(source, "https://") {
 		// Assume it is a local file path.
 		return os.ReadFile(source)