Skip to content

Commit d19b020

Browse files
committed
Merge remote-tracking branch 'origin/main' into remove-misspell
* origin/main: Move tools to go.mod managed tools (#1185) fix(deps): update module github.com/hashicorp/terraform-plugin-docs to v0.22.0 (#1188) Bump github.com/cloudflare/circl from 1.6.0 to 1.6.1 in /tools (#1187) Migrate the System User resource to the plugin framework. (#1154) Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 in /tools (#1184) Bump golang.org/x/net from 0.36.0 to 0.38.0 in /libs/go-kibana-rest (#1183) chore(deps): update golang:1.24.4 docker digest to 20a022e (#1177) Bump github.com/getkin/kin-openapi from 0.127.0 to 0.131.0 in /tools (#1181)
2 parents 285acd4 + a50b48b commit d19b020

40 files changed

+2010
-2057
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.4@sha256:10c131810f80a4802c49cab0961bbe18a16f4bb2fb99ef16deaa23e4246fc817"
4+
image: "golang:1.24.4@sha256:20a022e5112a144aa7b7aeb3f22ebf2cdaefcc4aac0d64e8deeee8cdc18b9c0f"
55
cpu: "16"
66
memory: "24G"
77
ephemeralStorage: "20G"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## [Unreleased]
22

33
- Add `headers` for the provider connection ([#1057](https://github.com/elastic/terraform-provider-elasticstack/pull/1057))
4+
- Migrate `elasticstack_elasticsearch_system_user` resource to Terraform plugin framework ([#1154](https://github.com/elastic/terraform-provider-elasticstack/pull/1154))
45
- Add custom `endpoint` configuration support for snapshot repository setup ([#1158](https://github.com/elastic/terraform-provider-elasticstack/pull/1158))
56

67
## [0.11.15] - 2025-04-23

Makefile

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ docker-clean: ## Try to remove provisioned nodes and assigned network
225225

226226
.PHONY: docs-generate
227227
docs-generate: tools ## Generate documentation for the provider
228-
@ $(GOBIN)/tfplugindocs
228+
@ go tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
229229

230230

231231
.PHONY: gen
@@ -245,14 +245,7 @@ install: build ## Install built provider into the local terraform cache
245245

246246

247247
.PHONY: tools
248-
tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs generation and development
249-
@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
250-
@ cd tools && go install github.com/goreleaser/goreleaser/v2
251-
@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
252-
@ cd tools && go install go.uber.org/mock/mockgen
253-
254-
.PHONY: tools-golangci-lint
255-
tools-golangci-lint: ## Download golangci-lint locally if necessary.
248+
tools: $(GOBIN) ## Download golangci-lint locally if necessary.
256249
@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.2.1
257250

258251
.PHONY: golangci-lint
@@ -282,22 +275,21 @@ check-docs: docs-generate ## Check uncommitted changes on docs
282275

283276

284277
.PHONY: setup
285-
setup: tools ## Setup the dev environment
286-
278+
setup: tools vendor ## Setup the dev environment
287279

288280
.PHONY: release-snapshot
289281
release-snapshot: tools ## Make local-only test release to see if it works using "release" command
290-
@ $(GOBIN)/goreleaser release --snapshot --clean
282+
@ go tool github.com/goreleaser/goreleaser/v2 release --snapshot --clean
291283

292284

293285
.PHONY: release-no-publish
294286
release-no-publish: tools check-sign-release ## Make a release without publishing artifacts
295-
@ $(GOBIN)/goreleaser release --skip=publish,announce,validate --parallelism=2
287+
@ go tool github.com/goreleaser/goreleaser/v2 release --skip=publish,announce,validate --parallelism=2
296288

297289

298290
.PHONY: release
299291
release: tools check-sign-release check-publish-release ## Build, sign, and upload your release
300-
@ $(GOBIN)/goreleaser release --clean --parallelism=4
292+
@ go tool github.com/goreleaser/goreleaser/v2 release --clean --parallelism=4
301293

302294

303295
.PHONY: check-sign-release

docs/resources/elasticsearch_security_system_user.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ resource "elasticstack_elasticsearch_security_system_user" "kibana_system" {
4141

4242
### Optional
4343

44-
- `elasticsearch_connection` (Block List, Max: 1, Deprecated) Elasticsearch connection configuration block. This property will be removed in a future provider version. Configure the Elasticsearch connection via the provider configuration instead. (see [below for nested schema](#nestedblock--elasticsearch_connection))
44+
- `elasticsearch_connection` (Block List, Deprecated) Elasticsearch connection configuration block. (see [below for nested schema](#nestedblock--elasticsearch_connection))
4545
- `enabled` (Boolean) Specifies whether the user is enabled. The default value is true.
46-
- `password` (String, Sensitive) The users password. Passwords must be at least 6 characters long.
47-
- `password_hash` (String, Sensitive) A hash of the users password. This must be produced using the same hashing algorithm as has been configured for password storage (see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html#hashing-settings).
46+
- `password` (String, Sensitive) The user's password. Passwords must be at least 6 characters long.
47+
- `password_hash` (String, Sensitive) A hash of the user's password. This must be produced using the same hashing algorithm as has been configured for password storage (see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html#hashing-settings).
4848

4949
### Read-Only
5050

generated/alerting/api_alerting_mocks.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/alerting/mocks.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package alerting
2+
3+
//go:generate go tool go.uber.org/mock/mockgen -destination=./api_alerting_mocks.go -package=alerting -source ./api_alerting.go AlertingAPI

generated/connectors/connectors.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package connectors
2+
3+
//go:generate go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -package connectors -o ./connectors.gen.go -generate "types,client" ./bundled.yaml

generated/kbapi/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ oas_url := https://raw.githubusercontent.com/elastic/kibana/$(github_ref)/oas
77

88
.PHONY: all
99
all: download transform generate ## Fetch, bundle, transform, and generate the API
10-
10+
1111

1212
.PHONY: download
1313
download: oas.yaml ## Download the remote schema
1414

15-
oas.yaml:
15+
oas.yaml:
1616
curl -sSfo oas.yaml "$(oas_url)"
1717

1818
.PHONY: transform
@@ -21,7 +21,7 @@ transform: download ## Transform and filter the schema
2121

2222
.PHONY: generate
2323
generate: ## Generate the API
24-
go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 -config oapi-config.yaml ./oas-filtered.yaml
24+
go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config oapi-config.yaml ./oas-filtered.yaml
2525

2626

2727
.PHONY: clean

0 commit comments

Comments
 (0)