Merge pull request cli#4396 from cli/speedy-extension-list

samcoe · web-flow · commit 968b093eda2c · 2021-10-12T15:53:51.000-07:00
Use concurrency to check for extension updates
diff --git a/pkg/cmd/extension/command_test.go b/pkg/cmd/extension/command_test.go
@@ -214,8 +214,8 @@ func TestNewCmdExtension(t *testing.T) {
 			args: []string{"list"},
 			managerStubs: func(em *extensions.ExtensionManagerMock) func(*testing.T) {
 				em.ListFunc = func(bool) []extensions.Extension {
-					ex1 := &Extension{path: "cli/gh-test", url: "https://github.com/cli/gh-test", updateAvailable: false}
-					ex2 := &Extension{path: "cli/gh-test2", url: "https://github.com/cli/gh-test2", updateAvailable: true}
+					ex1 := &Extension{path: "cli/gh-test", url: "https://github.com/cli/gh-test", currentVersion: "1", latestVersion: "1"}
+					ex2 := &Extension{path: "cli/gh-test2", url: "https://github.com/cli/gh-test2", currentVersion: "1", latestVersion: "2"}
 					return []extensions.Extension{ex1, ex2}
 				}
 				return func(t *testing.T) {
diff --git a/pkg/cmd/extension/extension.go b/pkg/cmd/extension/extension.go
@@ -7,11 +7,20 @@ import (
 
 const manifestName = "manifest.yml"
 
+type ExtensionKind int
+
+const (
+	GitKind ExtensionKind = iota
+	BinaryKind
+)
+
 type Extension struct {
-	path            string
-	url             string
-	isLocal         bool
-	updateAvailable bool
+	path           string
+	url            string
+	isLocal        bool
+	currentVersion string
+	latestVersion  string
+	kind           ExtensionKind
 }
 
 func (e *Extension) Name() string {
@@ -31,5 +40,11 @@ func (e *Extension) IsLocal() bool {
 }
 
 func (e *Extension) UpdateAvailable() bool {
-	return e.updateAvailable
+	if e.isLocal ||
+		e.currentVersion == "" ||
+		e.latestVersion == "" ||
+		e.currentVersion == e.latestVersion {
+		return false
+	}
+	return true
 }
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -14,6 +14,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/cli/cli/v2/api"
@@ -103,146 +104,195 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 
 func (m *Manager) List(includeMetadata bool) []extensions.Extension {
 	exts, _ := m.list(includeMetadata)
-	return exts
+	r := make([]extensions.Extension, len(exts))
+	for i, v := range exts {
+		val := v
+		r[i] = &val
+	}
+	return r
 }
 
-func (m *Manager) list(includeMetadata bool) ([]extensions.Extension, error) {
+func (m *Manager) list(includeMetadata bool) ([]Extension, error) {
 	dir := m.installDir()
 	entries, err := ioutil.ReadDir(dir)
 	if err != nil {
 		return nil, err
 	}
 
-	var results []extensions.Extension
+	var results []Extension
 	for _, f := range entries {
 		if !strings.HasPrefix(f.Name(), "gh-") {
 			continue
 		}
-		ext, err := m.parseExtensionDir(f, includeMetadata)
-		if err != nil {
-			return nil, err
+		var ext Extension
+		var err error
+		if f.IsDir() {
+			ext, err = m.parseExtensionDir(f)
+			if err != nil {
+				return nil, err
+			}
+			results = append(results, ext)
+		} else {
+			ext, err = m.parseExtensionFile(f)
+			if err != nil {
+				return nil, err
+			}
+			results = append(results, ext)
 		}
-		results = append(results, ext)
+	}
+
+	if includeMetadata {
+		m.populateLatestVersions(results)
 	}
 
 	return results, nil
 }
 
-func (m *Manager) parseExtensionDir(fi fs.FileInfo, includeMetadata bool) (*Extension, error) {
+func (m *Manager) parseExtensionFile(fi fs.FileInfo) (Extension, error) {
+	ext := Extension{isLocal: true}
+	id := m.installDir()
+	exePath := filepath.Join(id, fi.Name(), fi.Name())
+	if !isSymlink(fi.Mode()) {
+		// if this is a regular file, its contents is the local directory of the extension
+		p, err := readPathFromFile(filepath.Join(id, fi.Name()))
+		if err != nil {
+			return ext, err
+		}
+		exePath = filepath.Join(p, fi.Name())
+	}
+	ext.path = exePath
+	return ext, nil
+}
+
+func (m *Manager) parseExtensionDir(fi fs.FileInfo) (Extension, error) {
 	id := m.installDir()
 	if _, err := os.Stat(filepath.Join(id, fi.Name(), manifestName)); err == nil {
-		return m.parseBinaryExtensionDir(fi, includeMetadata)
+		return m.parseBinaryExtensionDir(fi)
 	}
 
-	return m.parseGitExtensionDir(fi, includeMetadata)
+	return m.parseGitExtensionDir(fi)
 }
 
-func (m *Manager) parseBinaryExtensionDir(fi fs.FileInfo, includeMetadata bool) (*Extension, error) {
+func (m *Manager) parseBinaryExtensionDir(fi fs.FileInfo) (Extension, error) {
 	id := m.installDir()
 	exePath := filepath.Join(id, fi.Name(), fi.Name())
+	ext := Extension{path: exePath, kind: BinaryKind}
 	manifestPath := filepath.Join(id, fi.Name(), manifestName)
 	manifest, err := os.ReadFile(manifestPath)
 	if err != nil {
-		return nil, fmt.Errorf("could not open %s for reading: %w", manifestPath, err)
+		return ext, fmt.Errorf("could not open %s for reading: %w", manifestPath, err)
 	}
-
 	var bm binManifest
 	err = yaml.Unmarshal(manifest, &bm)
 	if err != nil {
-		return nil, fmt.Errorf("could not parse %s: %w", manifestPath, err)
+		return ext, fmt.Errorf("could not parse %s: %w", manifestPath, err)
 	}
-
 	repo := ghrepo.NewWithHost(bm.Owner, bm.Name, bm.Host)
-
-	var remoteURL string
-	var updateAvailable bool
-
-	if includeMetadata {
-		remoteURL = ghrepo.GenerateRepoURL(repo, "")
-		var r *release
-		r, err = fetchLatestRelease(m.client, repo)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get release info for %s: %w", ghrepo.FullName(repo), err)
-		}
-		if bm.Tag != r.Tag {
-			updateAvailable = true
-		}
-	}
-
-	return &Extension{
-		path:            exePath,
-		url:             remoteURL,
-		updateAvailable: updateAvailable,
-	}, nil
+	remoteURL := ghrepo.GenerateRepoURL(repo, "")
+	ext.url = remoteURL
+	ext.currentVersion = bm.Tag
+	return ext, nil
 }
 
-func (m *Manager) parseGitExtensionDir(fi fs.FileInfo, includeMetadata bool) (*Extension, error) {
-	// TODO untangle local from this since local might be binary or git
+func (m *Manager) parseGitExtensionDir(fi fs.FileInfo) (Extension, error) {
 	id := m.installDir()
-	var remoteUrl string
-	updateAvailable := false
-	isLocal := false
 	exePath := filepath.Join(id, fi.Name(), fi.Name())
-	if fi.IsDir() {
-		if includeMetadata {
-			remoteUrl = m.getRemoteUrl(fi.Name())
-			updateAvailable = m.checkUpdateAvailable(fi.Name())
-		}
-	} else {
-		isLocal = true
-		if !isSymlink(fi.Mode()) {
-			// if this is a regular file, its contents is the local directory of the extension
-			p, err := readPathFromFile(filepath.Join(id, fi.Name()))
-			if err != nil {
-				return nil, err
-			}
-			exePath = filepath.Join(p, fi.Name())
-		}
-	}
-
-	return &Extension{
-		path:            exePath,
-		url:             remoteUrl,
-		isLocal:         isLocal,
-		updateAvailable: updateAvailable,
+	remoteUrl := m.getRemoteUrl(fi.Name())
+	currentVersion := m.getCurrentVersion(fi.Name())
+	return Extension{
+		path:           exePath,
+		url:            remoteUrl,
+		isLocal:        false,
+		currentVersion: currentVersion,
+		kind:           GitKind,
 	}, nil
 }
 
-func (m *Manager) getRemoteUrl(extension string) string {
+// getCurrentVersion determines the current version for non-local git extensions.
+func (m *Manager) getCurrentVersion(extension string) string {
 	gitExe, err := m.lookPath("git")
 	if err != nil {
 		return ""
 	}
 	dir := m.installDir()
 	gitDir := "--git-dir=" + filepath.Join(dir, extension, ".git")
-	cmd := m.newCommand(gitExe, gitDir, "config", "remote.origin.url")
-	url, err := cmd.Output()
+	cmd := m.newCommand(gitExe, gitDir, "rev-parse", "HEAD")
+	localSha, err := cmd.Output()
 	if err != nil {
 		return ""
 	}
-	return strings.TrimSpace(string(url))
+	return string(bytes.TrimSpace(localSha))
 }
 
-func (m *Manager) checkUpdateAvailable(extension string) bool {
+// getRemoteUrl determines the remote URL for non-local git extensions.
+func (m *Manager) getRemoteUrl(extension string) string {
 	gitExe, err := m.lookPath("git")
 	if err != nil {
-		return false
+		return ""
 	}
 	dir := m.installDir()
 	gitDir := "--git-dir=" + filepath.Join(dir, extension, ".git")
-	cmd := m.newCommand(gitExe, gitDir, "ls-remote", "origin", "HEAD")
-	lsRemote, err := cmd.Output()
+	cmd := m.newCommand(gitExe, gitDir, "config", "remote.origin.url")
+	url, err := cmd.Output()
 	if err != nil {
-		return false
+		return ""
 	}
-	remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
-	cmd = m.newCommand(gitExe, gitDir, "rev-parse", "HEAD")
-	localSha, err := cmd.Output()
-	if err != nil {
-		return false
+	return strings.TrimSpace(string(url))
+}
+
+func (m *Manager) populateLatestVersions(exts []Extension) {
+	size := len(exts)
+	type result struct {
+		index   int
+		version string
+	}
+	ch := make(chan result, size)
+	var wg sync.WaitGroup
+	wg.Add(size)
+	for idx, ext := range exts {
+		go func(i int, e Extension) {
+			defer wg.Done()
+			version, _ := m.getLatestVersion(e)
+			ch <- result{index: i, version: version}
+		}(idx, ext)
+	}
+	wg.Wait()
+	close(ch)
+	for r := range ch {
+		ext := &exts[r.index]
+		ext.latestVersion = r.version
+	}
+}
+
+func (m *Manager) getLatestVersion(ext Extension) (string, error) {
+	if ext.isLocal {
+		return "", fmt.Errorf("unable to get latest version for local extensions")
+	}
+	if ext.kind == GitKind {
+		gitExe, err := m.lookPath("git")
+		if err != nil {
+			return "", err
+		}
+		extDir := filepath.Dir(ext.path)
+		gitDir := "--git-dir=" + filepath.Join(extDir, ".git")
+		cmd := m.newCommand(gitExe, gitDir, "ls-remote", "origin", "HEAD")
+		lsRemote, err := cmd.Output()
+		if err != nil {
+			return "", err
+		}
+		remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
+		return string(remoteSha), nil
+	} else {
+		repo, err := ghrepo.FromFullName(ext.url)
+		if err != nil {
+			return "", err
+		}
+		r, err := fetchLatestRelease(m.client, repo)
+		if err != nil {
+			return "", err
+		}
+		return r.Tag, nil
 	}
-	localSha = bytes.TrimSpace(localSha)
-	return !bytes.Equal(remoteSha, localSha)
 }
 
 func (m *Manager) InstallLocal(dir string) error {
