Fix adding from http/s

This broke when adding bulk add as the marketplace did a stat first to
see if the source was a directory which fails for URLs.

Author: code-asher

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.2.1](https://github.com/coder/code-marketplace/releases/tag/v1.2.1) - 2022-10-31
+
+### Fixed
+
+- Adding extensions from a URL. This broke in 1.2.0 with the addition of bulk
+  adding.
+
 ## [1.2.0](https://github.com/coder/code-marketplace/releases/tag/v1.2.0) - 2022-10-20
 
 ### Added

cli/add.go

@@ -56,14 +56,19 @@ func add() *cobra.Command {
 				return err
 			}
 
-			stat, err := os.Stat(args[0])
-			if err != nil {
-				return err
+			// The source might be a local directory with extensions.
+			isDir := false
+			if !strings.HasPrefix(args[0], "http://") && !strings.HasPrefix(args[0], "https://") {
+				stat, err := os.Stat(args[0])
+				if err != nil {
+					return err
+				}
+				isDir = stat.IsDir()
 			}
 
 			var summary []string
 			var failed []string
-			if stat.IsDir() {
+			if isDir {
 				files, err := os.ReadDir(args[0])
 				if err != nil {
 					return err

cli/add_test.go

@@ -3,6 +3,8 @@ package cli_test
 import (
 	"bytes"
 	"fmt"
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
@@ -97,42 +99,60 @@ func TestAdd(t *testing.T) {
 			}
 
 			// With multiple extensions use bulk add by pointing to the directory
-			// otherwise point to the vsix file.
-			source := extdir
+			// otherwise point to the vsix file.  When not using bulk add also test
+			// from HTTP.
+			sources := []string{extdir}
 			if count == 1 {
-				source = filepath.Join(extdir, "0.vsix")
+				sources = []string{filepath.Join(extdir, "0.vsix")}
+
+				handler := func(rw http.ResponseWriter, r *http.Request) {
+					var vsix []byte
+					if test.vsixes == nil {
+						vsix = testutil.CreateVSIXFromExtension(t, test.extensions[0])
+					} else {
+						vsix = test.vsixes[0]
+					}
+					_, err := rw.Write(vsix)
+					require.NoError(t, err)
+				}
+				server := httptest.NewServer(http.HandlerFunc(handler))
+				defer server.Close()
+
+				sources = append(sources, server.URL)
 			}
 
-			cmd := cli.Root()
-			args := []string{"add", source, "--extensions-dir", extdir}
-			cmd.SetArgs(args)
-			buf := new(bytes.Buffer)
-			cmd.SetOutput(buf)
+			for _, source := range sources {
+				cmd := cli.Root()
+				args := []string{"add", source, "--extensions-dir", extdir}
+				cmd.SetArgs(args)
+				buf := new(bytes.Buffer)
+				cmd.SetOutput(buf)
 
-			err := cmd.Execute()
-			output := buf.String()
+				err := cmd.Execute()
+				output := buf.String()
 
-			if test.error != "" {
-				require.Error(t, err)
-				require.Regexp(t, test.error, err.Error())
-			} else {
-				require.NoError(t, err)
-			}
-			// Should list all the extensions that worked.
-			for _, ext := range test.extensions {
-				// Should exist on disk.
-				dest := filepath.Join(extdir, ext.Publisher, ext.Name, ext.LatestVersion)
-				_, err := os.Stat(dest)
-				require.NoError(t, err)
-				// Should tell you where it went.
-				id := storage.ExtensionID(ext.Publisher, ext.Name, ext.LatestVersion)
-				require.Contains(t, output, fmt.Sprintf("Unpacked %s to %s", id, dest))
-				// Should mention the dependencies and pack.
-				require.Contains(t, output, fmt.Sprintf("%s has %d dep", id, len(ext.Dependencies)))
-				if len(ext.Pack) > 0 {
-					require.Contains(t, output, fmt.Sprintf("%s is in a pack with %d other", id, len(ext.Pack)))
+				if test.error != "" {
+					require.Error(t, err)
+					require.Regexp(t, test.error, err.Error())
 				} else {
-					require.Contains(t, output, fmt.Sprintf("%s is not in a pack", id))
+					require.NoError(t, err)
+				}
+				// Should list all the extensions that worked.
+				for _, ext := range test.extensions {
+					// Should exist on disk.
+					dest := filepath.Join(extdir, ext.Publisher, ext.Name, ext.LatestVersion)
+					_, err := os.Stat(dest)
+					require.NoError(t, err)
+					// Should tell you where it went.
+					id := storage.ExtensionID(ext.Publisher, ext.Name, ext.LatestVersion)
+					require.Contains(t, output, fmt.Sprintf("Unpacked %s to %s", id, dest))
+					// Should mention the dependencies and pack.
+					require.Contains(t, output, fmt.Sprintf("%s has %d dep", id, len(ext.Dependencies)))
+					if len(ext.Pack) > 0 {
+						require.Contains(t, output, fmt.Sprintf("%s is in a pack with %d other", id, len(ext.Pack)))
+					} else {
+						require.Contains(t, output, fmt.Sprintf("%s is not in a pack", id))
+					}
 				}
 			}
 		})