diff --git a/Classes/Driver/AmazonS3Driver.php b/Classes/Driver/AmazonS3Driver.php index 85798518..cc35dcb4 100644 --- a/Classes/Driver/AmazonS3Driver.php +++ b/Classes/Driver/AmazonS3Driver.php @@ -1126,12 +1126,14 @@ protected function initializeClient() $configuration = [ 'version' => '2006-03-01', 'region' => $this->configuration['region'] ?? '', - 'credentials' => [ - 'key' => $this->configuration['key'] ?? '', - 'secret' => $this->configuration['secretKey'] ?? '', - ], 'validation' => false, ]; + if (!empty($this->configuration['key']) || !empty($this->configuration['secretKey'])) { + $configuration['credentials'] = [ + 'key' => $this->configuration['key'] ?? '', + 'secret' => $this->configuration['secretKey'] ?? '', + ]; + } if (!empty($GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy'])) { $configuration['http']['proxy'] = $GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy']; } diff --git a/Documentation/Administration/DriverConfiguration/Index.rst b/Documentation/Administration/DriverConfiguration/Index.rst index 2b2492c2..70613538 100755 --- a/Documentation/Administration/DriverConfiguration/Index.rst +++ b/Documentation/Administration/DriverConfiguration/Index.rst @@ -17,7 +17,7 @@ Add the following configurations: - Region: The region of your bucket (avoid dots in the bucket name) -- Key and secret key of your AWS account (see security credentials -> access keys) +- Key and secret key of your AWS account (optional, you can also use IAM roles or environment variables) - Public base url (optional): this is the public url of your bucket, if empty its default to "bucketname.s3.amazonaws.com" diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst index 6414c156..1f1ed999 100644 --- a/Documentation/Introduction/Index.rst +++ b/Documentation/Introduction/Index.rst @@ -15,8 +15,6 @@ You can create a file storage which allows you to upload/download and link the f Requires TYPO3 CMS 10.4 or higher -German blog post: `TYPO3 CDN with AWS S3 `_ - Issue tracking: `GitHub Issues: AWS S3 FAL Driver `_ diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index fda1d2a0..41579b0b 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -1,7 +1,7 @@ [general] project = Amazon AWS S3 FAL driver (CDN) -copyright = 2021 different.technology +copyright = 2022 different.technology project_home = https://github.com/andersundsehr/aus_driver_amazon_s3 project_issues = https://github.com/andersundsehr/aus_driver_amazon_s3/issues project_repository = https://github.com/andersundsehr/aus_driver_amazon_s3 diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml index e331f887..e79d520a 100644 --- a/Documentation/Settings.yml +++ b/Documentation/Settings.yml @@ -4,7 +4,7 @@ --- conf.py: - copyright: 2019 + copyright: 2022 project: Amazon AWS S3 FAL driver (CDN) version: 1.12 release: 1.12.0 diff --git a/README.md b/README.md index dd84d581..41a13e89 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Add the following configurations: - Bucket: The name of your AWS S3 bucket - Region: The region of your bucket (avoid dots in the bucket name) -- Key and secret key of your AWS account (see security credentials -> access keys) +- Key and secret key of your AWS account (optional, you can also use IAM roles or environment variables) - Public base url (optional): this is the public url of your bucket, if empty its default to “bucketname.s3.amazonaws.com” - Protocol: network protocol (https://, http:// or auto detection)