cli/cmd: add commands for viewing the cache location and clearing it (#…

…384)

* cli/cmd: add commands for viewing the cache location and clearing it

* extract function

* extract cache paths

cmd/pomerium-cli/cache.go

@@ -10,29 +10,57 @@ import (
  "os"
  "path/filepath"
  "time"
+
+ "github.com/spf13/cobra"
+
+ "github.com/pomerium/cli/internal/cache"
 )
 
-func cachePath() (string, error) {
- root, err := os.UserCacheDir()
- if err != nil {
- return "", err
- }
- return filepath.Join(root, "pomerium-cli", "exec-credential"), nil
+var cacheCmd = &cobra.Command{
+ Use: "cache",
+ Short: "commands for working with the cache",
+}
+
+var cacheClearCmd = &cobra.Command{
+ Use: "clear",
+ Short: "clear the cache",
+ RunE: func(_ *cobra.Command, _ []string) error {
+ return cache.Clear()
+ },
+}
+
+var cacheLocationCmd = &cobra.Command{
+ Use: "location",
+ Short: "print the cache location",
+ RunE: func(cmd *cobra.Command, args []string) error {
+ root, err := cache.RootPath()
+ if err != nil {
+ return err
+ }
+ fmt.Println(root)
+ return nil
+ },
+}
+
+func init() {
+ cacheCmd.AddCommand(cacheClearCmd)
+ cacheCmd.AddCommand(cacheLocationCmd)
+ rootCmd.AddCommand(cacheCmd)
 }
 
 func cachedCredentialPath(serverURL string) (string, error) {
  h := sha256.New()
  _, _ = h.Write([]byte(serverURL))
  id := hex.EncodeToString(h.Sum(nil))
- p, err := cachePath()
+ p, err := cache.ExecCredentialsPath()
  if err != nil {
  return "", err
  }
  return filepath.Join(p, id+".json"), nil
 }
 
 func clearAllCachedCredentials() error {
- cache, err := cachePath()
+ cache, err := cache.ExecCredentialsPath()
  if err != nil {
  return err
  }

internal/cache/cache.go

@@ -0,0 +1,43 @@
+// Package cache contains functions for working with caches.
+package cache
+
+import (
+ "os"
+ "path/filepath"
+)
+
+// Clear clears the cache.
+func Clear() error {
+ root, err := RootPath()
+ if err != nil {
+ return err
+ }
+ return os.RemoveAll(root)
+}
+
+// RootPath returns the root cache path.
+func RootPath() (string, error) {
+ root, err := os.UserCacheDir()
+ if err != nil {
+ return "", err
+ }
+ return filepath.Join(root, "pomerium-cli"), nil
+}
+
+// ExecCredentialsPath returns the path to the exec credentials.
+func ExecCredentialsPath() (string, error) {
+ root, err := RootPath()
+ if err != nil {
+ return "", err
+ }
+ return filepath.Join(root, "exec-credential"), nil
+}
+
+// JWTsPath returns the path to the jwts.
+func JWTsPath() (string, error) {
+ root, err := RootPath()
+ if err != nil {
+ return "", err
+ }
+ return filepath.Join(root, "jwts"), nil
+}

jwt/jwtcache.go

@@ -12,6 +12,7 @@ import (
  "github.com/go-jose/go-jose/v3"
  "github.com/martinlindhe/base36"
 
+ "github.com/pomerium/cli/internal/cache"
  "github.com/pomerium/pomerium/pkg/cryptutil"
 )
 
@@ -36,13 +37,11 @@ type LocalJWTCache struct {
 
 // NewLocalJWTCache creates a new LocalJWTCache.
 func NewLocalJWTCache() (*LocalJWTCache, error) {
- root, err := os.UserCacheDir()
+ dir, err := cache.JWTsPath()
  if err != nil {
  return nil, err
  }
 
- dir := filepath.Join(root, "pomerium-cli", "jwts")
-
  err = os.MkdirAll(dir, 0o755)
  if err != nil {
  return nil, fmt.Errorf("error creating user cache directory: %w", err)