From 1eefc694b0a706f2507c5d03cde2cb58449d338e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:01:18 -0700 Subject: [PATCH] [updatecli] update elastic stack version for testing 9.0.0-b49e55df-SNAPSHOT (#3971) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update snapshot.yml Made with ❤️️ by updatecli * Fix broken integration test * fix condition --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: michel-laterman --- dev-tools/integration/.env | 2 +- internal/pkg/bulk/bulk_integration_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env index a40ce013b..e14b0aaab 100644 --- a/dev-tools/integration/.env +++ b/dev-tools/integration/.env @@ -1,6 +1,6 @@ # If you use change this version without a pinned one, please update # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml -ELASTICSEARCH_VERSION=9.0.0-070836bc-SNAPSHOT +ELASTICSEARCH_VERSION=9.0.0-b49e55df-SNAPSHOT ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=changeme TEST_ELASTICSEARCH_HOSTS=localhost:9200 diff --git a/internal/pkg/bulk/bulk_integration_test.go b/internal/pkg/bulk/bulk_integration_test.go index 47074d1a3..2ad1c0a41 100644 --- a/internal/pkg/bulk/bulk_integration_test.go +++ b/internal/pkg/bulk/bulk_integration_test.go @@ -75,7 +75,7 @@ func TestBulkCreate(t *testing.T) { }, AltErr: es.ErrElastic{ Status: 400, - Type: "json_parse_exception", + Type: "parse_exception", }, }, { @@ -106,7 +106,7 @@ func TestBulkCreate(t *testing.T) { id, err := bulker.Create(ctx, test.Index, test.ID, sampleData) if !EqualElastic(test.Err, err) { if test.AltErr == nil || !EqualElastic(test.AltErr, err) { - t.Fatalf("expected error: %+v, got: %+v", test.Err, err) + t.Fatalf("expected error: %+v (alt: %+v), got: %+v", test.Err, test.AltErr, err) } } if err != nil {