Skip to content

[Lock][DynamoDB] Enable http_client injection and fix tests using AmpV5 client #62167

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

Merged
nicolas-grekas merged 1 commit into from
Oct 27, 2025
+33 −21
Merged

[Lock][DynamoDB] Enable http_client injection and fix tests using AmpV5 client #62167

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/Symfony/Component/Lock/Bridge/DynamoDb/Store/DynamoDbStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class DynamoDbStore implements PersistingStoreInterface
'write_capacity_units' => 20,
'sslmode' => null,
'debug' => null,
'http_client' => null,
];

private DynamoDbClient $client;
Expand Down Expand Up @@ -119,7 +120,7 @@ public function __construct(
$options['table_name'] = $tableName;
}

$this->client = new DynamoDbClient($clientConfiguration);
$this->client = new DynamoDbClient($clientConfiguration, null, $options['http_client']);
}

$this->tableName = $options['table_name'] ?? self::DEFAULT_OPTIONS['table_name'];
Expand Down
51 changes: 31 additions & 20 deletions src/Symfony/Component/Lock/Bridge/DynamoDb/Tests/Store/DynamoDbStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,22 @@
namespace Symfony\Component\Lock\Bridge\DynamoDb\Tests\Store;

use AsyncAws\DynamoDb\DynamoDbClient;
use PHPUnit\Framework\Attributes\Before;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\Lock\Bridge\DynamoDb\Store\DynamoDbStore;
use Symfony\Contracts\HttpClient\HttpClientInterface;

class DynamoDbStoreTest extends TestCase
{
private HttpClientInterface $httpClient;

#[Before]
public function createMockHttpClient()
{
$this->httpClient = new MockHttpClient([]);
}

public function testExtraOptions()
{
$this->expectException(\InvalidArgumentException::class);
Expand Down Expand Up @@ -50,77 +61,77 @@ public function testFromUnsupportedDsn()
public function testFromDsn()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table', ['http_client' => $this->httpClient])
);
}

public function testDsnPrecedence()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => 'us-east-2', 'accessKeyId' => 'key_dsn', 'accessKeySecret' => 'secret_dsn']), ['table_name' => 'table_dsn']),
new DynamoDbStore('dynamodb://key_dsn:secret_dsn@default/table_dsn?region=us-east-2', ['region' => 'eu-west-3', 'table_name' => 'table_options'])
new DynamoDbStore(new DynamoDbClient(['region' => 'us-east-2', 'accessKeyId' => 'key_dsn', 'accessKeySecret' => 'secret_dsn'], null, $this->httpClient), ['table_name' => 'table_dsn']),
new DynamoDbStore('dynamodb://key_dsn:secret_dsn@default/table_dsn?region=us-east-2', ['region' => 'eu-west-3', 'table_name' => 'table_options', 'http_client' => $this->httpClient])
);
}

public function testFromDsnWithRegion()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => 'us-west-2', 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table?region=us-west-2', [])
new DynamoDbStore(new DynamoDbClient(['region' => 'us-west-2', 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table?region=us-west-2', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithCustomEndpoint()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'https://localhost', 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost/table', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'https://localhost', 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost/table', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithSslMode()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'http://localhost', 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost/table?sslmode=disable', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'http://localhost', 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost/table?sslmode=disable', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithSslModeOnDefault()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table?sslmode=disable', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table?sslmode=disable', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithCustomEndpointAndPort()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'https://localhost:1234', 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost:1234/table', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'endpoint' => 'https://localhost:1234', 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://localhost:1234/table', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithQueryOptions()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table', 'id_attr' => 'id_dsn']),
new DynamoDbStore('dynamodb://default/table?id_attr=id_dsn', [])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table', 'id_attr' => 'id_dsn']),
new DynamoDbStore('dynamodb://default/table?id_attr=id_dsn', ['http_client' => $this->httpClient])
);
}

public function testFromDsnWithTableNameOption()
{
$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default', ['table_name' => 'table'])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default', ['table_name' => 'table', 'http_client' => $this->httpClient])
);

$this->assertEquals(
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null]), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table', ['table_name' => 'table_ignored'])
new DynamoDbStore(new DynamoDbClient(['region' => null, 'accessKeyId' => null, 'accessKeySecret' => null], null, $this->httpClient), ['table_name' => 'table']),
new DynamoDbStore('dynamodb://default/table', ['table_name' => 'table_ignored', 'http_client' => $this->httpClient])
);
}

Expand Down
Loading