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

Refactor storage connection handling and project

Browse Source 
initialization
This commit is contained in:
Andras Bacsai 2023-11-15 09:34:27 +01:00
parent 1f711d9281
commit b825d98b2d
7 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/Boarding/Index.php
View File

@ -33,7 +33,7 @@ class Index extends Component
public ?string $remoteServerUser = 'root'; public ?string $remoteServerUser = 'root';
public ?Server $createdServer = null; public ?Server $createdServer = null;
public Collection|array $projects = []; public Collection $projects;
public ?int $selectedExistingProject = null; public ?int $selectedExistingProject = null;
public ?Project $createdProject = null; public ?Project $createdProject = null;

11
app/Http/Livewire/Team/Storage/Create.php
View File

@ -64,21 +64,10 @@ class Create extends Component
} }
$this->storage->team_id = currentTeam()->id; $this->storage->team_id = currentTeam()->id;
$this->storage->testConnection(); $this->storage->testConnection();
$this->storage->is_usable = true;
$this->storage->save(); $this->storage->save();
return redirect()->route('team.storages.show', $this->storage->uuid); return redirect()->route('team.storages.show', $this->storage->uuid);
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }
} }
private function test_s3_connection()
{
try {
$this->storage->testConnection();
return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
} catch (\Throwable $e) {
return handleError($e, $this);
}
}
} }

7
app/Http/Livewire/Team/Storage/Form.php
View File

@ -32,7 +32,7 @@ class Form extends Component
public function test_s3_connection() public function test_s3_connection()
{ {
try { try {
$this->storage->testConnection(); $this->storage->testConnection(shouldSave: true);
return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.'); return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
@ -53,10 +53,7 @@ class Form extends Component
{ {
$this->validate(); $this->validate();
try { try {
$this->storage->testConnection(); $this->test_s3_connection();
$this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
$this->storage->save();
$this->emit('success', 'Storage settings saved.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }

2
app/Jobs/DatabaseBackupJob.php
View File

@ -434,7 +434,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
// $region = $this->s3->region; // $region = $this->s3->region;
$bucket = $this->s3->bucket; $bucket = $this->s3->bucket;
$endpoint = $this->s3->endpoint; $endpoint = $this->s3->endpoint;
$this->s3->testConnection(); $this->s3->testConnection(shouldSave: true);
if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') { if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
$network = $this->database->service->destination->network; $network = $this->database->service->destination->network;
} else { } else {

5
app/Models/S3Storage.php
View File

@ -36,14 +36,13 @@ class S3Storage extends BaseModel
return "{$this->endpoint}/{$this->bucket}"; return "{$this->endpoint}/{$this->bucket}";
} }
public function testConnection() public function testConnection(bool $shouldSave = false)
{ {
try { try {
set_s3_target($this); set_s3_target($this);
Storage::disk('custom-s3')->files(); Storage::disk('custom-s3')->files();
$this->unusable_email_sent = false; $this->unusable_email_sent = false;
$this->is_usable = true; $this->is_usable = true;
return;
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->is_usable = false; $this->is_usable = false;
if ($this->unusable_email_sent === false && is_transactional_emails_active()) { if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
@ -65,7 +64,9 @@ class S3Storage extends BaseModel
throw $e; throw $e;
} finally { } finally {
if ($shouldSave) {
$this->save(); $this->save();
} }
} }
} }
}

1
bootstrap/helpers/shared.php
View File

@ -511,7 +511,6 @@ function generateDeployWebhook($resource)
return $url; return $url;
} }
function generateGitManualWebhook($resource, $type) { function generateGitManualWebhook($resource, $type) {
ray($resource);
if ($resource->source_id !== 0 && !is_null($resource->source_id)) { if ($resource->source_id !== 0 && !is_null($resource->source_id)) {
return null; return null;
} }