[SimpleS3] Dont use presignUrl, use parent::getEndpoint() (#637)

* [SimpleS3] Dont use presignUrl, use parent::getEndpoint()

* Fixes

* Bump min-version

Author: Nyholm

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": "^7.2.5",
         "ext-json": "*",
-        "async-aws/s3": "^1.0"
+        "async-aws/s3": "^1.2"
     },
     "extra": {
         "branch-alias": {

src/SimpleS3Client.php

@@ -4,7 +4,6 @@
 
 namespace AsyncAws\SimpleS3;
 
-use AsyncAws\S3\Input\GetObjectRequest;
 use AsyncAws\S3\S3Client;
 
 /**
@@ -17,20 +16,9 @@ class SimpleS3Client extends S3Client
 {
     public function getUrl(string $bucket, string $key): string
     {
-        $input = new GetObjectRequest([
-            'Bucket' => $bucket,
-            'Key' => $key,
-        ]);
+        $uri = sprintf('/%s/%s', urlencode($bucket), str_replace('%2F', '/', rawurlencode($key)));
 
-        $url = $this->presign($input, new \DateTimeImmutable('+10minutes'));
-
-        // remove all query parameters.
-        if (false === $pos = strpos($url, '?')) {
-            // If the client didn't have any credentials, there will not be any query string
-            return $url;
-        }
-
-        return substr($url, 0, $pos);
+        return $this->getEndpoint($uri, [], null);
     }
 
     /*

tests/Unit/SimpleS3ClientTest.php

@@ -4,33 +4,23 @@
 
 namespace AsyncAws\SimpleS3\Tests\Unit;
 
-use AsyncAws\Core\Configuration;
-use AsyncAws\Core\Credentials\Credentials;
 use AsyncAws\Core\Credentials\NullProvider;
 use AsyncAws\SimpleS3\SimpleS3Client;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 class SimpleS3ClientTest extends TestCase
 {
-    public function testGetUrl()
+    public function testGetUrlHostStyle()
     {
-        $options = ['region' => 'eu-central-1'];
-        if (\is_callable([Configuration::class, 'optionExists']) && Configuration::optionExists('pathStyleEndpoint')) {
-            $options += ['pathStyleEndpoint' => true];
-        }
-        $client = new SimpleS3Client($options, new Credentials('id', 'secret'), new MockHttpClient());
+        $client = new SimpleS3Client(['region' => 'eu-central-1'], new NullProvider(), new MockHttpClient());
         $url = $client->getUrl('bucket', 'images/file.jpg');
-        self::assertSame('https://s3.eu-central-1.amazonaws.com/bucket/images/file.jpg', $url);
+        self::assertSame('https://bucket.s3.eu-central-1.amazonaws.com/images/file.jpg', $url);
     }
 
-    public function testGetUrlWithNoCredentials()
+    public function testGetUrlPathStyle()
     {
-        $options = ['region' => 'eu-central-1'];
-        if (\is_callable([Configuration::class, 'optionExists']) && Configuration::optionExists('pathStyleEndpoint')) {
-            $options += ['pathStyleEndpoint' => true];
-        }
-        $client = new SimpleS3Client($options, new NullProvider(), new MockHttpClient());
+        $client = new SimpleS3Client(['region' => 'eu-central-1', 'pathStyleEndpoint' => true], new NullProvider(), new MockHttpClient());
         $url = $client->getUrl('bucket', 'images/file.jpg');
         self::assertSame('https://s3.eu-central-1.amazonaws.com/bucket/images/file.jpg', $url);
     }