From 2f2c26e14d20b1b4d74cbc34cd5d7a1865f7b4e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 00:43:41 +0000 Subject: [PATCH 1/3] build(deps): bump github.com/elastic/go-elasticsearch/v8 Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.14.0 to 8.15.0. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.14.0...v8.15.0) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5e3472a57..d86489dc4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/elastic/elastic-agent-client/v7 v7.15.0 github.com/elastic/elastic-agent-libs v0.10.0 github.com/elastic/elastic-agent-system-metrics v0.11.2 - github.com/elastic/go-elasticsearch/v8 v8.14.0 + github.com/elastic/go-elasticsearch/v8 v8.15.0 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.6.0 github.com/go-chi/chi/v5 v5.0.12 diff --git a/go.sum b/go.sum index 473a066d0..f1f94d44a 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,8 @@ github.com/elastic/elastic-agent-system-metrics v0.11.2 h1:UjSBcY6U3H3venB5zAPEF github.com/elastic/elastic-agent-system-metrics v0.11.2/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/go-elasticsearch/v8 v8.14.0 h1:1ywU8WFReLLcxE1WJqii3hTtbPUE2hc38ZK/j4mMFow= -github.com/elastic/go-elasticsearch/v8 v8.14.0/go.mod h1:WRvnlGkSuZyp83M2U8El/LGXpCjYLrvlkSgkAH4O5I4= +github.com/elastic/go-elasticsearch/v8 v8.15.0 h1:IZyJhe7t7WI3NEFdcHnf6IJXqpRf+8S8QWLtZYYyBYk= +github.com/elastic/go-elasticsearch/v8 v8.15.0/go.mod h1:HCON3zj4btpqs2N1jjsAy4a/fiAul+YBP00mBH4xik8= github.com/elastic/go-structform v0.0.12 h1:HXpzlAKyej8T7LobqKDThUw7BMhwV6Db24VwxNtgxCs= github.com/elastic/go-structform v0.0.12/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.14.1 h1:BpY/Utfz75oKSpsQnbAJmmlnT3gBV9WFsopBEYgjhZY= From a42b90b39e06abb629896baeb29a675a5e90c25a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 30 Aug 2024 00:44:31 +0000 Subject: [PATCH 2/3] Post dependabot file modifications --- NOTICE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index be9c444e0..8f65e3afa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1083,11 +1083,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.14.0 +Version: v8.15.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.14.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.15.0/LICENSE: Apache License Version 2.0, January 2004 From 2e0df82a9a484282c2498c33c6bbf6cf03025ab2 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Fri, 30 Aug 2024 11:13:02 -0700 Subject: [PATCH 3/3] Fix script definition --- internal/pkg/checkin/bulk.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/pkg/checkin/bulk.go b/internal/pkg/checkin/bulk.go index f4d905f13..1cc27f201 100644 --- a/internal/pkg/checkin/bulk.go +++ b/internal/pkg/checkin/bulk.go @@ -214,10 +214,11 @@ func (bc *Bulk) flush(ctx context.Context) error { return err } action := &estypes.UpdateAction{ - Script: &estypes.InlineScript{ - Lang: &scriptlanguage.Painless, - Source: deleteAuditAttributesScript, - Params: params, + Script: &estypes.Script{ + Lang: &scriptlanguage.Painless, + Source: &deleteAuditAttributesScript, + Options: map[string]string{}, + Params: params, }, } body, err = json.Marshal(&action)