Skip to content

Revert "Allow rest tests with Serverless API protections (#98250)"#98373

Merged
elasticsearchmachine merged 1 commit intoelastic:mainfrom
tvernum:revert-features-api-protection
Aug 11, 2023
Merged

Revert "Allow rest tests with Serverless API protections (#98250)"#98373
elasticsearchmachine merged 1 commit intoelastic:mainfrom
tvernum:revert-features-api-protection

Conversation

@tvernum
Copy link
Contributor

@tvernum tvernum commented Aug 11, 2023

This reverts commit 2ba7b79.

Temporarily reverting because it breaks downstream projects

@tvernum tvernum added >test Issues or PRs that are addressing/adding tests :Delivery/Build Build or test infrastructure v8.10.0 labels Aug 11, 2023
@tvernum tvernum requested a review from ywangd August 11, 2023 05:29
@elasticsearchmachine elasticsearchmachine added the Team:Delivery Meta label for Delivery team label Aug 11, 2023
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

Copy link
Member

@ywangd ywangd left a comment

Choose a reason for hiding this comment

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

LGTM

I am not entirely sure how this works. But since it is a revert, it's safe enough to just approve. Also, this means we should hold on for #98371.

@tvernum tvernum added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Aug 11, 2023
@elasticsearchmachine elasticsearchmachine merged commit 53e9792 into elastic:main Aug 11, 2023
@tvernum tvernum deleted the revert-features-api-protection branch August 11, 2023 06:14
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Aug 14, 2023
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Aug 15, 2023
This commit changes the `ESRestTestCase` in 3 ways

- Refactor the "hasXYZ" flags into a single `EnumSet` of
  `ProductFeature` flags
- Detect serverless distributions, and in those cases treat
  certain features as unavailable (even if the plugin is installed)
- Add a few more feature checks for features that can now be disabled

It also changes `ESClientYamlSuiteTestCase` to register a composable
global template if legacy templates are unavailable

Relates: elastic#98250, elastic#98373
csoulios pushed a commit to csoulios/elasticsearch that referenced this pull request Aug 18, 2023
…)" (elastic#98373)

This reverts commit 2ba7b79.

Temporarily reverting because it breaks downstream projects
tvernum added a commit that referenced this pull request Aug 22, 2023
This commit changes the `ESRestTestCase` in 3 ways

- Refactor the "hasXYZ" flags into a single `EnumSet` of
  `ProductFeature` flags
- Detect serverless distributions, and in those cases treat
  certain features as unavailable (even if the plugin is installed)
- Add a few more feature checks for features that can now be disabled

It also changes `ESClientYamlSuiteTestCase` to register a composable
global template if legacy templates are unavailable

Relates: #98250, #98373
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v8.10.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants