Improve ignore globbing and cache GH app tokens

Author: cbrown132

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/alicebob/miniredis/v2 v2.36.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect

go.sum

@@ -11,6 +11,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6TYWexEs=
+github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=

internal/gitauth/github_app.go

@@ -8,13 +8,22 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/cbrown132/driftd/internal/config"
 	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/golang-jwt/jwt/v5"
 )
 
+type appTokenCache struct {
+	mu     sync.Mutex
+	token  string
+	expiry time.Time
+}
+
+var tokenCache sync.Map
+
 func githubAppAuth(ctx context.Context, cfg *config.GitAuthConfig) (*githttp.BasicAuth, error) {
 	if cfg.GitHubApp == nil {
 		return nil, fmt.Errorf("github_app config required")
@@ -38,6 +47,18 @@ func githubAppToken(ctx context.Context, cfg *config.GitHubAppConfig) (string, e
 		return "", fmt.Errorf("github_app app_id and installation_id required")
 	}
 
+	cacheKey := fmt.Sprintf("%d:%d", cfg.AppID, cfg.InstallationID)
+	if cached, ok := tokenCache.Load(cacheKey); ok {
+		c := cached.(*appTokenCache)
+		c.mu.Lock()
+		if c.token != "" && time.Until(c.expiry) > 2*time.Minute {
+			token := c.token
+			c.mu.Unlock()
+			return token, nil
+		}
+		c.mu.Unlock()
+	}
+
 	key, err := loadPrivateKey(cfg)
 	if err != nil {
 		return "", err
@@ -87,6 +108,10 @@ func githubAppToken(ctx context.Context, cfg *config.GitHubAppConfig) (string, e
 	if body.Token == "" {
 		return "", fmt.Errorf("github app token missing in response")
 	}
+
+	expiry := time.Now().Add(58 * time.Minute)
+	c := &appTokenCache{token: body.Token, expiry: expiry}
+	tokenCache.Store(cacheKey, c)
 	return body.Token, nil
 }
 

internal/stack/discover.go

@@ -4,6 +4,8 @@ import (
 	"io/fs"
 	"path/filepath"
 	"strings"
+
+	"github.com/bmatcuk/doublestar/v4"
 )
 
 var defaultIgnore = []string{
@@ -86,13 +88,10 @@ func shouldIgnore(path string, patterns []string) bool {
 }
 
 func matchGlob(pattern, path string) bool {
-	if strings.Contains(pattern, "**") {
-		parts := strings.Split(pattern, "**")
-		if len(parts) == 2 {
-			return strings.HasPrefix(path, strings.TrimSuffix(parts[0], "/")) &&
-				strings.HasSuffix(path, strings.TrimPrefix(parts[1], "/"))
-		}
+	ok, err := doublestar.Match(pattern, path)
+	if err == nil && ok {
+		return true
 	}
-	ok, _ := filepath.Match(pattern, path)
+	ok, _ = filepath.Match(pattern, path)
 	return ok
 }