From a2fdd215db1638ce2b7e62547b45d5ecf5fba658 Mon Sep 17 00:00:00 2001 From: "f.khan" Date: Thu, 16 Dec 2021 18:41:42 +0100 Subject: [PATCH 1/3] [WMS-6119]: Optional to provide AWS Credentials --- src/Adapter/AwsS3.php | 17 +++++++++++------ src/Config/Adapter/AwsS3.php | 6 ++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Adapter/AwsS3.php b/src/Adapter/AwsS3.php index 193c796..99890af 100644 --- a/src/Adapter/AwsS3.php +++ b/src/Adapter/AwsS3.php @@ -22,14 +22,19 @@ public function make($config) $prefix = (!empty($config[Config::INDEX_PREFIX]) ? $config[Config::INDEX_PREFIX] : null); $options = (!empty($config[Config::INDEX_OPTIONS]) ? $config[Config::INDEX_OPTIONS] : array()); - $client = new S3Client(array( - Config::INDEX_CREDENTIALS => array( + $s3ClientConnection = array( + Config::INDEX_REGION => $config[Config::INDEX_REGION], + Config::INDEX_VERSION => $config[Config::INDEX_VERSION], + ); + + if (!empty($config[Config::INDEX_KEY]) && !empty($config[Config::INDEX_SECRET])) { + $s3ClientConnection[Config::INDEX_CREDENTIALS] = [ Config::INDEX_KEY => $config[Config::INDEX_KEY], Config::INDEX_SECRET => $config[Config::INDEX_SECRET], - ), - Config::INDEX_REGION => $config[Config::INDEX_REGION], - Config::INDEX_VERSION => $config[Config::INDEX_VERSION], - )); + ]; + } + + $client = new S3Client($s3ClientConnection); $adapter = new AwsS3Adapter($client, $config[Config::INDEX_BUCKET], $prefix, $options); diff --git a/src/Config/Adapter/AwsS3.php b/src/Config/Adapter/AwsS3.php index d1eaba6..2e76cbd 100644 --- a/src/Config/Adapter/AwsS3.php +++ b/src/Config/Adapter/AwsS3.php @@ -41,12 +41,10 @@ public function getAdapterConfigTreeBuilder() $node ->children() ->scalarNode(self::INDEX_KEY) - ->isRequired() - ->cannotBeEmpty() + ->defaultNull() ->end() ->scalarNode(self::INDEX_SECRET) - ->isRequired() - ->cannotBeEmpty() + ->defaultNull() ->end() ->scalarNode(self::INDEX_REGION) ->isRequired() From c75b1e4c4fc51dec0e05edc5f4f9723aa0166f4f Mon Sep 17 00:00:00 2001 From: "f.khan" Date: Mon, 27 Dec 2021 14:03:41 +0100 Subject: [PATCH 2/3] [WMS-6119]: Optional to provide AWS Credentials --- src/Config/Adapter/AwsS3.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Config/Adapter/AwsS3.php b/src/Config/Adapter/AwsS3.php index 2e76cbd..e14c610 100644 --- a/src/Config/Adapter/AwsS3.php +++ b/src/Config/Adapter/AwsS3.php @@ -41,10 +41,10 @@ public function getAdapterConfigTreeBuilder() $node ->children() ->scalarNode(self::INDEX_KEY) - ->defaultNull() + ->cannotBeEmpty() ->end() ->scalarNode(self::INDEX_SECRET) - ->defaultNull() + ->cannotBeEmpty() ->end() ->scalarNode(self::INDEX_REGION) ->isRequired() From 7071cbe89a2aff1281f6fecf8d977446ad90194c Mon Sep 17 00:00:00 2001 From: "f.khan" Date: Mon, 27 Dec 2021 14:32:46 +0100 Subject: [PATCH 3/3] [WMS-6119]: Optional to provide AWS Credentials --- src/Adapter/AwsS3.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Adapter/AwsS3.php b/src/Adapter/AwsS3.php index 99890af..755e225 100644 --- a/src/Adapter/AwsS3.php +++ b/src/Adapter/AwsS3.php @@ -22,10 +22,10 @@ public function make($config) $prefix = (!empty($config[Config::INDEX_PREFIX]) ? $config[Config::INDEX_PREFIX] : null); $options = (!empty($config[Config::INDEX_OPTIONS]) ? $config[Config::INDEX_OPTIONS] : array()); - $s3ClientConnection = array( + $s3ClientConnection = [ Config::INDEX_REGION => $config[Config::INDEX_REGION], Config::INDEX_VERSION => $config[Config::INDEX_VERSION], - ); + ]; if (!empty($config[Config::INDEX_KEY]) && !empty($config[Config::INDEX_SECRET])) { $s3ClientConnection[Config::INDEX_CREDENTIALS] = [