prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chore: prepare for PR

Browse source
This commit is contained in:
Andras Bacsai 2026-02-24 09:06:26 +01:00
parent bb500c8caf
commit 6bbae4097e
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/Jobs/ApplicationDeploymentJob.php
View file

@ -217,15 +217,6 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$this->source = $source->getMorphClass()::where('id', $this->application->source->id)->first();
}
// Pre-generate GitHub installation token once to avoid multiple API calls during deployment
if ($this->source instanceof GithubApp && ! $this->source->is_public) {
try {
$this->github_access_token = generateGithubInstallationToken($this->source);
} catch (\Exception $e) {
// Token generation will be retried later if needed
$this->github_access_token = null;
}
}
$this->server = Server::find($this->application_deployment_queue->server_id);
$this->timeout = $this->server->settings->dynamic_timeout;
$this->destination = $this->server->destinations()->where('id', $this->application_deployment_queue->destination_id)->first();
@ -291,6 +282,18 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
return;
}
// Generate GitHub installation token once per deployment execution (not in constructor,
// since queued jobs may sit in the queue long enough for tokens to expire)
if ($this->source instanceof GithubApp && ! $this->source->is_public) {
try {
$this->github_access_token = generateGithubInstallationToken($this->source);
} catch (\Exception $e) {
// Token generation will be retried later via null-coalesce fallback
$this->github_access_token = null;
}
}
try {
// Make sure the private key is stored in the filesystem
$this->server->privateKey->storeInFileSystem();

9
bootstrap/helpers/github.php
View file

@ -61,7 +61,14 @@ function generateGithubToken(GithubApp $source, string $type)
'Authorization' => "Bearer $jwt",
'Accept' => 'application/vnd.github.machine-man-preview+json',
])->timeout($timeout)
->retry(3, 200, throw: false)
->retry(3, 200, function (\Exception $exception) {
// Don't retry auth errors — the same JWT won't become valid on retry
if ($exception instanceof \Illuminate\Http\Client\RequestException) {
return ! in_array($exception->response->status(), [401, 403]);
}
return true;
}, throw: false)
->post("{$source->api_url}/app/installations/{$source->installation_id}/access_tokens");
if (! $response->successful()) {