7cfc6746c7
Extract shared variable resolution logic into a reusable helper function
`resolveSharedEnvironmentVariables()` and apply it in applicationParser and
serviceParser to ensure patterns like {{environment.VAR}}, {{project.VAR}},
and {{team.VAR}} are properly resolved in the compose environment section.
Without this, unresolved {{...}} strings would take precedence over resolved
values from the .env file (env_file:) in docker-compose configurations.
128 lines
4.5 KiB
PHP
128 lines
4.5 KiB
PHP
<?php
|
|
|
|
use App\Models\Application;
|
|
use App\Models\Environment;
|
|
use App\Models\EnvironmentVariable;
|
|
use App\Models\Project;
|
|
use App\Models\SharedEnvironmentVariable;
|
|
use App\Models\Team;
|
|
use App\Models\User;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
beforeEach(function () {
|
|
$this->user = User::factory()->create();
|
|
$this->team = Team::factory()->create();
|
|
$this->user->teams()->attach($this->team);
|
|
|
|
$this->project = Project::factory()->create(['team_id' => $this->team->id]);
|
|
$this->environment = Environment::factory()->create([
|
|
'project_id' => $this->project->id,
|
|
]);
|
|
|
|
$this->application = Application::factory()->create([
|
|
'environment_id' => $this->environment->id,
|
|
]);
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables resolves environment-scoped variable', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'DRAGONFLY_URL',
|
|
'value' => 'redis://dragonfly:6379',
|
|
'type' => 'environment',
|
|
'environment_id' => $this->environment->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$resolved = resolveSharedEnvironmentVariables('{{environment.DRAGONFLY_URL}}', $this->application);
|
|
expect($resolved)->toBe('redis://dragonfly:6379');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables resolves project-scoped variable', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'DB_HOST',
|
|
'value' => 'postgres.internal',
|
|
'type' => 'project',
|
|
'project_id' => $this->project->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$resolved = resolveSharedEnvironmentVariables('{{project.DB_HOST}}', $this->application);
|
|
expect($resolved)->toBe('postgres.internal');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables resolves team-scoped variable', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'GLOBAL_API_KEY',
|
|
'value' => 'sk-123456',
|
|
'type' => 'team',
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$resolved = resolveSharedEnvironmentVariables('{{team.GLOBAL_API_KEY}}', $this->application);
|
|
expect($resolved)->toBe('sk-123456');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables returns original when no match found', function () {
|
|
$resolved = resolveSharedEnvironmentVariables('{{environment.NONEXISTENT}}', $this->application);
|
|
expect($resolved)->toBe('{{environment.NONEXISTENT}}');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables handles null and empty values', function () {
|
|
expect(resolveSharedEnvironmentVariables(null, $this->application))->toBeNull();
|
|
expect(resolveSharedEnvironmentVariables('', $this->application))->toBe('');
|
|
expect(resolveSharedEnvironmentVariables('plain-value', $this->application))->toBe('plain-value');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables resolves multiple variables in one string', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'HOST',
|
|
'value' => 'myhost',
|
|
'type' => 'environment',
|
|
'environment_id' => $this->environment->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'PORT',
|
|
'value' => '6379',
|
|
'type' => 'environment',
|
|
'environment_id' => $this->environment->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$resolved = resolveSharedEnvironmentVariables('redis://{{environment.HOST}}:{{environment.PORT}}', $this->application);
|
|
expect($resolved)->toBe('redis://myhost:6379');
|
|
});
|
|
|
|
test('resolveSharedEnvironmentVariables handles spaces in pattern', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'MY_VAR',
|
|
'value' => 'resolved-value',
|
|
'type' => 'environment',
|
|
'environment_id' => $this->environment->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$resolved = resolveSharedEnvironmentVariables('{{ environment.MY_VAR }}', $this->application);
|
|
expect($resolved)->toBe('resolved-value');
|
|
});
|
|
|
|
test('EnvironmentVariable real_value still resolves shared variables after refactor', function () {
|
|
SharedEnvironmentVariable::create([
|
|
'key' => 'DRAGONFLY_URL',
|
|
'value' => 'redis://dragonfly:6379',
|
|
'type' => 'environment',
|
|
'environment_id' => $this->environment->id,
|
|
'team_id' => $this->team->id,
|
|
]);
|
|
|
|
$env = EnvironmentVariable::create([
|
|
'key' => 'REDIS_URL',
|
|
'value' => '{{environment.DRAGONFLY_URL}}',
|
|
'resourceable_id' => $this->application->id,
|
|
'resourceable_type' => $this->application->getMorphClass(),
|
|
]);
|
|
|
|
expect($env->real_value)->toBe('redis://dragonfly:6379');
|
|
});
|