Test for S3Compatible plus changes to accomodate vhost or path-style

tests/Storage/Device/S3CompatibleTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Utopia\Tests\Storage\Device;
+
+use Utopia\Storage\Device\S3Compatible;
+use Utopia\Tests\Storage\S3Base;
+
+class S3CompatibleTest extends S3Base
+{
+ protected function init(): void
+ {
+ $root = '/root';
+ $endpoint = $_SERVER['S3COMPATIBLE_ENDPOINT'] ?? '';
+ $vhost = $_SERVER['S3COMPATIBLE_VHOST'] === 'true';
+ $this->vhost = $vhost;
+ $key = $_SERVER['S3COMPATIBLE_ACCESS_KEY'] ?? '';
+ $secret = $_SERVER['S3COMPATIBLE_SECRET'] ?? '';
+ $bucket = $_SERVER['S3COMPATIBLE_BUCKET'] ?? 'appwrite-test-bucket';
+ $region = $_SERVER['S3COMPATIBLE_REGION'] ?? '';
+
+ if ($vhost) {
+ $this->root = $root;
+ } else {
+ $this->root = $bucket.$root;
+ }
+
+ $this->object = new S3Compatible($endpoint, $root, $key, $secret, $bucket, $vhost, $region);
+ }
+
+ /**
+ * @return string
+ */
+ public function getAdapterName(): string
+ {
+ return $this->object->getName();
+ }
+
+ /**
+ * @return string
+ */
+ public function getAdapterType(): string
+ {
+ return $this->object->getType();
+ }
+
+ /**
+ * @return string
+ */
+ public function getAdapterDescription(): string
+ {
+ return $this->object->getDescription();
+ }
+}

tests/Storage/S3Base.php

@@ -29,6 +29,11 @@ abstract protected function getAdapterDescription(): string;
  */
  protected $root = '/root';
 
+ /**
+ * @var bool
+ */
+ protected $vhost = true;
+
  public function setUp(): void
  {
  $this->init();
@@ -138,12 +143,18 @@ public function testXMLUpload()
 
  public function testDeletePath()
  {
+ if ($this->vhost) {
+ $dpParam = 'bucket';
+ } else {
+ $dpParam = '';
+ }
+
  // Test Single Object
  $path = $this->object->getPath('text-for-delete-path.txt');
  $path = str_ireplace($this->object->getRoot(), $this->object->getRoot().DIRECTORY_SEPARATOR.'bucket', $path);
  $this->assertEquals(true, $this->object->write($path, 'Hello World', 'text/plain'));
  $this->assertEquals(true, $this->object->exists($path));
- $this->assertEquals(true, $this->object->deletePath('bucket'));
+ $this->assertEquals(true, $this->object->deletePath($dpParam));
  $this->assertEquals(false, $this->object->exists($path));
 
  // Test Multiple Objects
@@ -157,7 +168,7 @@ public function testDeletePath()
  $this->assertEquals(true, $this->object->write($path2, 'Hello World', 'text/plain'));
  $this->assertEquals(true, $this->object->exists($path2));
 
- $this->assertEquals(true, $this->object->deletePath('bucket'));
+ $this->assertEquals(true, $this->object->deletePath($dpParam));
  $this->assertEquals(false, $this->object->exists($path));
  $this->assertEquals(false, $this->object->exists($path2));
  }