Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor environment variable handling in ApplicationDeploymentJob.php

Browse Source
This commit is contained in:
Andras Bacsai 2024-03-15 22:16:22 +01:00
parent 3ea3674407
commit adf5c9bd46
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/Jobs/ApplicationDeploymentJob.php
View File

@ -1359,20 +1359,47 @@ private function generate_environment_variables($ports)
$environment_variables = collect(); $environment_variables = collect();
if ($this->pull_request_id === 0) { if ($this->pull_request_id === 0) {
foreach ($this->application->runtime_environment_variables as $env) { foreach ($this->application->runtime_environment_variables as $env) {
$real_value = escapeEnvVariables($env->real_value); // This is necessary because we have to escape the value of the environment variable
// but only if the environment variable is created after the 15th of March 2024
// when I implemented the escaping feature.
// Old environment variables are not escaped, because it could break the application
// as the application could expect the unescaped value.
// Yes, I worked on March 15th, 2024, and I implemented this feature.
// It was a national holiday in Hungary.
// Welcome to the life of a solopreneur.
if ($env->created_at > '2024-03-15T20:42:42.000000Z') {
$real_value = escapeEnvVariables($env->real_value);
} else {
$real_value = $env->value;
}
$environment_variables->push("$env->key=$real_value"); $environment_variables->push("$env->key=$real_value");
} }
foreach ($this->application->nixpacks_environment_variables as $env) { foreach ($this->application->nixpacks_environment_variables as $env) {
$real_value = escapeEnvVariables($env->real_value); if ($env->created_at > '2024-03-15T20:42:42.000000Z') {
$real_value = escapeEnvVariables($env->real_value);
} else {
$real_value = $env->value;
}
$environment_variables->push("$env->key=$real_value"); $environment_variables->push("$env->key=$real_value");
} }
} else { } else {
foreach ($this->application->runtime_environment_variables_preview as $env) { foreach ($this->application->runtime_environment_variables_preview as $env) {
$real_value = escapeEnvVariables($env->real_value); if ($env->created_at > '2024-03-15T20:42:42.000000Z') {
$real_value = escapeEnvVariables($env->real_value);
} else {
$real_value = $env->value;
}
$environment_variables->push("$env->key=$real_value"); $environment_variables->push("$env->key=$real_value");
} }
foreach ($this->application->nixpacks_environment_variables_preview as $env) { foreach ($this->application->nixpacks_environment_variables_preview as $env) {
$real_value = escapeEnvVariables($env->real_value); if ($env->created_at > '2024-03-15T20:42:42.000000Z') {
$real_value = escapeEnvVariables($env->real_value);
} else {
$real_value = $env->value;
}
$environment_variables->push("$env->key=$real_value"); $environment_variables->push("$env->key=$real_value");
} }
} }