Skip to content

Fix OpenSearch connection error with empty port parameter #1004

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
pragya811 merged 2 commits into from
Jun 19, 2026
Merged

Fix OpenSearch connection error with empty port parameter #1004

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8436f3
Fix OpenSearch connection error with empty port parameter
pragya811 Jun 17, 2026
8c79ffa
Review comments
pragya811 Jun 18, 2026
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
9 changes: 6 additions & 3 deletions cloud_governance/common/elasticsearch/elasticsearch_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@ def __init__(self,
self.__account = self.__environment_variables_dict.get('account')
self.__server_type = self.__environment_variables_dict.get('ES_SERVER_TYPE', 'opensearch')
try:
if not self.__es_port or not self.__es_host:
raise ValueError(f'Missing required ElasticSearch/OpenSearch connection parameters: es_host={self.__es_host}, es_port={self.__es_port}')
Comment thread
pragya811 marked this conversation as resolved.
Outdated
es_port_int = int(self.__es_port)
if self.__server_type == 'elasticsearch':
scheme = 'https' if int(self.__es_port) == 443 else 'http'
hosts = [{'host': self.__es_host, 'port': int(self.__es_port), 'scheme': scheme}]
scheme = 'https' if es_port_int == 443 else 'http'
hosts = [{'host': self.__es_host, 'port': es_port_int, 'scheme': scheme}]
basic_auth = (self.__es_user, self.__es_password) if self.__es_user else None
self.__es = Elasticsearch(hosts, basic_auth=basic_auth, verify_certs=False,
request_timeout=self.__timeout, max_retries=2)
Expand All @@ -60,7 +63,7 @@ def __init__(self,
add_host = {'host': self.__es_host, 'port': self.__es_port}
if self.__es_user:
add_host['http_auth'] = (self.__es_user, self.__es_password)
if int(self.__es_port) == 443:
if es_port_int == 443:
add_host['use_ssl'] = True
add_host['verify_certs'] = False
self.__es = OpenSearch([add_host], timeout=self.__timeout, max_retries=2)
Expand Down