Skip to content

Migrate downsample REST with security tests #131453

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

Jump to bottom
Merged
merged 13 commits into from
Aug 21, 2025
Merged

Migrate downsample REST with security tests #131453

merged 13 commits into from
Aug 21, 2025

Conversation

ldematte
Copy link
Contributor

@ldematte ldematte commented Jul 17, 2025 •
edited
Loading

Same changes as in #131464

Fixes #131513 too

@ldematte ldematte mentioned this pull request Jul 18, 2025
Merged
@ldematte ldematte marked this pull request as ready for review July 18, 2025 09:07
@ldematte ldematte requested a review from a team as a code owner July 18, 2025 09:07
@elasticsearchmachine elasticsearchmachine added the needs:triage Requires assignment of a team area label label Jul 18, 2025
@ldematte ldematte added :Core/Infra/Core Core issues without another label >refactoring auto-backport Automatically create backport pull requests when merged v9.1.1 and removed needs:triage Requires assignment of a team area label labels Jul 18, 2025
@ldematte ldematte requested a review from a team July 18, 2025 09:08
@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Jul 18, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@ldematte ldematte mentioned this pull request Jul 18, 2025
Closed
mark-vieira
mark-vieira approved these changes Aug 12, 2025
View reviewed changes
Copy link
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

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

Should would prefer to ditch the default distro here. Not sure how far down that rabbit hole you attempted to go.

...ample/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleRestIT.java
@@ -35,7 +35,7 @@ public DownsampleRestIT(final ClientYamlTestCandidate testCandidate) {

@ParametersFactory
public static Iterable<Object[]> parameters() throws Exception {
return ESClientYamlSuiteTestCase.createParameters();
return ESClientYamlSuiteTestCase.createParameters(new String[] { "downsample" });
Copy link
Contributor

Choose a reason for hiding this comment

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

We should really make createParameters take a variable argument parameter to make this more convenient.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

++, I'll make a note to do this next time (in a separate PR)

...rest/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleWithBasicRestIT.java
@@ -34,7 +34,7 @@ public DownsampleWithBasicRestIT(final ClientYamlTestCandidate testCandidate) {

@ParametersFactory
public static Iterable<Object[]> parameters() throws Exception {
return ESClientYamlSuiteTestCase.createParameters();
return ESClientYamlSuiteTestCase.createParameters(new String[] { "downsample" });
Copy link
Contributor

Choose a reason for hiding this comment

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

I sure wish I understood the rationale behind running these tests multiple times with difference license types. We don't do this consistently.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same here. I just "ported" them 1-1, but I do wonder if there is a consistent rule or pattern here, and if we should flag any test that does not follow it so the teams owning them could review and amend.

Copy link
Contributor

Choose a reason for hiding this comment

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

but I do wonder if there is a consistent rule or pattern here

There almost certainly is not.

@ldematte
Copy link
Contributor Author

would prefer to ditch the default distro here. Not sure how far down that rabbit hole you attempted to go.

TBH I haven't tried, as DownsampleRestIT was already using the new framework with the default distribution, I used the same for the missing test(s).
Let me try to make it better, but if you are OK I'd like to address this in a separate PR.

@ldematte
Copy link
Contributor Author

Serverless failure is related, this test was not running in serverless before and we "accidentally" added it.
https://github.com/elastic/elasticsearch-serverless/pull/4366 fixes this, and needs to go in first.

@mark-vieira
Copy link
Contributor

Let me try to make it better, but if you are OK I'd like to address this in a separate PR.

👍

@ldematte ldematte enabled auto-merge (squash) August 14, 2025 08:33
@ldematte ldematte merged commit 6d21904 into elastic:main Aug 21, 2025
33 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
❌ 9.1 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 131453

ldematte added a commit to ldematte/elasticsearch that referenced this pull request Aug 25, 2025
@ldematte
Migrate downsample REST with security tests (elastic#131453)
729ea4d 
Same changes as in elastic#131464

Fixes elastic#131513 too
@ldematte ldematte mentioned this pull request Aug 25, 2025
Merged
@ldematte ldematte deleted the refactor-xpack-downsample-tests branch August 25, 2025 13:27
@ldematte ldematte mentioned this pull request Aug 25, 2025
Merged
elasticsearchmachine pushed a commit that referenced this pull request Aug 25, 2025
@ldematte
Migrate downsample REST with security tests (#131453) (#133472)
2e59b2a 
Same changes as in #131464

Fixes #131513 too
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mark-vieira mark-vieira mark-vieira approved these changes

Assignees
No one assigned
Labels
auto-backport Automatically create backport pull requests when merged :Core/Infra/Core Core issues without another label >refactoring Team:Core/Infra Meta label for core/infra team v9.1.4 v9.2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[CI] DownsampleWithBasicRestIT test {p0=downsample-with-security/10_basic/Downsample index} failing
3 participants
@ldematte @elasticsearchmachine @mark-vieira