fix modal, add env variables, etc

This commit is contained in:
Andras Bacsai
2023-05-04 22:29:14 +02:00
parent d5b332fc59
commit c4a4801414
27 changed files with 379 additions and 102 deletions

View File

@@ -4,8 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Spatie\Activitylog\Models\Activity;
use Illuminate\Database\Eloquent\Builder;
use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Application extends BaseModel
{
@@ -38,14 +37,6 @@ class Application extends BaseModel
'ports_exposes',
'publish_directory',
];
public $casts = [
'environment_variables' => SchemalessAttributes::class,
];
public function scopeWithEnvironmentVariables(): Builder
{
return $this->environment_variables->modelScope();
}
public function publishDirectory(): Attribute
{
return Attribute::make(
@@ -83,6 +74,10 @@ class Application extends BaseModel
: explode(',', $this->ports_exposes)
);
}
public function environment_variables(): HasMany
{
return $this->hasMany(EnvironmentVariable::class);
}
public function environment()
{
return $this->belongsTo(Environment::class);

View File

@@ -0,0 +1,46 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Auth;
class EnvironmentVariable extends Model
{
protected $fillable = ['key', 'value', 'is_build_time', 'application_id'];
protected $casts = [
'value' => 'encrypted',
'is_build_time' => 'boolean',
];
private function get_environment_variables(string $environment_variable): string|null
{
$team_id = session('currentTeam')->id;
if (str_contains(trim($environment_variable), '{{') && str_contains(trim($environment_variable), '}}')) {
$environment_variable = preg_replace('/\s+/', '', $environment_variable);
$environment_variable = str_replace('{{', '', $environment_variable);
$environment_variable = str_replace('}}', '', $environment_variable);
if (str_starts_with($environment_variable, 'global.')) {
$environment_variable = str_replace('global.', '', $environment_variable);
// $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
return $environment_variable;
}
}
return decrypt($environment_variable);
}
private function set_environment_variables(string $environment_variable): string|null
{
if (!str_contains(trim($environment_variable), '{{') && !str_contains(trim($environment_variable), '}}')) {
return encrypt($environment_variable);
}
return $environment_variable;
}
protected function value(): Attribute
{
return Attribute::make(
get: fn (string $value) => $this->get_environment_variables($value),
set: fn (string $value) => $this->set_environment_variables($value),
);
}
}