Skip to content

[OpenSearch] Add more provider credential options #13

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[OpenSearch] Add more provider credential options #13

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
22 changes: 20 additions & 2 deletions src/Builder/ClientBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,26 @@ public function build(array $indexOptions): Client
$client = \OpenSearch\ClientBuilder::create();
$client->setHosts($indexOptions['index']['hosts']);

if (!empty($indexOptions['index']['credentials']['username']) && $indexOptions['index']['credentials']['password']) {
$client->setBasicAuthentication($indexOptions['index']['credentials']['username'], $indexOptions['index']['credentials']['password']);
$credentials = $indexOptions['index']['credentials'];

if (!empty($credentials['username']) && $credentials['password']) {
$client->setBasicAuthentication($credentials['username'], $credentials['password']);
} else {
if (!empty($credentials['sig_v4_region'])) {
$client->setSigV4Region($credentials['sig_v4_region']);
}

if (!empty($credentials['sig_v4_service'])) {
$client->setSigV4Service($credentials['sig_v4_service']);
}

if ($credentials['sig_v4_credential_provider'] !== null) {
$client->setSigV4CredentialProvider($credentials['sig_v4_credential_provider']);
}
}

if ($credentials['ssl_verification'] !== null) {
$client->setSSLVerification($credentials['ssl_verification']);
}

return $client->build();
Expand Down
14 changes: 14 additions & 0 deletions src/Provider/OpenSearchIndexProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace DsOpenSearchBundle\Provider;

use Aws\Credentials\CredentialsInterface;
use DsOpenSearchBundle\Builder\ClientBuilderInterface;
use DsOpenSearchBundle\DsOpenSearchBundle;
use DsOpenSearchBundle\Service\IndexPersistenceService;
Expand Down Expand Up @@ -48,10 +49,23 @@ public static function configureOptions(OptionsResolver $resolver): void
$spoolResolver->setDefaults([
'username' => null,
'password' => null,
'ssl_verification' => null,
'sig_v4_region' => null,
'sig_v4_credential_provider' => null,
]);

$spoolResolver->setAllowedTypes('username', ['string', 'null']);
$spoolResolver->setAllowedTypes('password', ['string', 'null']);
$spoolResolver->setAllowedTypes('ssl_verification', ['bool', 'string', 'null']);
$spoolResolver->setAllowedTypes('sig_v4_region', ['string', 'null']);
$spoolResolver->setAllowedTypes('sig_v4_service', ['string', 'null']);
$spoolResolver->setAllowedTypes('sig_v4_credential_provider', [
'array',
'bool',
'callable',
CredentialsInterface::class,
'null'
]);
},
]);

Expand Down