Merge remote-tracking branch 'upstream/main' into mw-resource

Author: adcoelho

.buildkite/release.yml

@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.24.4@sha256:10c131810f80a4802c49cab0961bbe18a16f4bb2fb99ef16deaa23e4246fc817"
+      image: "golang:1.24.4@sha256:20a022e5112a144aa7b7aeb3f22ebf2cdaefcc4aac0d64e8deeee8cdc18b9c0f"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"

.github/workflows/test.yml

@@ -37,9 +37,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
-          go-version-file: 'tools/go.mod'
+          go-version-file: 'go.mod'
           cache: true
-          cache-dependency-path: tools/go.sum
+          cache-dependency-path: go.sum
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
         with:
           terraform_wrapper: false
@@ -179,4 +179,5 @@ jobs:
           ELASTICSEARCH_USERNAME: "elastic"
           ELASTICSEARCH_PASSWORD: ${{ env.ELASTIC_PASSWORD }}
           KIBANA_ENDPOINT: "http://localhost:5601"
-          KIBANA_API_KEY: ${{ steps.get-api-key.outputs.apikey }}
+          KIBANA_USERNAME: "elastic"
+          KIBANA_PASSWORD: ${{ env.ELASTIC_PASSWORD }}

.golangci.yaml

@@ -1,5 +1,7 @@
 version: "2"
 linters:
+  enable:
+    - misspell
   exclusions:
     generated: lax
     presets:

CHANGELOG.md

