cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 08:04:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename parser functions

Browse Source
This commit is contained in:
Andras Bacsai 2024-08-23 20:57:22 +02:00
parent 2a9a2dd7c4
commit fe89269b4b
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/ApplicationDeploymentJob.php
View File

@ -451,11 +451,11 @@ private function deploy_docker_compose_buildpack()
$this->cleanup_git();
$this->application->loadComposeFile(isInit: false);
if ($this->application->settings->is_raw_compose_deployment_enabled) {
$this->application->parseRawCompose();
$this->application->oldRawParser();
$yaml = $composeFile = $this->application->docker_compose_raw;
$this->save_environment_variables();
} else {
$composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id, preview_id: data_get($this->preview, 'id'));
$composeFile = $this->application->oldParser(pull_request_id: $this->pull_request_id, preview_id: data_get($this->preview, 'id'));
$this->save_environment_variables();
if (! is_null($this->env_filename)) {
$services = collect($composeFile['services']);

4
app/Livewire/Project/Application/Advanced.php
View File

@ -66,9 +66,9 @@ public function instantSave()
$this->dispatch('resetDefaultLabels', false);
}
if ($this->application->settings->is_raw_compose_deployment_enabled) {
$this->application->parseRawCompose();
$this->application->oldRawParser();
} else {
$this->application->parseCompose();
$this->application->oldParser();
}
$this->application->settings->save();
$this->dispatch('success', 'Settings saved.');

4
app/Livewire/Project/Application/General.php
View File

@ -132,7 +132,7 @@ class General extends Component
public function mount()
{
try {
$this->parsedServices = $this->application->parseCompose();
$this->parsedServices = $this->application->oldParser();
if (is_null($this->parsedServices) || empty($this->parsedServices)) {
$this->dispatch('error', 'Failed to parse your docker-compose file. Please check the syntax and try again.');
@ -205,7 +205,7 @@ public function loadComposeFile($isInit = false)
return;
}
$this->application->parseCompose();
$this->application->oldParser();
$this->dispatch('success', 'Docker compose file loaded.');
$this->dispatch('compose_loaded');
$this->dispatch('refreshStorages');

2
app/Livewire/Project/Shared/ScheduledTask/All.php
View File

@ -26,7 +26,7 @@ public function mount()
$this->containerNames = $this->containerNames->merge($this->resource->databases()->pluck('name'));
} elseif ($this->resource->type() == 'application') {
if ($this->resource->build_pack === 'dockercompose') {
$parsed = $this->resource->parseCompose();
$parsed = $this->resource->oldParser();
$containers = collect(data_get($parsed, 'services'))->keys();
$this->containerNames = $containers;
} else {

10
app/Models/Application.php
View File

@ -1025,7 +1025,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req
}
}
public function parseRawCompose()
public function oldRawParser()
{
try {
$yaml = Yaml::parse($this->docker_compose_raw);
@ -1085,7 +1085,7 @@ public function parseRawCompose()
instant_remote_process($commands, $this->destination->server, false);
}
public function dockerComposeParser(int $pull_request_id = 0, ?int $preview_id = null)
public function newParser(int $pull_request_id = 0, ?int $preview_id = null)
{
$pullRequestId = $pull_request_id;
$isPullRequest = $pullRequestId == 0 ? false : true;
@ -1624,10 +1624,10 @@ public function dockerComposeParser(int $pull_request_id = 0, ?int $preview_id =
return $topLevel;
}
public function parseCompose(int $pull_request_id = 0, ?int $preview_id = null)
public function oldParser(int $pull_request_id = 0, ?int $preview_id = null)
{
if ($this->compose_parsing_version === '3') {
return $this->dockerComposeParser($pull_request_id, $preview_id);
return $this->newParser($pull_request_id, $preview_id);
} else
if ($this->docker_compose_raw) {
return parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id, preview_id: $preview_id);
@ -1681,7 +1681,7 @@ public function loadComposeFile($isInit = false)
if ($composeFileContent) {
$this->docker_compose_raw = $composeFileContent;
$this->save();
$parsedServices = $this->parseCompose();
$parsedServices = $this->oldParser();
if ($this->docker_compose_domains) {
$json = collect(json_decode($this->docker_compose_domains));
$names = collect(data_get($parsedServices, 'services'))->keys()->toArray();

2
app/Models/ApplicationPreview.php
View File

@ -14,7 +14,7 @@ protected static function booted()
static::deleting(function ($preview) {
if ($preview->application->build_pack === 'dockercompose') {
$server = $preview->application->destination->server;
$composeFile = $preview->application->parseCompose(pull_request_id: $preview->pull_request_id);
$composeFile = $preview->application->oldParser(pull_request_id: $preview->pull_request_id);
$volumes = data_get($composeFile, 'volumes');
$networks = data_get($composeFile, 'networks');
$networkKeys = collect($networks)->keys();

8
tests/Feature/DockerComposeParseTest.php
View File

@ -93,8 +93,8 @@
test('ComposeParse', function () {
expect($this->jsonComposeFile)->toBeJson()->ray();
$output = $this->application->dockerComposeParser();
$outputOld = $this->application->parseCompose();
$output = $this->application->newParser();
$outputOld = $this->application->oldParser();
expect($output)->toBeInstanceOf(Collection::class);
expect($outputOld)->toBeInstanceOf(Collection::class);
@ -175,8 +175,8 @@
$previewId = 77;
expect($this->jsonComposeFile)->toBeJson()->ray();
$output = $this->application->dockerComposeParser(pull_request_id: $pullRequestId, preview_id: $previewId);
$outputOld = $this->application->parseCompose();
$output = $this->application->newParser(pull_request_id: $pullRequestId, preview_id: $previewId);
$outputOld = $this->application->oldParser();
expect($output)->toBeInstanceOf(Collection::class);
expect($outputOld)->toBeInstanceOf(Collection::class);