Skip to content

fix: defer git cred provider construction #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alecthomas merged 1 commit into from
Feb 10, 2026
Merged

fix: defer git cred provider construction #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/cachewd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ func main() {

// Start initialising
tokenManagerProvider := githubapp.NewTokenManagerProvider(globalConfig.GithubAppConfig, logger)
tokenManager, err := tokenManagerProvider()
kctx.FatalIfErrorf(err)
managerProvider := gitclone.NewManagerProvider(ctx, globalConfig.GitCloneConfig, tokenManager)
managerProvider := gitclone.NewManagerProvider(ctx, globalConfig.GitCloneConfig, func() (gitclone.CredentialProvider, error) {
return tokenManagerProvider()
})

scheduler := jobscheduler.New(ctx, globalConfig.SchedulerConfig)

Expand Down
12 changes: 11 additions & 1 deletion internal/gitclone/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ type CredentialProvider interface {
GetTokenForURL(ctx context.Context, url string) (string, error)
}

type CredentialProviderProvider func() (CredentialProvider, error)

type Repository struct {
mu sync.RWMutex
config Config
Expand All @@ -87,8 +89,16 @@ type Manager struct {
// ManagerProvider is a function that lazily creates a singleton Manager.
type ManagerProvider func() (*Manager, error)

func NewManagerProvider(ctx context.Context, config Config, credentialProvider CredentialProvider) ManagerProvider {
func NewManagerProvider(ctx context.Context, config Config, credentialProviderProvider CredentialProviderProvider) ManagerProvider {
return sync.OnceValues(func() (*Manager, error) {
var credentialProvider CredentialProvider
if credentialProviderProvider != nil {
var err error
credentialProvider, err = credentialProviderProvider()
if err != nil {
return nil, errors.WithStack(err)
}
}
return NewManager(ctx, config, credentialProvider)
})
}
Expand Down