dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "rector: arrrrr"

Browse Source 
This reverts commit 16c0cd10d8.
This commit is contained in:
Andras Bacsai
2025-01-07 15:31:43 +01:00
parent da07b4fdcf
commit 1fe4dd722b
349 changed files with 3689 additions and 4184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Models/EnvironmentVariable.php
View File

@@ -55,30 +55,30 @@ class EnvironmentVariable extends Model
}
});
static::created(function (EnvironmentVariable $environmentVariable) {
if ($environmentVariable->resourceable_type === Application::class && ! $environmentVariable->is_preview) {
$found = ModelsEnvironmentVariable::where('key', $environmentVariable->key)
static::created(function (EnvironmentVariable $environment_variable) {
if ($environment_variable->resourceable_type === Application::class && ! $environment_variable->is_preview) {
$found = ModelsEnvironmentVariable::where('key', $environment_variable->key)
->where('resourceable_type', Application::class)
->where('resourceable_id', $environmentVariable->resourceable_id)
->where('resourceable_id', $environment_variable->resourceable_id)
->where('is_preview', true)
->first();
if (! $found) {
$application = Application::query()->find($environmentVariable->resourceable_id);
$application = Application::find($environment_variable->resourceable_id);
if ($application && $application->build_pack !== 'dockerfile') {
ModelsEnvironmentVariable::create([
'key' => $environmentVariable->key,
'value' => $environmentVariable->value,
'is_build_time' => $environmentVariable->is_build_time,
'is_multiline' => $environmentVariable->is_multiline ?? false,
'key' => $environment_variable->key,
'value' => $environment_variable->value,
'is_build_time' => $environment_variable->is_build_time,
'is_multiline' => $environment_variable->is_multiline ?? false,
'resourceable_type' => Application::class,
'resourceable_id' => $environmentVariable->resourceable_id,
'resourceable_id' => $environment_variable->resourceable_id,
'is_preview' => true,
]);
}
}
}
$environmentVariable->update([
$environment_variable->update([
'version' => config('constants.coolify.version'),
]);
});
@@ -143,15 +143,18 @@ class EnvironmentVariable extends Model
return Attribute::make(
get: function () {
$type = str($this->value)->after('{{')->before('.')->value;
if (str($this->value)->startsWith('{{'.$type) && str($this->value)->endsWith('}}')) {
return true;
}
return str($this->value)->startsWith('{{'.$type) && str($this->value)->endsWith('}}');
return false;
}
);
}
private function get_real_environment_variables(?string $environment_variable = null, $resource = null)
{
if (is_null($resource)) {
if ((is_null($environment_variable) && $environment_variable === '') || is_null($resource)) {
return null;
}
$environment_variable = trim($environment_variable);
@@ -159,12 +162,12 @@ class EnvironmentVariable extends Model
if ($sharedEnvsFound->isEmpty()) {
return $environment_variable;
}
foreach ($sharedEnvsFound as $sharedEnvFound) {
$type = str($sharedEnvFound)->match('/(.*?)\./');
foreach ($sharedEnvsFound as $sharedEnv) {
$type = str($sharedEnv)->match('/(.*?)\./');
if (! collect(SHARED_VARIABLE_TYPES)->contains($type)) {
continue;
}
$variable = str($sharedEnvFound)->match('/\.(.*)/');
$variable = str($sharedEnv)->match('/\.(.*)/');
if ($type->value() === 'environment') {
$id = $resource->environment->id;
} elseif ($type->value() === 'project') {
@@ -175,9 +178,9 @@ class EnvironmentVariable extends Model
if (is_null($id)) {
continue;
}
$environment_variable_found = SharedEnvironmentVariable::query()->where('type', $type)->where('key', $variable)->where('team_id', $resource->team()->id)->where("{$type}_id", $id)->first();
$environment_variable_found = SharedEnvironmentVariable::where('type', $type)->where('key', $variable)->where('team_id', $resource->team()->id)->where("{$type}_id", $id)->first();
if ($environment_variable_found) {
$environment_variable = str($environment_variable)->replace("{{{$sharedEnvFound}}}", $environment_variable_found->value);
$environment_variable = str($environment_variable)->replace("{{{$sharedEnv}}}", $environment_variable_found->value);
}
}