@@ -1,7 +1,10 @@
 ## [Unreleased]
 
 - Add `headers` for the provider connection ([#1057](https://github.com/elastic/terraform-provider-elasticstack/pull/1057))
+- Migrate `elasticstack_elasticsearch_system_user` resource to Terraform plugin framework ([#1154](https://github.com/elastic/terraform-provider-elasticstack/pull/1154))
 - Add custom `endpoint` configuration support for snapshot repository setup ([#1158](https://github.com/elastic/terraform-provider-elasticstack/pull/1158))
+- Add `description` to `elasticstack_kibana_security_role` ([#1172](https://github.com/elastic/terraform-provider-elasticstack/issues/1172))
+- Add `elasticstack_kibana_synthetics_parameter` resource ([#1155](https://github.com/elastic/terraform-provider-elasticstack/pull/1155))
 
 ## [0.11.15] - 2025-04-23
 
@@ -423,7 +426,8 @@
 - Initial set of docs
 - CI integration
 
-[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.14...HEAD
+[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.15...HEAD
+[0.11.15]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.14...v0.11.15
 [0.11.14]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.13...v0.11.14
 [0.11.13]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.12...v0.11.13
 [0.11.12]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.11...v0.11.12

CONTRIBUTING.md

@@ -2,6 +2,11 @@
 
 Fork the repo, work on an issue
 
+## Updating the generated Kibana client.
+
+If your work involves the Kibana API, the endpoints may or may not be included in the generated client.
+Check [generated/kbapi](./generated/kbapi/) for more details.
+
 ## Acceptance tests
 
 ```bash
@@ -60,4 +65,4 @@ To release a new provider version:
 - updates CHANGELOG.md with the list of changes being released.
 [Example](https://github.com/elastic/terraform-provider-elasticstack/commit/be866ebc918184e843dc1dd2f6e2e1b963da386d).
 
-* Once the PR merged, the release CI pipeline can be started by pushing a new release tag to `main` branch.
+* Once the PR is merged, the release CI pipeline can be started by pushing a new release tag to the `main` branch.

Makefile

@@ -225,7 +225,7 @@ docker-clean: ## Try to remove provisioned nodes and assigned network
 
 .PHONY: docs-generate
 docs-generate: tools ## Generate documentation for the provider
-	@ $(GOBIN)/tfplugindocs
+	@ go tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 
 
 .PHONY: gen
@@ -245,31 +245,16 @@ install: build ## Install built provider into the local terraform cache
 
 
 .PHONY: tools
-tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs generation and development
-	@ cd tools && go install github.com/client9/misspell/cmd/misspell
-	@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
-	@ cd tools && go install github.com/goreleaser/goreleaser/v2
-	@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
-	@ cd tools && go install go.uber.org/mock/mockgen
-
-.PHONY: tools-golangci-lint
-tools-golangci-lint: ## Download golangci-lint locally if necessary.
-	@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.1.6
-
-
-.PHONY: misspell
-misspell:
-	@ $(GOBIN)/misspell -error -source go ./internal/
-	@ $(GOBIN)/misspell -error -source text ./templates/
-
+tools: $(GOBIN)  ## Download golangci-lint locally if necessary.
+	@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.2.1
 
 .PHONY: golangci-lint
 golangci-lint:
 	@ $(GOBIN)/golangci-lint run --max-same-issues=0 $(GOLANGCIFLAGS) ./internal/...
 
 
 .PHONY: lint
-lint: setup misspell golangci-lint check-fmt check-docs ## Run lints to check the spelling and common go patterns
+lint: setup golangci-lint check-fmt check-docs ## Run lints to check the spelling and common go patterns
 
 .PHONY: fmt
 fmt: ## Format code
@@ -290,22 +275,21 @@ check-docs: docs-generate  ## Check uncommitted changes on docs
 
 
 .PHONY: setup
-setup: tools ## Setup the dev environment
-
+setup: tools vendor ## Setup the dev environment
 
 .PHONY: release-snapshot
 release-snapshot: tools ## Make local-only test release to see if it works using "release" command
-	@ $(GOBIN)/goreleaser release --snapshot --clean
+	@ go tool github.com/goreleaser/goreleaser/v2 release --snapshot --clean
 
 
 .PHONY: release-no-publish
 release-no-publish: tools check-sign-release ## Make a release without publishing artifacts
-	@ $(GOBIN)/goreleaser release --skip=publish,announce,validate  --parallelism=2
+	@ go tool github.com/goreleaser/goreleaser/v2 release --skip=publish,announce,validate  --parallelism=2
 
 
 .PHONY: release
 release: tools check-sign-release check-publish-release ## Build, sign, and upload your release
-	@ $(GOBIN)/goreleaser release --clean  --parallelism=4
+	@ go tool github.com/goreleaser/goreleaser/v2 release --clean  --parallelism=4
 
 
 .PHONY: check-sign-release

docs/data-sources/kibana_security_role.md

@@ -32,6 +32,7 @@ data "elasticstack_kibana_security_role" "example" {
 
 ### Optional
 
+- `description` (String) Description for the role
 - `metadata` (String) Optional meta-data.
 
 ### Read-Only

docs/resources/elasticsearch_security_system_user.md

@@ -41,10 +41,10 @@ resource "elasticstack_elasticsearch_security_system_user" "kibana_system" {
 
 ### Optional
 
-- `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))
+- `elasticsearch_connection` (Block List, Deprecated) Elasticsearch connection configuration block. (see [below for nested schema](#nestedblock--elasticsearch_connection))
 - `enabled` (Boolean) Specifies whether the user is enabled. The default value is true.
-- `password` (String, Sensitive) The user’s password. Passwords must be at least 6 characters long.
-- `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).
+- `password` (String, Sensitive) The user's password. Passwords must be at least 6 characters long.
+- `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).
 
 ### Read-Only
 

docs/resources/kibana_security_role.md

@@ -124,6 +124,7 @@ resource "elasticstack_kibana_security_role" "example" {
 
 ### Optional
 
+- `description` (String) Optional description for the role
 - `kibana` (Block Set) The list of objects that specify the Kibana privileges for the role. (see [below for nested schema](#nestedblock--kibana))
 - `metadata` (String) Optional meta-data.
 

docs/resources/kibana_synthetics_parameter.md

@@ -0,0 +1,54 @@
+---
+subcategory: "Kibana"
+layout: ""
+page_title: "Elasticstack: elasticstack_kibana_synthetics_parameter Resource"
+description: |-
+  Creates or updates a Kibana synthetics parameter.
+---
+
+# Resource: elasticstack_kibana_synthetics_parameter
+
+Creates or updates a Kibana synthetics parameter.
+See [Working with secrets and sensitive values](https://www.elastic.co/docs/solutions/observability/synthetics/work-with-params-secrets)
+and [API docs](https://www.elastic.co/docs/api/doc/kibana/group/endpoint-synthetics)
+
+## Example Usage
+
+```terraform
+provider "elasticstack" {
+  kibana {}
+}
+
+resource "elasticstack_kibana_synthetics_parameter" "example" {
+  key         = "example_key"
+  value       = "example_value"
+  description = "Example description"
+  tags        = ["tag-a", "tag-b"]
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `key` (String) The key of the parameter.
+- `value` (String, Sensitive) The value associated with the parameter.
+
+### Optional
+
+- `description` (String) A description of the parameter.
+- `share_across_spaces` (Boolean) Whether the parameter should be shared across spaces.
+- `tags` (List of String) An array of tags to categorize the parameter.
+
+### Read-Only
+
+- `id` (String) Generated id for the parameter.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import elasticstack_kibana_synthetics_parameter.my_param <space id>/<param_id>
+```