From 4069fdc9ad158b035d8a5893e7cbb64970cdaeb1 Mon Sep 17 00:00:00 2001 From: aloks98 Date: Sat, 29 Oct 2022 01:54:09 +0530 Subject: [PATCH 1/3] feat: add dreamobjects storage --- src/Storage/Device/DreamObjects.php | 46 +++++++++++++++++++++++ src/Storage/Storage.php | 1 + tests/Storage/Device/DreamObjectsTest.php | 30 +++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 src/Storage/Device/DreamObjects.php create mode 100644 tests/Storage/Device/DreamObjectsTest.php diff --git a/src/Storage/Device/DreamObjects.php b/src/Storage/Device/DreamObjects.php new file mode 100644 index 00000000..e5e09ab5 --- /dev/null +++ b/src/Storage/Device/DreamObjects.php @@ -0,0 +1,46 @@ +headers['host'] = $bucket.'objects-'.$region.'.'.'dream.io'; + } + + /** + * @return string + */ + public function getName(): string + { + return 'DreamHost Object Storage'; + } + + /** + * @return string + */ + public function getDescription(): string + { + return 'DreamHost Object Storage'; + } +} diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index 4e075305..22d9aba7 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -16,6 +16,7 @@ class Storage const DEVICE_WASABI = 'Wasabi'; const DEVICE_BACKBLAZE = 'Backblaze'; const DEVICE_LINODE= 'Linode'; + const DEVICE_DREAMOBJECTS = 'DreamObjects'; /** * Devices. diff --git a/tests/Storage/Device/DreamObjectsTest.php b/tests/Storage/Device/DreamObjectsTest.php new file mode 100644 index 00000000..f52594b0 --- /dev/null +++ b/tests/Storage/Device/DreamObjectsTest.php @@ -0,0 +1,30 @@ +root = '/root'; + $key = $_SERVER['DREAMOBJECTS_ACCESS_KEY'] ?? ''; + $secret = $_SERVER['DREAMOBJECTS_SECRET'] ?? ''; + $bucket = "utopia-dreamobjects-store"; + + $this->object = new DreamObjects($this->root, $key, $secret, $bucket, DreamObjects::US_EAST_1, DreamObjects::ACL_PUBLIC_READ); + + } + + protected function getAdapterName(): string + { + return 'DreamHost Object Storage'; + } + + protected function getAdapterDescription(): string + { + return 'DreamHost Object Storage'; + } +} From ef6439cc1fa2831b49debae483cfba53d55945c9 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Sun, 19 Feb 2023 20:04:55 +0000 Subject: [PATCH 2/3] feat: run linter --- src/Storage/Device/DreamObjects.php | 17 +++++++---------- tests/Storage/Device/DreamObjectsTest.php | 4 +--- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Storage/Device/DreamObjects.php b/src/Storage/Device/DreamObjects.php index e5e09ab5..6e51ca40 100644 --- a/src/Storage/Device/DreamObjects.php +++ b/src/Storage/Device/DreamObjects.php @@ -2,25 +2,22 @@ namespace Utopia\Storage\Device; -use Utopia\Storage\Device\S3; - class DreamObjects extends S3 { /** * Regions constants - * */ - const US_EAST_1='us-east-1'; + const US_EAST_1 = 'us-east-1'; /** * Object Storage Constructor * - * @param string $root - * @param string $accessKey - * @param string $secretKey - * @param string $bucket - * @param string $region - * @param string $acl + * @param string $root + * @param string $accessKey + * @param string $secretKey + * @param string $bucket + * @param string $region + * @param string $acl */ public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::US_EAST_1, string $acl = self::ACL_PRIVATE) { diff --git a/tests/Storage/Device/DreamObjectsTest.php b/tests/Storage/Device/DreamObjectsTest.php index f52594b0..6893c7d6 100644 --- a/tests/Storage/Device/DreamObjectsTest.php +++ b/tests/Storage/Device/DreamObjectsTest.php @@ -3,7 +3,6 @@ namespace Utopia\Tests; use Utopia\Storage\Device\DreamObjects; -use Utopia\Tests\S3Base; class DreamObjectsTest extends S3Base { @@ -12,10 +11,9 @@ protected function init(): void $this->root = '/root'; $key = $_SERVER['DREAMOBJECTS_ACCESS_KEY'] ?? ''; $secret = $_SERVER['DREAMOBJECTS_SECRET'] ?? ''; - $bucket = "utopia-dreamobjects-store"; + $bucket = 'utopia-dreamobjects-store'; $this->object = new DreamObjects($this->root, $key, $secret, $bucket, DreamObjects::US_EAST_1, DreamObjects::ACL_PUBLIC_READ); - } protected function getAdapterName(): string From b6129fd5e0a6b3a5086c7e6a90d19a1e18f76654 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Sun, 19 Feb 2023 20:18:54 +0000 Subject: [PATCH 3/3] feat: add import --- tests/Storage/Device/DreamObjectsTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Storage/Device/DreamObjectsTest.php b/tests/Storage/Device/DreamObjectsTest.php index 6893c7d6..d74fecf7 100644 --- a/tests/Storage/Device/DreamObjectsTest.php +++ b/tests/Storage/Device/DreamObjectsTest.php @@ -3,6 +3,8 @@ namespace Utopia\Tests; use Utopia\Storage\Device\DreamObjects; +use Utopia\Tests\Storage\S3Base; + class DreamObjectsTest extends S3Base {