[5.2] Allow passing along options to the S3 client #13791
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I found it impossible (un-necessarily clunky) to add cache headers or similar to S3 objects. This allows you to.
A new key in filesystems.php and you're good to go. Example:
````
's3' => [
'driver' => 's3',
'key' => env('S3_KEY'),
'secret' => env('S3_SECRET'),
'region' => 'eu-central-1',
'bucket' => 'my-demo-bucket',
'options' => [
'CacheControl' => 'max_age=2592000'
]
],
````
GrahamCampbell
changed the title
| @@ -188,7 +188,7 @@ public function createS3Driver(array $config) | |||
| $root = isset($s3Config['root']) ? $s3Config['root'] : null; | |||
|
|
|||
| return $this->adapt($this->createFlysystem( | |||
| new S3Adapter(new S3Client($s3Config), $s3Config['bucket'], $root), $config | |||
| new S3Adapter(new S3Client($s3Config), $s3Config['bucket'], $root, $config['options'] ?: []), $config | |||
There was a problem hiding this comment.
This will break existing apps if the options index doesn't exist. Please use an isset check.
There was a problem hiding this comment.
Ah well I guess if it does not support ?: it will break, sorry. I'll add a check instead
Added isset check
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I found it impossible (un-necessarily clunky) to add cache headers or similar to S3 objects. This allows you to.
A new key in filesystems.php and you're good to go. Example:
——
Any other solution would be great though 👍