chore: update storage to use new generic S3 class

open-runtimes · Feb 26, 2025 · 0c913eb · 0c913eb
1 parent ba96a61
commit 0c913eb
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "utopia-php/framework": "0.34.*",
         "utopia-php/logger": "0.6.*",
         "utopia-php/cli": "0.16.*",
-        "utopia-php/storage": "0.18.*",
+        "utopia-php/storage": "dev-generic-s3-device as 0.18.0",
         "utopia-php/dsn": "0.1.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/preloader": "0.2.*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Executor/Runner/Adapter.php b/src/Executor/Runner/Adapter.php
@@ -9,6 +9,7 @@
 use Utopia\Http\Response;
 use Utopia\Logger\Log;
 use Utopia\Storage\Device;
+use Utopia\Storage\Device\AWS;
 use Utopia\Storage\Device\Backblaze;
 use Utopia\Storage\Device\DOSpaces;
 use Utopia\Storage\Device\Linode;
@@ -111,6 +112,7 @@ protected function getStorageDevice(string $root): Device
             $device = Storage::DEVICE_LOCAL;
             $accessKey = '';
             $accessSecret = '';
+            $host = '';
             $bucket = '';
             $region = '';
 
@@ -119,6 +121,7 @@ protected function getStorageDevice(string $root): Device
                 $device = $dsn->getScheme();
                 $accessKey = $dsn->getUser() ?? '';
                 $accessSecret = $dsn->getPassword() ?? '';
+                $host = $dsn->getHost() ?? '';
                 $bucket = $dsn->getPath() ?? '';
                 $region = $dsn->getParam('region');
             } catch (\Exception $e) {
@@ -127,7 +130,11 @@ protected function getStorageDevice(string $root): Device
 
             switch ($device) {
                 case Storage::DEVICE_S3:
-                    return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+                    if (!empty($host)) {
+                        return new S3(root: $root, accessKey: $accessKey, secretKey: $accessSecret, host: $host, region: $region, acl: $acl);
+                    } else {
+                        return new AWS(root: $root, accessKey: $accessKey, secretKey: $accessSecret, bucket: $bucket, region: $region, acl: $acl);
+                    }
                 case STORAGE::DEVICE_DO_SPACES:
                     return new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
                 case Storage::DEVICE_BACKBLAZE:
@@ -148,10 +155,15 @@ protected function getStorageDevice(string $root): Device
                 case Storage::DEVICE_S3:
                     $s3AccessKey = Http::getEnv('OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY', '') ?? '';
                     $s3SecretKey = Http::getEnv('OPR_EXECUTOR_STORAGE_S3_SECRET', '') ?? '';
+                    $s3Host = Http::getEnv('OPR_EXECUTOR_STORAGE_S3_HOST', '') ?? '';
                     $s3Region = Http::getEnv('OPR_EXECUTOR_STORAGE_S3_REGION', '') ?? '';
                     $s3Bucket = Http::getEnv('OPR_EXECUTOR_STORAGE_S3_BUCKET', '') ?? '';
                     $s3Acl = 'private';
-                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
+                    if (!empty($s3Host)) {
+                        return new S3(root: $root, accessKey: $s3AccessKey, secretKey: $s3SecretKey, host: $s3Host, region: $s3Region, acl: $s3Acl);
+                    } else {
+                        return new AWS(root: $root, accessKey: $s3AccessKey, secretKey: $s3SecretKey, bucket: $s3Bucket, region: $s3Region, acl: $s3Acl);
+                    }
                 case Storage::DEVICE_DO_SPACES:
                     $doSpacesAccessKey = Http::getEnv('OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY', '') ?? '';
                     $doSpacesSecretKey = Http::getEnv('OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET', '') ?? '';