Skip to content

Commit e3182c8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into mw-resource
2 parents 0c8422f + bff8c00 commit e3182c8

Some content is hidden

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

41 files changed

+784
-571
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.24.2@sha256:d9db32125db0c3a680cfb7a1afcaefb89c898a075ec148fdc2f0f646cc2ed509"
4+
image: "golang:1.24.4@sha256:10c131810f80a4802c49cab0961bbe18a16f4bb2fb99ef16deaa23e4246fc817"
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@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
22+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # 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@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
38+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # 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@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
132+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
133133
with:
134134
go-version-file: 'go.mod'
135135
cache: true

CHANGELOG.md

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

3+
- Add `headers` for the provider connection ([#1057](https://github.com/elastic/terraform-provider-elasticstack/pull/1057))
4+
- Add custom `endpoint` configuration support for snapshot repository setup ([#1158](https://github.com/elastic/terraform-provider-elasticstack/pull/1158))
5+
6+
## [0.11.15] - 2025-04-23
7+
38
- Add `global_data_tags` to fleet agent policies. ([#1044](https://github.com/elastic/terraform-provider-elasticstack/pull/1044))
49

510
## [0.11.14] - 2025-03-17

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL = help
22
SHELL := /bin/bash
33

4-
VERSION ?= 0.11.14
4+
VERSION ?= 0.11.15
55

66
NAME = elasticstack
77
BINARY = terraform-provider-${NAME}
@@ -254,7 +254,7 @@ tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs ge
254254

255255
.PHONY: tools-golangci-lint
256256
tools-golangci-lint: ## Download golangci-lint locally if necessary.
257-
@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.0.2
257+
@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.1.6
258258

259259

260260
.PHONY: misspell

docs/data-sources/elasticsearch_index_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Optional:
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.
6363
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
64+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
6465
- `insecure` (Boolean) Disable TLS certificate validation
6566
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6667
- `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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Optional:
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.
6464
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
65+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
6566
- `insecure` (Boolean) Disable TLS certificate validation
6667
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6768
- `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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Optional:
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.
6161
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
62+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
6263
- `insecure` (Boolean) Disable TLS certificate validation
6364
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6465
- `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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Optional:
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.
6161
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
62+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
6263
- `insecure` (Boolean) Disable TLS certificate validation
6364
- `key_data` (String, Sensitive) PEM encoded private key for client auth
6465
- `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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Optional:
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.
8989
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
90+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
9091
- `insecure` (Boolean) Disable TLS certificate validation
9192
- `key_data` (String, Sensitive) PEM encoded private key for client auth
9293
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ Optional:
159159
- `cert_file` (String) Path to a file containing the PEM encoded certificate for client auth
160160
- `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.
161161
- `es_client_authentication` (String, Sensitive) ES Client Authentication field to be used with the JWT token
162+
- `headers` (Map of String, Sensitive) A list of headers to be sent with each request to Elasticsearch.
162163
- `insecure` (Boolean) Disable TLS certificate validation
163164
- `key_data` (String, Sensitive) PEM encoded private key for client auth
164165
- `key_file` (String) Path to a file containing the PEM encoded private key for client auth

0 commit comments

Comments
 (0)