Skip to content

adding 'schema' param to Elasticsearch / OpenSearch configuration to … #40052

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 4 commits into
base: 2.4-develop
Choose a base branch
from
Open

adding 'schema' param to Elasticsearch / OpenSearch configuration to … #40052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29541fc
adding 'schema' param to Elasticsearch / OpenSearch configuration to …
Jul 8, 2025
2039c16
Merge branch '2.4-develop' into ssl_elasticsearch_opensearch
jakwinkler Jul 8, 2025
a9488af
Merge branch '2.4-develop' into ssl_elasticsearch_opensearch
jakwinkler Jul 9, 2025
e5c20f9
Merge branch '2.4-develop' into ssl_elasticsearch_opensearch
jakwinkler Jul 9, 2025
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
11 changes: 4 additions & 7 deletions app/code/Magento/Elasticsearch8/Model/Client/Elasticsearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,9 @@ public function indexExists(string $index): bool
private function buildESConfig(array $options = []): array
{
$hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
// @codingStandardsIgnoreStart
$protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
// @codingStandardsIgnoreEnd
if (!$protocol) {
$protocol = 'http';
}
$url = parse_url($options['hostname']);

$options['scheme'] = $url['scheme'] ?? 'http';

$authString = '';
if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
Expand All @@ -213,7 +210,7 @@ private function buildESConfig(array $options = []): array
$portString = ':' . $options['port'];
}

$host = $protocol . '://' . $authString . $hostname . $portString;
$host = ($options['scheme'] ?? 'http') . '://' . $authString . $hostname . $portString;

$options['hosts'] = [$host];

Expand Down
11 changes: 4 additions & 7 deletions app/code/Magento/OpenSearch/Model/SearchClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,9 @@ public function testConnection(): bool
private function buildOSConfig(array $options = []): array
{
$hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
// @codingStandardsIgnoreStart
$protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
// @codingStandardsIgnoreEnd
if (!$protocol) {
$protocol = 'http';
}
$url = parse_url($options['hostname']);

$options['scheme'] = $url['scheme'] ?? 'http';

$authString = '';
if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
Expand All @@ -154,7 +151,7 @@ private function buildOSConfig(array $options = []): array
$portString = ':' . $options['port'];
}

$host = $protocol . '://' . $authString . $hostname . $portString;
$host = ($options['scheme'] ?? 'http') . '://' . $authString . $hostname . $portString;

$options['hosts'] = [$host];

Expand Down
11 changes: 4 additions & 7 deletions setup/src/Magento/Setup/Validator/ElasticsearchConnectionValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@ public function isValidConnection(array $options)
private function buildConfig(array $options)
{
$hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
// @codingStandardsIgnoreStart
$protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
// @codingStandardsIgnoreEnd
if (!$protocol) {
$protocol = 'http';
}
$url = parse_url($options['hostname']);

$options['scheme'] = $url['scheme'] ?? 'http';

$authString = '';
if (isset($options['enableAuth']) && true === $options['enableAuth']) {
Expand All @@ -59,7 +56,7 @@ private function buildConfig(array $options)
$authString = "{$options['username']}:{$options['password']}@";
}
$portString = empty($options['port']) ? '' : ':' . $options['port'];
$host = $protocol . '://' . $authString . $hostname . $portString;
$host = ($options['scheme'] ?? 'http') . '://' . $authString . $hostname . $portString;
$options['hosts'] = [$host];

return $options;
Expand Down