From a20c9e54e54291322f9653d6d324e9777f5e3a75 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Thu, 25 Mar 2021 16:30:08 +0100
Subject: [PATCH] Dynamically create table

---
 src/Illuminate/Cache/CacheManager.php         | 16 +--------
 src/Illuminate/Cache/CacheServiceProvider.php | 20 +++++++++++
 tests/Integration/Cache/DynamoDbStoreTest.php | 33 +++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
index 33d1027bce1a..42bfc7271d59 100755
--- a/src/Illuminate/Cache/CacheManager.php
+++ b/src/Illuminate/Cache/CacheManager.php
@@ -2,12 +2,10 @@
 
 namespace Illuminate\Cache;
 
-use Aws\DynamoDb\DynamoDbClient;
 use Closure;
 use Illuminate\Contracts\Cache\Factory as FactoryContract;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
-use Illuminate\Support\Arr;
 use InvalidArgumentException;
 
 /**
@@ -226,21 +224,9 @@ protected function createDatabaseDriver(array $config)
      */
     protected function createDynamodbDriver(array $config)
     {
-        $dynamoConfig = [
-            'region' => $config['region'],
-            'version' => 'latest',
-            'endpoint' => $config['endpoint'] ?? null,
-        ];
-
-        if ($config['key'] && $config['secret']) {
-            $dynamoConfig['credentials'] = Arr::only(
-                $config, ['key', 'secret', 'token']
-            );
-        }
-
         return $this->repository(
             new DynamoDbStore(
-                new DynamoDbClient($dynamoConfig),
+                $this->app['cache.dynamodb.client'],
                 $config['table'],
                 $config['attributes']['key'] ?? 'key',
                 $config['attributes']['value'] ?? 'value',
diff --git a/src/Illuminate/Cache/CacheServiceProvider.php b/src/Illuminate/Cache/CacheServiceProvider.php
index 46fa0ae2615c..0fb27b980894 100755
--- a/src/Illuminate/Cache/CacheServiceProvider.php
+++ b/src/Illuminate/Cache/CacheServiceProvider.php
@@ -2,7 +2,9 @@
 
 namespace Illuminate\Cache;
 
+use Aws\DynamoDb\DynamoDbClient;
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use Symfony\Component\Cache\Adapter\Psr16Adapter;
 
@@ -30,6 +32,24 @@ public function register()
         $this->app->singleton('memcached.connector', function () {
             return new MemcachedConnector;
         });
+
+        $this->app->singleton('cache.dynamodb.client', function ($app) {
+            $config = $app['config']->get('cache.stores.dynamodb');
+
+            $dynamoConfig = [
+                'region' => $config['region'],
+                'version' => 'latest',
+                'endpoint' => $config['endpoint'] ?? null,
+            ];
+
+            if ($config['key'] && $config['secret']) {
+                $dynamoConfig['credentials'] = Arr::only(
+                    $config, ['key', 'secret', 'token']
+                );
+            }
+
+            return new DynamoDbClient($dynamoConfig);
+        });
     }
 
     /**
diff --git a/tests/Integration/Cache/DynamoDbStoreTest.php b/tests/Integration/Cache/DynamoDbStoreTest.php
index 5ead1dca5fd0..0d0efa6e1328 100644
--- a/tests/Integration/Cache/DynamoDbStoreTest.php
+++ b/tests/Integration/Cache/DynamoDbStoreTest.php
@@ -75,5 +75,38 @@ public function testLocksCanBeAcquired()
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('cache.default', 'dynamodb');
+
+        $config = $app['config']->get('cache.stores.dynamodb');
+
+        /** @var \Aws\DynamoDb\DynamoDbClient $client */
+        $client = $app['cache.dynamodb.client'];
+
+        $client->createTable([
+            'TableName' => $config['table'],
+            'KeySchema' => [
+                [
+                    'AttributeName' => $config['attributes']['key'] ?? 'key',
+                    'KeyType' => 'hash',
+                ],
+            ],
+            'AttributeDefinitions' => [
+                [
+                    'AttributeName' => $config['attributes']['key'] ?? 'key',
+                    'AttributeType' => 'S',
+                ],
+                [
+                    'AttributeName' => $config['attributes']['value'] ?? 'value',
+                    'AttributeType' => 'S',
+                ],
+                [
+                    'AttributeName' => $config['attributes']['expiration'] ?? 'expires_at',
+                    'AttributeType' => 'S',
+                ],
+            ],
+            'ProvisionedThroughput' => [
+                'ReadCapacityUnits' => 1,
+                'WriteCapacityUnits' => 1,
+            ],
+        ]);
     }
 }