Skip to content

Commit 59a9ad5

Browse files
authored
Add 8.17.0 to test matrix (elastic#969)
* Add 8.17.0 to test matrix * use 8.17.0 in kibana-rest tests * fix post-test destroy * Update ES client to 8.17
1 parent acd913b commit 59a9ad5

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
- '8.14.3'
126126
- '8.15.5'
127127
- '8.16.2'
128+
- '8.17.0'
128129
steps:
129130
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
130131
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
@@ -154,7 +155,7 @@ jobs:
154155

155156
- id: setup-fleet
156157
name: Setup Fleet
157-
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'
158+
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'
158159
run: |-
159160
make setup-kibana-fleet
160161
env:
@@ -163,7 +164,7 @@ jobs:
163164

164165
- id: force-install-synthetics
165166
name: Force install synthetics
166-
if: matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2'
167+
if: matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0'
167168
run: |-
168169
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
169170

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SWAGGER_VERSION ?= 8.7
1616

1717
GOVERSION ?= $(shell grep -e '^go' go.mod | cut -f 2 -d ' ')
1818

19-
STACK_VERSION ?= 8.16.2
19+
STACK_VERSION ?= 8.17.0
2020

2121
ELASTICSEARCH_NAME ?= terraform-elasticstack-es
2222
ELASTICSEARCH_ENDPOINTS ?= http://$(ELASTICSEARCH_NAME):9200

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.23.3
77
require (
88
github.com/disaster37/go-kibana-rest/v8 v8.5.0
99
github.com/elastic/elastic-transport-go/v8 v8.6.0
10-
github.com/elastic/go-elasticsearch/v8 v8.16.0
10+
github.com/elastic/go-elasticsearch/v8 v8.17.0
1111
github.com/google/gofuzz v1.2.0
1212
github.com/google/uuid v1.6.0
1313
github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2525
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2626
github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
2727
github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
28-
github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE=
29-
github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
28+
github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0=
29+
github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
3030
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
3131
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
3232
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=

internal/elasticsearch/index/data_stream_lifecycle/acc_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,16 @@ func checkResourceDataStreamLifecycleDestroy(s *terraform.State) error {
273273

274274
defer res.Body.Close()
275275

276-
dStreams := make(map[string][]models.DataStreamLifecycle)
276+
dStreams := struct {
277+
DataStreams []models.DataStreamLifecycle `json:"data_streams,omitempty"`
278+
}{}
279+
277280
if err := json.NewDecoder(res.Body).Decode(&dStreams); err != nil {
278281
return err
279282
}
283+
280284
// for lifecycle with wildcard empty array is returned
281-
if len(dStreams["data_streams"]) > 0 {
285+
if len(dStreams.DataStreams) > 0 {
282286
return fmt.Errorf("Data Stream Lifecycle (%s) still exists", compId.ResourceId)
283287
}
284288
}

libs/go-kibana-rest/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
elasticsearch:
3-
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.2
3+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
44
environment:
55
cluster.name: test
66
discovery.type: single-node
@@ -11,7 +11,7 @@ services:
1111
ports:
1212
- "9200:9200/tcp"
1313
set-kibana-password:
14-
image: docker.elastic.co/kibana/kibana:8.16.2
14+
image: docker.elastic.co/kibana/kibana:8.17.0
1515
restart: on-failure
1616
links:
1717
- elasticsearch
@@ -22,7 +22,7 @@ services:
2222
elasticsearch:
2323
condition: service_started
2424
kibana:
25-
image: docker.elastic.co/kibana/kibana:8.16.2
25+
image: docker.elastic.co/kibana/kibana:8.17.0
2626
environment:
2727
SERVER_NAME: kibana
2828
ELASTICSEARCH_HOSTS: http://es:9200

libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (s *KBAPITestSuite) TestKibanaSpaces() {
4242
Objects: []KibanaSpaceObjectParameter{
4343
{
4444
Type: "config",
45-
ID: "8.16.2",
45+
ID: "8.17.0",
4646
},
4747
},
4848
}

0 commit comments

Comments
 (0)