From 0edcdc254c97ead7341c1c76e1eda75c70194b51 Mon Sep 17 00:00:00 2001 From: Dmytro Onishchenko Date: Fri, 3 Jan 2025 15:27:11 +0100 Subject: [PATCH 1/4] Add 8.17.0 to test matrix --- .github/workflows/test.yml | 5 +++-- Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 10d14726c..3aa9f4567 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -125,6 +125,7 @@ jobs: - '8.14.3' - '8.15.5' - '8.16.2' + - '8.17.0' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5 @@ -154,7 +155,7 @@ jobs: - id: setup-fleet name: Setup Fleet - if: matrix.version == '8.10.3' || matrix.version == '8.11.4' || matrix.version == '8.12.2' || matrix.version == '8.13.4' || matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' + if: matrix.version == '8.10.3' || matrix.version == '8.11.4' || matrix.version == '8.12.2' || matrix.version == '8.13.4' || matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0' run: |- make setup-kibana-fleet env: @@ -163,7 +164,7 @@ jobs: - id: force-install-synthetics name: Force install synthetics - if: matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' + if: matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0' run: |- for i in {1..5}; do curl -s -H "Authorization: ApiKey ${{ steps.get-api-key.outputs.apikey }}" --header "Content-Type: application/json" --header "kbn-xsrf: true" --request POST --data '{ "force": true }' http://localhost:5601/api/fleet/epm/packages/synthetics/1.2.2 && break || sleep 15; done diff --git a/Makefile b/Makefile index 604bba1ca..c23b04671 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ SWAGGER_VERSION ?= 8.7 GOVERSION ?= $(shell grep -e '^go' go.mod | cut -f 2 -d ' ') -STACK_VERSION ?= 8.16.2 +STACK_VERSION ?= 8.17.0 ELASTICSEARCH_NAME ?= terraform-elasticstack-es ELASTICSEARCH_ENDPOINTS ?= http://$(ELASTICSEARCH_NAME):9200 From d06bed010be54160773d538f6ed791365fb6ec90 Mon Sep 17 00:00:00 2001 From: Dmytro Onishchenko Date: Fri, 3 Jan 2025 15:34:14 +0100 Subject: [PATCH 2/4] use 8.17.0 in kibana-rest tests --- libs/go-kibana-rest/docker-compose.yml | 6 +++--- libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/go-kibana-rest/docker-compose.yml b/libs/go-kibana-rest/docker-compose.yml index efcd51590..e42044d5d 100644 --- a/libs/go-kibana-rest/docker-compose.yml +++ b/libs/go-kibana-rest/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.2 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 environment: cluster.name: test discovery.type: single-node @@ -11,7 +11,7 @@ services: ports: - "9200:9200/tcp" set-kibana-password: - image: docker.elastic.co/kibana/kibana:8.16.2 + image: docker.elastic.co/kibana/kibana:8.17.0 restart: on-failure links: - elasticsearch @@ -22,7 +22,7 @@ services: elasticsearch: condition: service_started kibana: - image: docker.elastic.co/kibana/kibana:8.16.2 + image: docker.elastic.co/kibana/kibana:8.17.0 environment: SERVER_NAME: kibana ELASTICSEARCH_HOSTS: http://es:9200 diff --git a/libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go b/libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go index 6fcde0b59..77d34a1d8 100644 --- a/libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go +++ b/libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go @@ -42,7 +42,7 @@ func (s *KBAPITestSuite) TestKibanaSpaces() { Objects: []KibanaSpaceObjectParameter{ { Type: "config", - ID: "8.16.2", + ID: "8.17.0", }, }, } From c2c146ddba9fa8cba70da870b60b5b7ac943b4ff Mon Sep 17 00:00:00 2001 From: Dmytro Onishchenko Date: Fri, 3 Jan 2025 15:41:04 +0100 Subject: [PATCH 3/4] fix post-test destroy --- .../elasticsearch/index/data_stream_lifecycle/acc_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go b/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go index 07310da07..708ad1600 100644 --- a/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go +++ b/internal/elasticsearch/index/data_stream_lifecycle/acc_test.go @@ -273,12 +273,16 @@ func checkResourceDataStreamLifecycleDestroy(s *terraform.State) error { defer res.Body.Close() - dStreams := make(map[string][]models.DataStreamLifecycle) + dStreams := struct { + DataStreams []models.DataStreamLifecycle `json:"data_streams,omitempty"` + }{} + if err := json.NewDecoder(res.Body).Decode(&dStreams); err != nil { return err } + // for lifecycle with wildcard empty array is returned - if len(dStreams["data_streams"]) > 0 { + if len(dStreams.DataStreams) > 0 { return fmt.Errorf("Data Stream Lifecycle (%s) still exists", compId.ResourceId) } } From 7ec2c341f93d36da4eb4af7189cc04df1c69e8cb Mon Sep 17 00:00:00 2001 From: Dmytro Onishchenko Date: Fri, 3 Jan 2025 15:43:51 +0100 Subject: [PATCH 4/4] Update ES client to 8.17 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ddeff1cec..25aa3d5be 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.3 require ( github.com/disaster37/go-kibana-rest/v8 v8.5.0 github.com/elastic/elastic-transport-go/v8 v8.6.0 - github.com/elastic/go-elasticsearch/v8 v8.16.0 + github.com/elastic/go-elasticsearch/v8 v8.17.0 github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637 diff --git a/go.sum b/go.sum index 4af8480da..89bcdb9af 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE= -github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64= +github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0= +github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=