Skip to content
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.

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

Cleanup code for elasticsearch<8 #35707

Merged
merged 3 commits into from
Dec 1, 2023
Merged

Cleanup code for elasticsearch<8 #35707

merged 3 commits into from
Dec 1, 2023

Conversation

eladkal
Copy link
Contributor

@eladkal eladkal commented Nov 17, 2023

Starting elasticsearch>=8 there is no more use_ssl
see https://github.com/apache/airflow/pull/33135/files#r1285347163

mentioning also open question about supporting elasticsearch<8
#33281 (comment)

cc @sunank200 @Owen-CH-Leung


EDIT:
This PR practically reverts #33281 as provider setup is to support elasticsearch>=8

Thus users can't install older version of the library anyway.

Copy link
Contributor

@harishkesavarao harishkesavarao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with @Taragolis to remove it altogether from the documentation, but also updating the doc here pending min version decision sounds good.

@eladkal eladkal changed the title update elasticsearch doc for use_ssl parameter Remove backport support for elasticsearch<8 Nov 25, 2023
@eladkal eladkal changed the title Remove backport support for elasticsearch<8 Cleanup code for elasticsearch<8 Nov 25, 2023
airflow/providers/elasticsearch/log/es_task_handler.py Outdated Show resolved Hide resolved
@@ -671,14 +671,11 @@ def test_retrieve_config_keys():
"""
with conf_vars(
{
("elasticsearch_configs", "use_ssl"): "True",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to keep it in the tests for check that we do not use non-existed parameters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which parameter are you worried about?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

("elasticsearch_configs", "use_ssl"): "True", This mostly for check that we remove it from resulting arguments here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but we no longer need it because we are on elasticsearch>7
the only reference to this parameter was in the docs which was wrong

@@ -671,14 +671,11 @@ def test_retrieve_config_keys():
"""
with conf_vars(
{
("elasticsearch_configs", "use_ssl"): "True",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

("elasticsearch_configs", "use_ssl"): "True", This mostly for check that we remove it from resulting arguments here

@eladkal eladkal merged commit 396b1ba into apache:main Dec 1, 2023
47 checks passed
@eladkal eladkal deleted the elastic branch December 1, 2023 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants