Skip to content

Commit 429c11c

Browse files
authored
Merge branch 'main' into stack9
2 parents 25eb1e6 + 355f394 commit 429c11c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+499
-367
lines changed

.buildkite/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- label: Release
33
agents:
4-
image: "golang:1.23.3@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31"
4+
image: "golang:1.23.4@sha256:7ea4c9dcb2b97ff8ee80a67db3d44f98c8ffa0d191399197007d8459c1453041"
55
cpu: "16"
66
memory: "24G"
77
ephemeralStorage: "20G"

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 5
2020
steps:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
22-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
22+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
2323
with:
2424
go-version-file: 'go.mod'
2525
cache: true
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
38-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
38+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
3939
with:
4040
go-version-file: 'tools/go.mod'
4141
cache: true
@@ -129,7 +129,7 @@ jobs:
129129
- '9.0.0-SNAPSHOT'
130130
steps:
131131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
132-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
132+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
133133
with:
134134
go-version-file: 'go.mod'
135135
cache: true

CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
## [Unreleased]
22

3+
- Fix a provider crash when interacting with elasticstack_kibana_data_view resources created with 0.11.0. ([#979](https://github.com/elastic/terraform-provider-elasticstack/pull/979))
4+
- Add `max_primary_shard_docs` condition to ILM rollover ([#845](https://github.com/elastic/terraform-provider-elasticstack/pull/845))
5+
6+
## [0.11.13] - 2025-01-09
7+
38
- Support 8.15.5 in acc tests ([#963](https://github.com/elastic/terraform-provider-elasticstack/pull/963)).
49
- Support 8.16.2 in acc tests ([#964](https://github.com/elastic/terraform-provider-elasticstack/pull/964)).
5-
- Support several ssl fields in `elasticstack_kibana_synthetics_monitor` ([#967](https://github.com/elastic/terraform-provider-elasticstack/pull/967)).
10+
- Support 8.17.0 in acc tests ([#969](https://github.com/elastic/terraform-provider-elasticstack/pull/969)).
611
- Support 9.0.0 in acc tests ([#954](https://github.com/elastic/terraform-provider-elasticstack/pull/954)).
12+
- Support several ssl fields in `elasticstack_kibana_synthetics_monitor` ([#967](https://github.com/elastic/terraform-provider-elasticstack/pull/967)).
713

814
## [0.11.12] - 2024-12-16
915

1016
### Breaking changes
1117

12-
- Support multiple group by fields in SLOs ([#870](https://github.com/elastic/terraform-provider-elasticstack/pull/878)). This changes to type of the `group_by` attribute of the `elasticstack_kibana_slo` resource from a String to a list of Strings. Any existing SLO defintions will need to update `group_by = "field"` to `group_by = ["field"]`.
18+
- Support multiple group by fields in SLOs ([#870](https://github.com/elastic/terraform-provider-elasticstack/pull/878)). This changes to type of the `group_by` attribute of the `elasticstack_kibana_slo` resource from a String to a list of Strings. Any existing SLO defintions will need to update `group_by = "field"` to `group_by = ["field"]`.
1319

1420
### Changes
1521
- Handle NPE in integration policy secrets ([#946](https://github.com/elastic/terraform-provider-elasticstack/pull/946))
@@ -402,7 +408,8 @@
402408
- Initial set of docs
403409
- CI integration
404410
405-
[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.12...HEAD
411+
[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.13...HEAD
412+
[0.11.13]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.12...v0.11.13
406413
[0.11.12]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.11...v0.11.12
407414
[0.11.11]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.10...v0.11.11
408415
[0.11.10]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.9...v0.11.10

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SHELL := /bin/bash
33

44

5-
VERSION ?= 0.11.12
5+
VERSION ?= 0.11.13
66

77
NAME = elasticstack
88
BINARY = terraform-provider-${NAME}

catalog-info.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111

1212
spec:
1313
type: buildkite-pipeline
14-
owner: group:control-plane-stateful-applications
14+
owner: group:control-plane-hosted-applications
1515
system: buildkite
1616
implementation:
1717
apiVersion: buildkite.elastic.dev/v1
@@ -29,7 +29,7 @@ spec:
2929
filter_condition: 'build.tag =~ /^v[0-9.]+$/'
3030
filter_enabled: true
3131
teams:
32-
control-plane-stateful-applications:
32+
control-plane-hosted-applications:
3333
access_level: MANAGE_BUILD_AND_READ
3434
serverless-core-architecture:
3535
access_level: MANAGE_BUILD_AND_READ

docs/data-sources/elasticsearch_index_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Optional:
6060
- `cert_data` (String) PEM encoded certificate for client auth
6161
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
6262
- `endpoints` (List of String, Sensitive) A list of endpoints where the terraform provider will point to, this must include the http(s) schema and port number.
63-
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the bearer token
63+
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
6464
- `insecure` (Boolean) Disable TLS certificate validation
6565
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6666
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

docs/data-sources/elasticsearch_security_role.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Optional:
6161
- `cert_data` (String) PEM encoded certificate for client auth
6262
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
6363
- `endpoints` (List of String, Sensitive) A list of endpoints where the terraform provider will point to, this must include the http(s) schema and port number.
64-
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the bearer token
64+
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
6565
- `insecure` (Boolean) Disable TLS certificate validation
6666
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6767
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

docs/data-sources/elasticsearch_security_role_mapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Optional:
5858
- `cert_data` (String) PEM encoded certificate for client auth
5959
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
6060
- `endpoints` (List of String, Sensitive) A list of endpoints where the terraform provider will point to, this must include the http(s) schema and port number.
61-
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the bearer token
61+
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
6262
- `insecure` (Boolean) Disable TLS certificate validation
6363
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6464
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

docs/data-sources/elasticsearch_security_user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Optional:
5858
- `cert_data` (String) PEM encoded certificate for client auth
5959
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
6060
- `endpoints` (List of String, Sensitive) A list of endpoints where the terraform provider will point to, this must include the http(s) schema and port number.
61-
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the bearer token
61+
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
6262
- `insecure` (Boolean) Disable TLS certificate validation
6363
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6464
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

docs/data-sources/elasticsearch_snapshot_repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Optional:
8686
- `cert_data` (String) PEM encoded certificate for client auth
8787
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
8888
- `endpoints` (List of String, Sensitive) A list of endpoints where the terraform provider will point to, this must include the http(s) schema and port number.
89-
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the bearer token
89+
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
9090
- `insecure` (Boolean) Disable TLS certificate validation
9191
- `key_data` (String, Sensitive) PEM encoded private key for client auth
9292
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

0 commit comments

Comments
 (0)