Merge pull request cli#4568 from cli/bin-ext-dispatch

Nate Smith · web-flow · commit 1f3478d52647 · 2021-10-21T12:13:59.000-05:00
dispatch binary extensions directly
diff --git a/pkg/cmd/extension/extension.go b/pkg/cmd/extension/extension.go
@@ -48,3 +48,7 @@ func (e *Extension) UpdateAvailable() bool {
 	}
 	return true
 }
+
+func (e *Extension) IsBinary() bool {
+	return e.kind == BinaryKind
+}
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -69,9 +69,11 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 	forwardArgs := args[1:]
 
 	exts, _ := m.list(false)
+	var ext Extension
 	for _, e := range exts {
 		if e.Name() == extName {
-			exe = e.Path()
+			ext = e
+			exe = ext.Path()
 			break
 		}
 	}
@@ -81,7 +83,9 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 
 	var externalCmd *exec.Cmd
 
-	if runtime.GOOS == "windows" {
+	if ext.IsBinary() || runtime.GOOS != "windows" {
+		externalCmd = m.newCommand(exe, forwardArgs...)
+	} else if runtime.GOOS == "windows" {
 		// Dispatch all extension calls through the `sh` interpreter to support executable files with a
 		// shebang line on Windows.
 		shExe, err := m.findSh()
@@ -93,8 +97,6 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 		}
 		forwardArgs = append([]string{"-c", `command "$@"`, "--", exe}, forwardArgs...)
 		externalCmd = m.newCommand(shExe, forwardArgs...)
-	} else {
-		externalCmd = m.newCommand(exe, forwardArgs...)
 	}
 	externalCmd.Stdin = stdin
 	externalCmd.Stdout = stdout
@@ -268,30 +270,30 @@ 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 ext.IsBinary() {
+		repo, err := ghrepo.FromFullName(ext.url)
 		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()
+		r, err := fetchLatestRelease(m.client, repo)
 		if err != nil {
 			return "", err
 		}
-		remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
-		return string(remoteSha), nil
+		return r.Tag, nil
 	} else {
-		repo, err := ghrepo.FromFullName(ext.url)
+		gitExe, err := m.lookPath("git")
 		if err != nil {
 			return "", err
 		}
-		r, err := fetchLatestRelease(m.client, repo)
+		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
 		}
-		return r.Tag, nil
+		remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
+		return string(remoteSha), nil
 	}
 }
 
@@ -477,7 +479,7 @@ func (m *Manager) upgradeExtension(ext Extension, force bool) error {
 		return upToDateError
 	}
 	var err error
-	if ext.kind == BinaryKind {
+	if ext.IsBinary() {
 		err = m.upgradeBinExtension(ext)
 	} else {
 		err = m.upgradeGitExtension(ext, force)
diff --git a/pkg/cmd/extension/manager_test.go b/pkg/cmd/extension/manager_test.go
@@ -139,6 +139,30 @@ func TestManager_Dispatch(t *testing.T) {
 	assert.Equal(t, "", stderr.String())
 }
 
+func TestManager_Dispatch_binary(t *testing.T) {
+	tempDir := t.TempDir()
+	extPath := filepath.Join(tempDir, "extensions", "gh-hello")
+	exePath := filepath.Join(extPath, "gh-hello")
+	bm := binManifest{
+		Owner: "owner",
+		Name:  "gh-hello",
+		Host:  "github.com",
+		Tag:   "v1.0.0",
+	}
+	assert.NoError(t, stubBinaryExtension(extPath, bm))
+
+	m := newTestManager(tempDir, nil, nil)
+
+	stdout := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+	found, err := m.Dispatch([]string{"hello", "one", "two"}, nil, stdout, stderr)
+	assert.NoError(t, err)
+	assert.True(t, found)
+
+	assert.Equal(t, fmt.Sprintf("[%s one two]\n", exePath), stdout.String())
+	assert.Equal(t, "", stderr.String())
+}
+
 func TestManager_Remove(t *testing.T) {
 	tempDir := t.TempDir()
 	assert.NoError(t, stubExtension(filepath.Join(tempDir, "extensions", "gh-hello", "gh-hello")))
diff --git a/pkg/extensions/extension.go b/pkg/extensions/extension.go
@@ -13,6 +13,7 @@ type Extension interface {
 	URL() string
 	IsLocal() bool
 	UpdateAvailable() bool
+	IsBinary() bool
 }
 
 //go:generate moq -rm -out manager_mock.go . ExtensionManager
diff --git a/pkg/extensions/extension_mock.go b/pkg/extensions/extension_mock.go

Original file line number	Diff line number	Diff line change
`@@ -48,3 +48,7 @@ func (e *Extension) UpdateAvailable() bool {`
`48`	`48`	`}`
`49`	`49`	`return true`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+func (e *Extension) IsBinary() bool {`
	`53`	`+ return e.kind == BinaryKind`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ type Extension interface {`
`13`	`13`	`URL() string`
`14`	`14`	`IsLocal() bool`
`15`	`15`	`UpdateAvailable() bool`
	`16`	`+ IsBinary() bool`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`//go:generate moq -rm -out manager_mock.go . ExtensionManager`