Skip to content

Comments

[8.x](backport #4012) [Integration testing] Remove AltErr and only expect 400 from ES bulk API#4030

Merged
ycombinator merged 4 commits into8.xfrom
mergify/bp/8.x/pr-4012
Oct 30, 2024
Merged

[8.x](backport #4012) [Integration testing] Remove AltErr and only expect 400 from ES bulk API#4030
ycombinator merged 4 commits into8.xfrom
mergify/bp/8.x/pr-4012

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 22, 2024

What is the problem this PR solves?

This PR expects only a 400 HTTP response code from the Elasticsearch bulk API in integration tests when invalid index name is specified. Concretely, it removes the AltErr field temporarily introduced in #4001 which was allowing the tests to accept an alternate error from Elasticsearch.

Related: elastic/elasticsearch#114869


This is an automatic backport of pull request #4012 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner October 22, 2024 00:33
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 22, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 22, 2024

Cherry-pick of 1ae9ab6 has failed:

On branch mergify/bp/8.x/pr-4012
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 1ae9ab6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/bulk/bulk_integration_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@jlind23 jlind23 enabled auto-merge (squash) October 22, 2024 05:56
@jlind23
Copy link
Contributor

jlind23 commented Oct 22, 2024

buildkite test it

jlind23
jlind23 previously approved these changes Oct 22, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 28, 2024

This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏

ycombinator and others added 2 commits October 29, 2024 05:44
…API (#4012)

* Remove AltErr

* Fixed error type

(cherry picked from commit 1ae9ab6)

# Conflicts:
#	internal/pkg/bulk/bulk_integration_test.go
@ycombinator ycombinator force-pushed the mergify/bp/8.x/pr-4012 branch from f5ddc88 to 0850e31 Compare October 29, 2024 12:44
@ycombinator
Copy link
Contributor

buildkite test this

@ycombinator ycombinator enabled auto-merge (squash) October 29, 2024 22:59
@ycombinator ycombinator force-pushed the mergify/bp/8.x/pr-4012 branch from b67faee to 7b1d0d9 Compare October 30, 2024 00:59
@elastic-sonarqube
Copy link

@ycombinator ycombinator merged commit 457a697 into 8.x Oct 30, 2024
@ycombinator ycombinator deleted the mergify/bp/8.x/pr-4012 branch October 30, 2024 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants