From 12c7ee287946458365e3f21fee8801e459c8c901 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:40:40 +0100 Subject: [PATCH] fix(s3): DigitalOcean storage buckets do not work --- app/Models/S3Storage.php | 5 ----- bootstrap/helpers/databases.php | 1 - bootstrap/helpers/s3.php | 3 --- 3 files changed, 9 deletions(-) diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php index 4b1d745fb..33f4fa37c 100644 --- a/app/Models/S3Storage.php +++ b/app/Models/S3Storage.php @@ -40,11 +40,6 @@ class S3Storage extends BaseModel return "{$this->endpoint}/{$this->bucket}"; } - public function isDigitalOcean() - { - return str($this->endpoint)->contains('digitaloceanspaces.com'); - } - public function testConnection(bool $shouldSave = false) { try { diff --git a/bootstrap/helpers/databases.php b/bootstrap/helpers/databases.php index 0e879ad3b..f2c069ac4 100644 --- a/bootstrap/helpers/databases.php +++ b/bootstrap/helpers/databases.php @@ -208,7 +208,6 @@ function deleteBackupsS3(string|array|null $filenames, S3Storage $s3): void 'bucket' => $s3->bucket, 'endpoint' => $s3->endpoint, 'use_path_style_endpoint' => true, - 'bucket_endpoint' => $s3->isDigitalOcean(), 'aws_url' => $s3->awsUrl(), ]); diff --git a/bootstrap/helpers/s3.php b/bootstrap/helpers/s3.php index 10bc66fa1..7029377a4 100644 --- a/bootstrap/helpers/s3.php +++ b/bootstrap/helpers/s3.php @@ -4,8 +4,6 @@ use App\Models\S3Storage; function set_s3_target(S3Storage $s3) { - $is_digital_ocean = false; - config()->set('filesystems.disks.custom-s3', [ 'driver' => 's3', 'region' => $s3['region'], @@ -14,7 +12,6 @@ function set_s3_target(S3Storage $s3) 'bucket' => $s3['bucket'], 'endpoint' => $s3['endpoint'], 'use_path_style_endpoint' => true, - 'bucket_endpoint' => $s3->isDigitalOcean(), 'aws_url' => $s3->awsUrl(), ]); }