diff --git a/internal/devpkg/pkgtype/runx.go b/internal/devpkg/pkgtype/runx.go index f429d65c063..2726431dbb7 100644 --- a/internal/devpkg/pkgtype/runx.go +++ b/internal/devpkg/pkgtype/runx.go @@ -12,7 +12,9 @@ import ( const ( RunXScheme = "runx" RunXPrefix = RunXScheme + ":" - githubAPITokenVarName = "DEVBOX_GITHUB_API_TOKEN" + githubAPITokenVarName = "GITHUB_TOKEN" + // Keep for backwards compatibility + oldGithubAPITokenVarName = "DEVBOX_GITHUB_API_TOKEN" ) var cachedRegistry *registry.Registry @@ -23,17 +25,25 @@ func IsRunX(s string) bool { func RunXClient() *runx.RunX { return &runx.RunX{ - GithubAPIToken: os.Getenv(githubAPITokenVarName), + GithubAPIToken: getGithubToken(), } } func RunXRegistry(ctx context.Context) (*registry.Registry, error) { if cachedRegistry == nil { var err error - cachedRegistry, err = registry.NewLocalRegistry(ctx, os.Getenv(githubAPITokenVarName)) + cachedRegistry, err = registry.NewLocalRegistry(ctx, getGithubToken()) if err != nil { return nil, err } } return cachedRegistry, nil } + +func getGithubToken() string { + token := os.Getenv(githubAPITokenVarName) + if token == "" { + token = os.Getenv(oldGithubAPITokenVarName) + } + return token +}