Skip to content

Fix index template conflict between integration tests #11507

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
swiatekm merged 1 commit into from
Dec 2, 2025
Merged

Fix index template conflict between integration tests #11507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions testing/integration/ess/beat_receivers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,9 +1517,8 @@ func setStrictMapping(client *elasticsearch.Client, index string) error {
defer cancel()

// Build request
req, err := http.NewRequestWithContext(ctx, http.MethodPut,
esEndpoint+"/_index_template/no-dynamic-template",
bytes.NewReader(jsonData))
url := fmt.Sprintf("%s/_index_template/%s", esEndpoint, index)
req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, bytes.NewReader(jsonData))
if err != nil {
return fmt.Errorf("could not create http request to ES server: %v", err)
}
Expand All @@ -1531,8 +1530,15 @@ func setStrictMapping(client *elasticsearch.Client, index string) error {
if err != nil {
return fmt.Errorf("error performing request: %v", err)
}
defer func() {
_ = resp.Body.Close()
}()
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("incorrect response code: %v", err)
responseBody, readErr := io.ReadAll(resp.Body)
if readErr != nil {
return fmt.Errorf("unexpected status code: %d, error reading response body: %w", resp.StatusCode, readErr)
}
return fmt.Errorf("unexpected status code: %d, response body: %s", resp.StatusCode, responseBody)
}
return nil
}
Expand Down