Merge branch 'main' into copilot/fix-1290-2

Author: nick-benoit

.buildkite/release.yml

@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.25.0@sha256:5502b0e56fca23feba76dbc5387ba59c593c02ccc2f0f7355871ea9a0852cebe"
+      image: "golang:1.25.1@sha256:bb979b278ffb8d31c8b07336fd187ef8fafc8766ebeaece524304483ea137e96"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"

.github/copilot-instructions.md

@@ -59,6 +59,21 @@ Carefully read the issue and think hard about a plan to solve it before coding.
 - Write additional tests if needed to capture important behaviors or edge cases.
 - Ensure all tests pass before finalizing.
 
+### 6.1 Acceptance Testing Requirements
+When running acceptance tests (`make testacc`), ensure the following:
+
+
+- **Environment Variables** - The following environment variables are required for acceptance tests:
+  - `ELASTICSEARCH_ENDPOINTS` (default: http://localhost:9200)
+  - `ELASTICSEARCH_USERNAME` (default: elastic) 
+  - `ELASTICSEARCH_PASSWORD` (default: password)
+  - `KIBANA_ENDPOINT` (default: http://localhost:5601)
+  - `TF_ACC` (must be set to "1" to enable acceptance tests)
+- **Ensure a valid environment if using `go test`** - Check if the required environment variables are set, if not use the defaults specified above. 
+- **Always finish with `make testacc`** - This will run all tests. Make sure all tests pass before considering a task complete.
+- **Pre-set Environment Variables** - Default environment variables are configured in the Makefile. If these defaults are suitable for your testing environment, `make testacc` will work directly without additional setup
+- **Docker Environment** - For isolated testing with guaranteed environment setup, use `make docker-testacc` which starts Elasticsearch and Kibana containers automatically
+
 ## 7. Final Verification
 - Confirm the root cause is fixed.
 - Review your solution for logic correctness and robustness.

.github/workflows/copilot-setup-steps.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
         with:
           go-version-file: 'go.mod'
           cache: true

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -130,7 +130,7 @@ jobs:
           - '9.0.3'
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
         with:
           go-version-file: 'go.mod'
           cache: true

CHANGELOG.md

@@ -10,7 +10,15 @@
 - Add support for managing cross_cluster API keys in `elasticstack_elasticsearch_security_api_key` ([#1252](https://github.com/elastic/terraform-provider-elasticstack/pull/1252))
 - Allow version changes without a destroy/create cycle with `elasticstack_fleet_integration` ([#1255](https://github.com/elastic/terraform-provider-elasticstack/pull/1255)). This fixes an issue where it was impossible to upgrade integrations which are used by an integration policy.
 - Add `namespace` attribute to `elasticstack_kibana_synthetics_monitor` resource to support setting data stream namespace independently from `space_id` ([#1247](https://github.com/elastic/terraform-provider-elasticstack/pull/1247))
+- Support setting an explit `connector_id` in `elasticstack_kibana_action_connector`. This attribute already existed, but was being ignored by the provider. Setting the attribute will return an error in Elastic Stack v8.8 and lower since creating a connector with an explicit ID is not supported. ([1260](https://github.com/elastic/terraform-provider-elasticstack/pull/1260))
+- Migrate `elasticstack_kibana_action_connector` to the Terraform plugin framework ([#1269](https://github.com/elastic/terraform-provider-elasticstack/pull/1269))
 - Migrate `elasticstack_elasticsearch_security_role_mapping` resource and data source to Terraform Plugin Framework ([#1279](https://github.com/elastic/terraform-provider-elasticstack/pull/1279))
+- Add support for `inactivity_timeout` in `elasticstack_fleet_agent_policy` ([#641](https://github.com/elastic/terraform-provider-elasticstack/issues/641))
+- Add support for `prevent_initial_backfill` to `elasticstack_kibana_slo` ([#1071](https://github.com/elastic/terraform-provider-elasticstack/pull/1071))
+- [Refactor] Regenerate the SLO client using the current OpenAPI spec ([#1303](https://github.com/elastic/terraform-provider-elasticstack/pull/1303))
+- Add support for `data_view_id` in the `elasticstack_kibana_slo` resource ([#1305](https://github.com/elastic/terraform-provider-elasticstack/pull/1305))
+- Add support for `unenrollment_timeout` in `elasticstack_fleet_agent_policy` ([#1169](https://github.com/elastic/terraform-provider-elasticstack/issues/1169))
+- Handle default value for `allow_restricted_indices` in `elasticstack_elasticsearch_security_api_key` ([#1315](https://github.com/elastic/terraform-provider-elasticstack/pull/1315))
 
 ## [0.11.17] - 2025-07-21
 

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
-	@ go tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
+	@ go tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate --provider-name terraform-provider-elasticstack
 
 
 .PHONY: gen
@@ -350,7 +350,7 @@ generate-slo-client: tools ## generate Kibana slo client
 		-o /local/generated/slo \
 		 --type-mappings=float32=float64
 	@ rm -rf generated/slo/go.mod generated/slo/go.sum generated/slo/test
-	@ go fmt ./generated/...
+	@ go fmt ./generated/slo/...
 
 .PHONY: generate-clients
 generate-clients: generate-alerting-client generate-slo-client generate-connectors-client ## generate all clients

docs/data-sources/elasticsearch_enrich_policy.md

@@ -1,13 +1,15 @@
+
 ---
-subcategory: "Enrich"
+# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "elasticstack_elasticsearch_enrich_policy Data Source - terraform-provider-elasticstack"
+subcategory: "Enrich"
 description: |-
-  Returns information about an enrich policy. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html
+  Returns information about an enrich policy. See the enrich policy API documentation https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html for more details.
 ---
 
-# Data Source: elasticstack_elasticsearch_enrich_policy
+# elasticstack_elasticsearch_enrich_policy (Data Source)
 
-Returns information about an enrich policy. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html
+Returns information about an enrich policy. See the [enrich policy API documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html) for more details.
 
 ## Example Usage
 

docs/data-sources/elasticsearch_index_template.md

@@ -1,14 +1,15 @@
+
 ---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "elasticstack_elasticsearch_index_template Data Source - terraform-provider-elasticstack"
 subcategory: "Index"
-layout: ""
-page_title: "Elasticstack: elasticstack_elasticsearch_index_template Data Source"
 description: |-
-  Retrieves index template.
+  Retrieves information about an existing index template definition. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-template.html
 ---
 
-# Data Source: elasticstack_elasticsearch_index_template
+# elasticstack_elasticsearch_index_template (Data Source)
 
-Use this data source to retrieve information about existing Elasticsearch index templates. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-template.html
+Retrieves information about an existing index template definition. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-template.html
 
 ## Example Usage
 

docs/data-sources/elasticsearch_indices.md

@@ -1,14 +1,15 @@
+
 ---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "elasticstack_elasticsearch_indices Data Source - terraform-provider-elasticstack"
 subcategory: "Index"
-layout: ""
-page_title: "Elasticstack: elasticstack_elasticsearch_indices Data Source"
 description: |-
-  Retrieves indices.
+  Retrieves information about existing Elasticsearch indices. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-index.html
 ---
 
-# Data Source: elasticstack_elasticsearch_indices
+# elasticstack_elasticsearch_indices (Data Source)
 
-Use this data source to retrieve and get information about existing Elasticsearch indices. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-index.html
+Retrieves information about existing Elasticsearch indices. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-index.html
 
 ## Example Usage
 

docs/data-sources/elasticsearch_info.md

@@ -1,14 +1,15 @@
+
 ---
-subcategory: "Cluster"
-layout: ""
-page_title: "Elasticstack: elasticstack_elasticsearch_info Data Source"
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "elasticstack_elasticsearch_info Data Source - terraform-provider-elasticstack"
+subcategory: "Elasticsearch"
 description: |-
-  Gets information about the Elasticsearch cluster.
+  Gets information about the Elastic cluster.
 ---
 
-# Data Source: elasticstack_elasticsearch_info
+# elasticstack_elasticsearch_info (Data Source)
 
-This data source provides the information about the configured Elasticsearch cluster
+Gets information about the Elastic cluster.
 
 ## Example Usage