Add CacheDir function to config package (#126)

cli · Aug 10, 2023 · baae867 · baae867
1 parent dadb47a
commit baae867
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/pkg/api/http_client.go b/pkg/api/http_client.go
@@ -6,13 +6,13 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
 	"regexp"
 	"runtime/debug"
 	"strings"
 	"time"
 
 	"github.com/cli/go-gh/v2/pkg/asciisanitizer"
+	"github.com/cli/go-gh/v2/pkg/config"
 	"github.com/cli/go-gh/v2/pkg/term"
 	"github.com/henvic/httpretty"
 	"github.com/thlib/go-timezone-local/tzlocal"
@@ -68,7 +68,7 @@ func NewHTTPClient(opts ClientOptions) (*http.Client, error) {
 	transport = newSanitizerRoundTripper(transport)
 
 	if opts.CacheDir == "" {
-		opts.CacheDir = filepath.Join(os.TempDir(), "gh-cli-cache")
+		opts.CacheDir = config.CacheDir()
 	}
 	if opts.EnableCache && opts.CacheTTL == 0 {
 		opts.CacheTTL = time.Hour * 24

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -268,6 +268,11 @@ func DataDir() string {
 	return path
 }
 
+// CacheDir returns the default path for gh cli cache.
+func CacheDir() string {
+	return filepath.Join(os.TempDir(), "gh-cli-cache")
+}
+
 func readFile(filename string) ([]byte, error) {
 	f, err := os.Open(filename)
 	if err != nil {

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -219,6 +219,12 @@ func TestDataDir(t *testing.T) {
 	}
 }
 
+func TestCacheDir(t *testing.T) {
+	expected := filepath.Join(os.TempDir(), "gh-cli-cache")
+	actual := CacheDir()
+	assert.Equal(t, expected, actual)
+}
+
 func TestLoad(t *testing.T) {
 	tempDir := t.TempDir()
 	globalFilePath := filepath.Join(tempDir, "config.yml")