Skip to content

Assume no operator if security not enabled in serverless #1851

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
gbanasiak merged 3 commits into from
May 29, 2024
Merged

Assume no operator if security not enabled in serverless #1851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c25c3ad
Assume no operator if security not enabled in serverless
gbanasiak May 29, 2024
7dc749f
Update esrally/client/factory.py
gbanasiak May 29, 2024
d2d9f6a
Fix comments
gbanasiak May 29, 2024
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
12 changes: 10 additions & 2 deletions esrally/client/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

import contextlib
import logging
import time

Expand Down Expand Up @@ -363,12 +364,19 @@ def cluster_distribution_version(hosts, client_options, client_factory=EsClientF
# if version number is not available default to build flavor
version_number = version.get("number", version_build_flavor)

# assume non-operator serverless privileges by default
serverless_operator = False
if versions.is_serverless(version_build_flavor):
# overwrite static serverless version number
version_number = "serverless"
authentication_info = es.perform_request(method="GET", path="/_security/_authenticate")
serverless_operator = authentication_info.body.get("operator", False)

# determine serverless operator status if security enabled
# pylint: disable=import-outside-toplevel
from elasticsearch.exceptions import ApiError

with contextlib.suppress(ApiError):
authentication_info = es.perform_request(method="GET", path="/_security/_authenticate")
serverless_operator = authentication_info.body.get("operator", False)

if not versions.is_serverless(version_build_flavor) or serverless_operator is True:
# if available, unconditionally wait for the REST layer - if it's not up, we'll intentionally raise the original error
Expand Down