From b70117216103911056b6c602bb0c20977305ee65 Mon Sep 17 00:00:00 2001 From: Mike Landau Date: Thu, 19 Jun 2025 14:55:35 -0700 Subject: [PATCH 1/2] [runx] Use standard github token env name --- internal/devpkg/pkgtype/runx.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/devpkg/pkgtype/runx.go b/internal/devpkg/pkgtype/runx.go index f429d65c063..53539f1f75b 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" + // TODO: 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 +} From 517625d8bea5fce95cd89030d539a7b7dbcd70c7 Mon Sep 17 00:00:00 2001 From: Mike Landau Date: Thu, 19 Jun 2025 15:29:25 -0700 Subject: [PATCH 2/2] edit comment --- internal/devpkg/pkgtype/runx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/devpkg/pkgtype/runx.go b/internal/devpkg/pkgtype/runx.go index 53539f1f75b..2726431dbb7 100644 --- a/internal/devpkg/pkgtype/runx.go +++ b/internal/devpkg/pkgtype/runx.go @@ -13,7 +13,7 @@ const ( RunXScheme = "runx" RunXPrefix = RunXScheme + ":" githubAPITokenVarName = "GITHUB_TOKEN" - // TODO: Keep for backwards compatibility + // Keep for backwards compatibility oldGithubAPITokenVarName = "DEVBOX_GITHUB_API_TOKEN" )