Fix up tests

Author: samcoe

example_gh_test.go

@@ -103,7 +103,7 @@ func ExampleRESTClient_pagination() {
 		}
 		return "", false
 	}
-	client, err := gh.RESTClient(nil)
+	client, err := api.DefaultRESTClient()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -195,8 +195,8 @@ func ExampleGQLClient() {
 }
 
 // Add a star to the cli/go-gh repository using the GQL API.
-func ExampleGQLClient_mutate_simple() {
-	client, err := gh.GQLClient(nil)
+func ExampleGQLClient_mutate() {
+	client, err := api.DefaultGQLClient()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -231,7 +231,7 @@ func ExampleGQLClient_mutate_simple() {
 
 // Query releases from cli/cli repository using GQL API with paginated results.
 func ExampleGQLClient_pagination() {
-	client, err := gh.GQLClient(nil)
+	client, err := api.DefaultGQLClient()
 	if err != nil {
 		log.Fatal(err)
 	}

gh.go

@@ -7,37 +7,62 @@ package gh
 
 import (
 	"bytes"
+	"context"
 	"fmt"
+	"io"
+	"os"
 	"os/exec"
 
 	"github.com/cli/safeexec"
 )
 
-// Exec gh command with provided arguments.
-func Exec(args ...string) (stdOut, stdErr bytes.Buffer, err error) {
-	path, err := path()
+// Exec invokes a gh command in a subprocess and captures the output and error streams.
+func Exec(args ...string) (stdout, stderr bytes.Buffer, err error) {
+	ghExe, err := ghLookPath()
 	if err != nil {
-		err = fmt.Errorf("could not find gh executable in PATH. error: %w", err)
 		return
 	}
-	return run(path, nil, args...)
+	err = run(context.Background(), ghExe, nil, nil, &stdout, &stderr, args)
+	return
+}
+
+// ExecContext invokes a gh command in a subprocess and captures the output and error streams.
+func ExecContext(ctx context.Context, args ...string) (stdout, stderr bytes.Buffer, err error) {
+	ghExe, err := ghLookPath()
+	if err != nil {
+		return
+	}
+	err = run(ctx, ghExe, nil, nil, &stdout, &stderr, args)
+	return
 }
 
-func path() (string, error) {
+// Exec invokes a gh command in a subprocess with its stdin, stdout, and stderr streams connected to
+// those of the parent process. This is suitable for running gh commands with interactive prompts.
+func ExecInteractive(ctx context.Context, args ...string) error {
+	ghExe, err := ghLookPath()
+	if err != nil {
+		return err
+	}
+	return run(ctx, ghExe, nil, os.Stdin, os.Stdout, os.Stderr, args)
+}
+
+func ghLookPath() (string, error) {
+	if ghExe := os.Getenv("GH_PATH"); ghExe != "" {
+		return ghExe, nil
+	}
 	return safeexec.LookPath("gh")
 }
 
-func run(path string, env []string, args ...string) (stdOut, stdErr bytes.Buffer, err error) {
-	cmd := exec.Command(path, args...)
-	cmd.Stdout = &stdOut
-	cmd.Stderr = &stdErr
+func run(ctx context.Context, ghExe string, env []string, stdin io.Reader, stdout, stderr io.Writer, args []string) error {
+	cmd := exec.CommandContext(ctx, ghExe, args...)
+	cmd.Stdin = stdin
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
 	if env != nil {
 		cmd.Env = env
 	}
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("failed to run gh: %s. error: %w", stdErr.String(), err)
-		return
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("gh execution failed: %w", err)
 	}
-	return
+	return nil
 }

pkg/api/cache_test.go

@@ -31,13 +31,17 @@ func TestCacheResponse(t *testing.T) {
 
 	cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")
 
-	httpClient, _ := NewHTTPClient(
+	httpClient, err := NewHTTPClient(
 		ClientOptions{
+			Host:         "github.com",
+			AuthToken:    "token",
 			Transport:    fakeHTTP,
 			EnableCache:  true,
 			CacheDir:     cacheDir,
 			LogIgnoreEnv: true,
-		})
+		},
+	)
+	assert.NoError(t, err)
 
 	do := func(method, url string, body io.Reader) (string, error) {
 		req, err := http.NewRequest(method, url, body)
@@ -57,7 +61,6 @@ func TestCacheResponse(t *testing.T) {
 	}
 
 	var res string
-	var err error
 
 	res, err = do("GET", "http://example.com/path", nil)
 	assert.NoError(t, err)
@@ -112,13 +115,17 @@ func TestCacheResponseRequestCacheOptions(t *testing.T) {
 
 	cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")
 
-	httpClient, _ := NewHTTPClient(
+	httpClient, err := NewHTTPClient(
 		ClientOptions{
+			Host:         "github.com",
+			AuthToken:    "token",
 			Transport:    fakeHTTP,
 			EnableCache:  false,
 			CacheDir:     cacheDir,
 			LogIgnoreEnv: true,
-		})
+		},
+	)
+	assert.NoError(t, err)
 
 	do := func(method, url string, body io.Reader) (string, error) {
 		req, err := http.NewRequest(method, url, body)
@@ -140,7 +147,6 @@ func TestCacheResponseRequestCacheOptions(t *testing.T) {
 	}
 
 	var res string
-	var err error
 
 	res, err = do("GET", "http://example.com/path", nil)
 	assert.NoError(t, err)