Support bucket endpoint (#12)

zingimmick · Aug 2, 2021 · 7d4c278 · 7d4c278
1 parent fcd590e
commit 7d4c278
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/src/ObsServiceProvider.php b/src/ObsServiceProvider.php
@@ -26,6 +26,12 @@ public function boot(): void
                 Arr::only($config, ['url', 'temporary_url', 'bucket_endpoint']),
                 $config['options'] ?? []
             );
+            if (! isset($config['is_cname']) && isset($config['bucket_endpoint'])) {
+                $config['is_cname'] = $config['bucket_endpoint'];
+            }
+            if (isset($config['is_cname']) && ! isset($config['bucket_endpoint'])) {
+                $config['bucket_endpoint'] = $config['is_cname'];
+            }
             $obsAdapter = new ObsAdapter(
                 new ObsClient($config),
                 $config['endpoint'],

diff --git a/tests/DriverTest.php b/tests/DriverTest.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Storage;
+use Obs\ObsClient;
 use Zing\Flysystem\Obs\ObsAdapter;
 
 class DriverTest extends TestCase
@@ -32,4 +33,24 @@ public function testBucketEndpoint(): void
     {
         self::assertStringStartsWith('https://your-endpoint', Storage::disk('obs-bucket-endpoint')->url('test'));
     }
+
+    private function supportIsCname(): bool
+    {
+        return version_compare(ObsClient::SDK_VERSION, '3.21.6', '>=');
+    }
+
+    public function testIsCname(): void
+    {
+        if (! $this->supportIsCname()) {
+            self::markTestSkipped('Option `is_cname` not supported.');
+        }
+        self::assertStringStartsWith(
+            'https://your-endpoint',
+            Storage::disk('obs-bucket-endpoint')->temporaryUrl('test', Carbon::now()->addMinutes())
+        );
+        self::assertStringStartsWith(
+            'https://your-endpoint',
+            Storage::disk('obs-is-cname')->temporaryUrl('test', Carbon::now()->addMinutes())
+        );
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -48,5 +48,13 @@ protected function getEnvironmentSetUp($app): void
             'endpoint' => 'your-endpoint',
             'bucket_endpoint' => true,
         ]);
+        Config::set('filesystems.disks.obs-is-cname', [
+            'driver' => 'obs',
+            'key' => '',
+            'secret' => '',
+            'bucket' => 'your-bucket',
+            'endpoint' => 'your-endpoint',
+            'is_cname' => true,
+        ]);
     }
 }