Skip to content

Allow empty credentials for S3 when they are not set #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josuealcalde-utamed wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Open

Allow empty credentials for S3 when they are not set #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Filesystem/Flysystem/AdapterFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ private static function createS3Adapter(array $parsed): FilesystemAdapter // @ph
return new AsyncAwsS3Adapter(
new AsyncS3Client([
'region' => $parsed['query']['region'] ?? $parsed['fragment'] ?? throw new \InvalidArgumentException('A region must be set in the query (ie ?region=us-east-1) or as the fragment (ie #us-east-1).'),
'accessKeyId' => $parsed['user'] ?? null,
'accessKeySecret' => $parsed['pass'] ?? null,
...($parsed['user'] ?? null) !== null ? ['accessKeyId' => $parsed['user']] : [],
...($parsed['pass'] ?? null) !== null ? ['accessKeySecret' => $parsed['pass']] : [],
]),
$parsed['host'] ?? throw new \InvalidArgumentException('A bucket must be set as the host.'), // bucket
$parsed['path'] ?? '', // prefix
Expand All @@ -184,10 +184,10 @@ private static function createS3Adapter(array $parsed): FilesystemAdapter // @ph
return new AwsS3V3Adapter( // @phpstan-ignore return.type
new S3Client([ // @phpstan-ignore class.notFound
'region' => $parsed['query']['region'] ?? $parsed['fragment'] ?? throw new \InvalidArgumentException('A region must be set in the query (ie ?region=us-east-1) or as the fragment (ie #us-east-1).'),
'credentials' => [
...($parsed['user'] ?? null) !== null ? ['credentials' => [
'key' => $parsed['user'] ?? null,
'secret' => $parsed['pass'] ?? null,
],
]] : [],
'version' => $parsed['query']['version'] ?? 'latest',
]),
$parsed['host'] ?? throw new \InvalidArgumentException('A bucket must be set as the host.'), // bucket
Expand Down