Initial release of Curator v9.0.0 (#1785)

untergeek · web-flow · commit dc08c8308ac4 · 2025-10-03T14:58:42.000-06:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-ARG PYVER=3.12.9
-ARG ALPTAG=3.21
+ARG PYVER=3.13.7
+ARG ALPTAG=3.22
 FROM python:${PYVER}-alpine${ALPTAG} AS builder
 
 # Add the community repo for access to patchelf binary package
diff --git a/curator/_version.py b/curator/_version.py
@@ -1,3 +1,3 @@
 """Curator Version"""
 
-__version__ = '8.0.21'
+__version__ = '9.0.0'
diff --git a/curator/actions/close.py b/curator/actions/close.py
@@ -2,7 +2,7 @@
 
 import logging
 import warnings
-from elasticsearch8.exceptions import ElasticsearchWarning
+from elasticsearch9.exceptions import ElasticsearchWarning
 from curator.helpers.testers import verify_index_list
 from curator.helpers.utils import chunk_index_list, report_failure, show_dry_run, to_csv
 
diff --git a/curator/actions/create_index.py b/curator/actions/create_index.py
@@ -3,7 +3,7 @@
 import logging
 
 # pylint: disable=import-error, broad-except
-from elasticsearch8.exceptions import RequestError
+from elasticsearch9.exceptions import RequestError
 from curator.exceptions import ConfigurationError, FailedExecution
 from curator.helpers.date_ops import parse_date_pattern
 from curator.helpers.utils import report_failure
diff --git a/curator/actions/reindex.py b/curator/actions/reindex.py
@@ -6,7 +6,7 @@
 
 # pylint: disable=broad-except, R0902,R0912,R0913,R0914,R0915
 from es_client.builder import Builder
-from es_client.helpers.utils import ensure_list, verify_url_schema
+from es_client.utils import ensure_list, verify_url_schema
 from es_client.exceptions import ConfigurationError
 from curator.exceptions import CuratorException, FailedExecution, NoIndices
 
diff --git a/curator/actions/snapshot.py b/curator/actions/snapshot.py
@@ -2,7 +2,7 @@
 
 import logging
 import re
-from es_client.helpers.utils import ensure_list
+from es_client.utils import ensure_list
 from curator.helpers.date_ops import parse_datemath, parse_date_pattern
 from curator.helpers.getters import get_indices
 from curator.helpers.testers import (
diff --git a/curator/classdef.py b/curator/classdef.py
@@ -2,8 +2,8 @@
 
 import logging
 from es_client.exceptions import FailedValidation
-from es_client.helpers.schemacheck import password_filter
-from es_client.helpers.utils import get_yaml
+from es_client.schemacheck import password_filter
+from es_client.utils import get_yaml
 from curator import IndexList, SnapshotList
 from curator.actions import CLASS_MAP
 from curator.exceptions import ConfigurationError
diff --git a/curator/cli.py b/curator/cli.py
@@ -4,16 +4,16 @@
 import logging
 import click
 from es_client.defaults import OPTION_DEFAULTS
-from es_client.helpers.config import (
+from es_client.config import (
     cli_opts,
     context_settings,
     generate_configdict,
     get_client,
     get_config,
     options_from_dict,
 )
-from es_client.helpers.logging import configure_logging
-from es_client.helpers.utils import option_wrapper, prune_nones
+from es_client.logging import configure_logging
+from es_client.utils import option_wrapper, prune_nones
 from curator.exceptions import ClientException
 from curator.classdef import ActionsFile
 from curator.defaults.settings import (
diff --git a/curator/cli_singletons/object_class.py b/curator/cli_singletons/object_class.py
@@ -6,8 +6,8 @@
 from voluptuous import Schema
 from es_client.builder import Builder
 from es_client.exceptions import FailedValidation
-from es_client.helpers.schemacheck import SchemaCheck
-from es_client.helpers.utils import prune_nones
+from es_client.schemacheck import SchemaCheck
+from es_client.utils import prune_nones
 from curator import IndexList, SnapshotList
 from curator.actions import (
     Alias,
diff --git a/curator/cli_singletons/rollover.py b/curator/cli_singletons/rollover.py
@@ -1,7 +1,7 @@
 """Index Rollover Singleton"""
 
 import click
-from es_client.helpers.utils import prune_nones
+from es_client.utils import prune_nones
 from curator.cli_singletons.object_class import CLIAction
 from curator.cli_singletons.utils import json_to_dict
 
diff --git a/curator/cli_singletons/utils.py b/curator/cli_singletons/utils.py
@@ -2,7 +2,7 @@
 
 import json
 from click import BadParameter
-from es_client.helpers.utils import ensure_list
+from es_client.utils import ensure_list
 
 
 # Click functions require ctx and param to be passed positionally even if not used
diff --git a/curator/defaults/settings.py b/curator/defaults/settings.py
@@ -15,8 +15,8 @@
     '-.kibana*,-.security*,-.watch*,-.triggered_watch*,'
     '-.ml*,-.geoip_databases*,-.logstash*,-.tasks*'
 )
-VERSION_MIN = (7, 14, 0)
-VERSION_MAX = (8, 99, 99)
+VERSION_MIN = (9, 0, 0)
+VERSION_MAX = (9, 99, 99)
 
 # Click specifics
 
diff --git a/curator/helpers/date_ops.py b/curator/helpers/date_ops.py
@@ -6,7 +6,7 @@
 import string
 import time
 from datetime import timedelta, datetime, timezone
-from elasticsearch8.exceptions import NotFoundError
+from elasticsearch9.exceptions import NotFoundError
 from curator.exceptions import ConfigurationError
 from curator.defaults.settings import date_regex
 
diff --git a/curator/helpers/getters.py b/curator/helpers/getters.py
@@ -1,7 +1,7 @@
 """Utility functions that get things"""
 
 import logging
-from elasticsearch8 import exceptions as es8exc
+from elasticsearch9 import exceptions as es8exc
 from curator.defaults.settings import EXCLUDE_SYSTEM
 from curator.exceptions import (
     ConfigurationError,
diff --git a/curator/helpers/testers.py b/curator/helpers/testers.py
@@ -2,10 +2,10 @@
 
 import logging
 from voluptuous import Schema
-from elasticsearch8 import Elasticsearch
-from elasticsearch8.exceptions import NotFoundError
-from es_client.helpers.schemacheck import SchemaCheck
-from es_client.helpers.utils import prune_nones
+from elasticsearch9 import Elasticsearch
+from elasticsearch9.exceptions import NotFoundError
+from es_client.schemacheck import SchemaCheck
+from es_client.utils import prune_nones
 from curator.helpers.getters import get_repository, get_write_index
 from curator.exceptions import (
     ConfigurationError,
diff --git a/curator/helpers/utils.py b/curator/helpers/utils.py
@@ -5,7 +5,7 @@
 
 import re
 import logging
-from es_client.helpers.utils import ensure_list
+from es_client.utils import ensure_list
 from curator.exceptions import FailedExecution
 
 logger = logging.getLogger(__name__)
diff --git a/curator/helpers/waiters.py b/curator/helpers/waiters.py
@@ -7,7 +7,7 @@
 import warnings
 from time import localtime, sleep, strftime
 from datetime import datetime
-from elasticsearch8.exceptions import GeneralAvailabilityWarning
+from elasticsearch9.exceptions import GeneralAvailabilityWarning
 from curator.exceptions import (
     ActionTimeout,
     ConfigurationError,
diff --git a/curator/indexlist.py b/curator/indexlist.py
@@ -4,9 +4,9 @@
 import re
 import itertools
 import logging
-from elasticsearch8.exceptions import NotFoundError, TransportError
-from es_client.helpers.schemacheck import SchemaCheck
-from es_client.helpers.utils import ensure_list
+from elasticsearch9.exceptions import NotFoundError, TransportError
+from es_client.schemacheck import SchemaCheck
+from es_client.utils import ensure_list
 from curator.defaults import settings
 from curator.exceptions import (
     ActionError,
diff --git a/curator/repomgrcli.py b/curator/repomgrcli.py
@@ -4,17 +4,17 @@
 import logging
 import pprint
 import click
-from elasticsearch8 import ApiError, NotFoundError
+from elasticsearch9 import ApiError, NotFoundError
 from es_client.defaults import LOGGING_SETTINGS, SHOW_OPTION
 from es_client.builder import Builder
-from es_client.helpers.config import (
+from es_client.config import (
     cli_opts,
     context_settings,
     generate_configdict,
     get_config,
 )
-from es_client.helpers.logging import configure_logging
-from es_client.helpers.utils import option_wrapper
+from es_client.logging import configure_logging
+from es_client.utils import option_wrapper
 from curator.defaults.settings import (
     CLICK_DRYRUN,
     VERSION_MAX,
diff --git a/curator/singletons.py b/curator/singletons.py
@@ -2,15 +2,15 @@
 
 import click
 from es_client.defaults import SHOW_EVERYTHING
-from es_client.helpers.config import (
+from es_client.config import (
     cli_opts,
     context_settings,
     generate_configdict,
     get_config,
     options_from_dict,
 )
-from es_client.helpers.logging import configure_logging
-from es_client.helpers.utils import option_wrapper
+from es_client.logging import configure_logging
+from es_client.utils import option_wrapper
 from curator.defaults.settings import CLICK_DRYRUN, default_config_file, footer
 from curator._version import __version__
 from curator.cli_singletons import (
diff --git a/curator/snapshotlist.py b/curator/snapshotlist.py
@@ -2,7 +2,7 @@
 
 import re
 import logging
-from es_client.helpers.schemacheck import SchemaCheck
+from es_client.schemacheck import SchemaCheck
 from curator.exceptions import (
     ConfigurationError,
     FailedExecution,
diff --git a/curator/validators/actions.py b/curator/validators/actions.py
@@ -1,7 +1,7 @@
 """Validate root ``actions`` and individual ``action`` Schemas"""
 
 from voluptuous import Any, In, Schema, Optional, Required
-from es_client.helpers.schemacheck import SchemaCheck
+from es_client.schemacheck import SchemaCheck
 from curator.defaults import settings
 
 
diff --git a/curator/validators/filter_functions.py b/curator/validators/filter_functions.py
@@ -2,8 +2,8 @@
 
 import logging
 from voluptuous import Any, In, Required, Schema
-from es_client.helpers.schemacheck import SchemaCheck
-from es_client.helpers.utils import prune_nones
+from es_client.schemacheck import SchemaCheck
+from es_client.utils import prune_nones
 from curator.defaults import settings, filtertypes
 from curator.exceptions import ConfigurationError
 
diff --git a/docker_test/scripts/create.sh b/docker_test/scripts/create.sh
@@ -25,7 +25,7 @@ REMOTE_PORT=9201
 LOCAL_URL=http://127.0.0.1:${LOCAL_PORT}
 REMOTE_URL=http://127.0.0.1:${REMOTE_PORT}
 
-if [[ "$MAJOR" -eq 8 ]]; then
+if [[ "$MAJOR" -ge 8 ]]; then
   MONITORING="xpack.monitoring.templates.enabled"
   IMAGE=docker.elastic.co/elasticsearch/elasticsearch
 elif [[ "$MAJOR" -eq 7 ]]; then
@@ -153,4 +153,4 @@ for IP in $IPLIST; do
 done
 
 echo
-echo "Ready to test!"
+echo "Ready to test!"
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,40 @@
 Changelog
 =========
 
+[9.0.0] - 2025-10-03
+--------------------
+
+**BREAKING CHANGE**
+
+Curator 9.x requires Python 3.10 or later. Python 3.8 and 3.9 are no longer supported. It has not yet been tested with Python 3.14.
+
+**Announcement**
+
+This the first major release supporting Elasticsearch 9.x. Only Elasticsearch 9 is supported by this release. If you need to use Curator with Elasticsearch 8.x, please use Curator 8.0.21 or earlier.
+
+All tests pass in Python versions 3.10.13, 3.11.8, 3.12.9, and 3.13.7.
+
+The Docker image is now based on ``python:3.13.7-alpine3.22``. The release candidate was built and tested against an Elastic Cloud instance.
+
+
+
+**Changes**
+
+  * Update to use ``es_client==9.0.0``, which supports Elasticsearch 9.x
+  * Update all references to ``elasticsearch8`` to use ``elasticsearch9``
+  * Remove all references to deprecated ``es_client.helpers`` modules.
+  * Set ``VERSION_MIN`` to ``9.0.0`` and ``VERSION_MAX`` to ``9.99.99`` in ``curator.defaults`` to
+    prevent accidental use of Curator 9.x with Elasticsearch 8.x and earlier.
+  * Allow docker_test/scripts/create.sh to accept ``-ge 8`` versions of Elasticsearch.
+  * Bump versions in docs/asciidoc files.
+  * Remove Python versions 3.8 and 3.9 from acceptable versions. ``requires-python = ">=3.10"``, due to the changes in ``click>=8.2.0``
+  * Add Python 3.13 to the supported versions.
+  * Automated linter reformatting of some files, but no code changes.
+  * Fix ``Dockerfile`` to use ``alpine3.22`` with Python 3.13.7
+  * Update ``pyproject.toml`` to reflect new dependencies and versions.
+  * Update tests to reflect changes in ``click==8.3.0``. Mostly using ``result.stdout_bytes`` instead of ``result.output``.
+
+
 8.0.21 (1 April 2025)
 ---------------------
 
diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,10 +1,10 @@
-:curator_version: 8.0.21
-:curator_major: 8
-:curator_doc_tree: 8.0
-:es_py_version: 8.17.2
-:es_doc_tree: 8.17
-:stack_doc_tree: 8.17
-:pybuild_ver: 3.12.9
+:curator_version: 9.0.0
+:curator_major: 9
+:curator_doc_tree: 9.0
+:es_py_version: 9.1.0
+:es_doc_tree: 9.1
+:stack_doc_tree: 9.1
+:pybuild_ver: 3.13.7
 :copyright_years: 2011-2025
 :ref:  http://www.elastic.co/guide/en/elasticsearch/reference/{es_doc_tree}
 :esref: http://www.elastic.co/guide/en/elasticsearch/reference/{stack_doc_tree}
diff --git a/docs/conf.py b/docs/conf.py
@@ -71,9 +71,9 @@
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.12', None),
-    'es_client': ('https://es-client.readthedocs.io/en/v8.17.5', None),
-    'elasticsearch8': ('https://elasticsearch-py.readthedocs.io/en/v8.17.2', None),
+    'python': ('https://docs.python.org/3.13', None),
+    'es_client': ('https://es-client.readthedocs.io/en/v9.0.0', None),
+    'elasticsearch9': ('https://elasticsearch-py.readthedocs.io/en/v9.1.0', None),
     'voluptuous': ('http://alecthomas.github.io/voluptuous/docs/_build/html', None),
-    'click': ('https://click.palletsprojects.com/en/8.1.x', None),
+    'click': ('https://click.palletsprojects.com/en/stable', None),
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,18 +9,17 @@ dynamic = ["version"]
 description = "Tending your Elasticsearch indices and snapshots"
 license = {file = "LICENSE"}
 readme = "README.rst"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: System Administrators",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 keywords = [
     'elasticsearch',
@@ -29,7 +28,7 @@ keywords = [
     'index-expiry'
 ]
 dependencies = [
-    "es_client==8.17.5"
+    "es_client==9.0.1"
 ]
 
 [project.optional-dependencies]
@@ -105,7 +104,7 @@ all = ["python", "templates"]
 max-line-length = "88"
 
 [tool.black]
-target-version = ['py38']
+target-version = ['py310']
 line-length = 88
 skip-string-normalization = true
 include = '\.pyi?$'
@@ -116,11 +115,11 @@ platforms = ["linux", "macos"]
 dependencies = [
     "requests",
     "pytest >=7.2.1",
-    "pytest-cov"
+    "pytest-cov",
 ]
 
 [[tool.hatch.envs.test.matrix]]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
+python = ["3.10", "3.11", "3.12", "3.13"]
 
 [tool.hatch.envs.test.scripts]
 pytest = "source docker_test/.env; pytest"
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/integration/test_alias.py b/tests/integration/test_alias.py
diff --git a/tests/integration/test_create_index.py b/tests/integration/test_create_index.py
diff --git a/tests/integration/test_es_repo_mgr.py b/tests/integration/test_es_repo_mgr.py
diff --git a/tests/integration/test_integrations.py b/tests/integration/test_integrations.py
diff --git a/tests/integration/test_open.py b/tests/integration/test_open.py
diff --git a/tests/unit/test_helpers_date_ops.py b/tests/unit/test_helpers_date_ops.py
diff --git a/tests/unit/test_helpers_getters.py b/tests/unit/test_helpers_getters.py
diff --git a/tests/unit/test_helpers_testers.py b/tests/unit/test_helpers_testers.py
diff --git a/tests/unit/test_validators.py b/tests/unit/test_validators.py
diff --git a/tests/unit/testvars.py b/tests/unit/testvars.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Curator Version"""`
`2`	`2`
`3`		`-__version__ = '8.0.21'`
	`3`	`+__version__ = '9.0.0'`