Merge branch 'main' of github.com:elastic/terraform-provider-elasticstack into add_security_exception_list

Author: nick-benoit

.env

@@ -15,3 +15,4 @@ FLEET_CONTAINER_NAME=terraform-elasticstack-fleet
 ACCEPTANCE_TESTS_CONTAINER_NAME=terraform-elasticstack-acceptance-tests
 TOKEN_ACCEPTANCE_TESTS_CONTAINER_NAME=terraform-elasticstack-token-acceptance-tests
 GOVERSION=1.25.1
+TF_ELASTICSTACK_INCLUDE_EXPERIMENTAL=true

.github/copilot-instructions.md

@@ -1,6 +1,6 @@
 You will be writing or reviewing code for the Terraform provider for Elastic Stack (Elasticsearch, Kibana, Fleet, APM, and Logstash). This is a Go-based repository hosting the provider source. 
 
-When writing code, you must adhere to the coding standards and conventions outlined in the [CODING_STANDARDS.md](../CODING_STANDARDS.md) document in this repository.
+When writing code, you must adhere to the coding standards and conventions outlined in the [CODING_STANDARDS.md](../CODING_STANDARDS.md) document in this repository. After completing any code changes check again that they conform to the [CODING_STANDARDS.md](../CODING_STANDARDS.md).
 
 When reviewing code, ensure that all changes comply with the coding standards and conventions specified in the [CODING_STANDARDS.md](../CODING_STANDARDS.md) document. Pay special attention to project structure, schema definitions, JSON handling, resource implementation, and testing practices.
 

.github/workflows/test.yml

@@ -55,6 +55,7 @@ jobs:
       ELASTIC_PASSWORD: password
       KIBANA_SYSTEM_USERNAME: kibana_system
       KIBANA_SYSTEM_PASSWORD: password
+      TF_ELASTICSTACK_INCLUDE_EXPERIMENTAL: true
     services:
       elasticsearch:
         image: docker.elastic.co/elasticsearch/elasticsearch:${{ matrix.version }}

.goreleaser.yml

@@ -31,7 +31,7 @@ builds:
       goarch: '386'
   binary: '{{ .ProjectName }}_v{{ .Version }}'
 archives:
-- format: zip
+- formats: zip
   name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
 checksum:
   name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'

CHANGELOG.md

@@ -1,7 +1,48 @@
 ## [Unreleased]
 
+### Breaking changes
+
+#### `elasticstack_elasticsearch_index.alias` block has changed to a set attribute. 
+
+The `alias` block in the `elasticstack_elasticsearch_index` resource has been moved to an attribute. 
+This transition provides better support for future changes in both the provider and the underlying Terraform framework. 
+
+Existing usage of the `alias` block must be migrated to the attribute syntax. For example:
+
+```hcl
+alias {
+  name = "my_alias_1"
+}
+
+alias {
+  name = "my_alias_2"
+  filter = jsonencode({
+    term = { "user.id" = "developer" }
+  })
+}
+```
+
+becomes 
+
+```hcl
+alias = [
+  {
+    name = "my_alias_1"
+  },
+  {
+    name = "my_alias_2"
+    filter = jsonencode({
+      term = { "user.id" = "developer" }
+    })
+  }
+]
+```
+
+### Changes
+
 - Support `.bedrock` and `.gen-ai` connectors ([#1467](https://github.com/elastic/terraform-provider-elasticstack/pull/1467))
 - Support the `solution` attribute in `elasticstack_kibana_space` from 8.16 ([#1486](https://github.com/elastic/terraform-provider-elasticstack/pull/1486)) 
+- Add `elasticstack_elasticsearch_alias` resource ([#1343](https://github.com/elastic/terraform-provider-elasticstack/pull/1343))
 
 ## [0.12.2] - 2025-11-19
 - Fix `elasticstack_elasticsearch_snapshot_lifecycle` metadata type conversion causing terraform apply to fail ([#1409](https://github.com/elastic/terraform-provider-elasticstack/issues/1409))

CODING_STANDARDS.md

@@ -36,6 +36,7 @@ This document outlines the coding standards and conventions used in the terrafor
 - Prefer using existing util functions over longer form, duplicated code:
   - `utils.IsKnown(val)` instead of `!val.IsNull() && !val.IsUnknown()`
   - `utils.ListTypeAs` instead of `val.ElementsAs` or similar for other collection types
+- The final state for a resource should be derived from a read request following a mutative request (eg create or update). We should not use the response from a mutative request to build the final resource state.
 
 ## Schema Definitions
 

docker-compose.yml

@@ -134,7 +134,8 @@ services:
       ELASTICSEARCH_USERNAME: elastic
       ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASSWORD}
       TF_LOG: ${TF_LOG:-info}
-    command: make testacc TESTARGS=${TESTARGS:-}
+      TF_ELASTICSTACK_INCLUDE_EXPERIMENTAL: "true"
+    command: make testacc TESTARGS='${TESTARGS:-}'
 
   token-acceptance-tests:
     profiles: ["token-acceptance-tests"]

docs/resources/elasticsearch_index.md

@@ -20,16 +20,14 @@ provider "elasticstack" {
 resource "elasticstack_elasticsearch_index" "my_index" {
   name = "my-index"
 
-  alias {
+  alias = [{
     name = "my_alias_1"
-  }
-
-  alias {
+    }, {
     name = "my_alias_2"
     filter = jsonencode({
       term = { "user.id" = "developer" }
     })
-  }
+  }]
 
   mappings = jsonencode({
     properties = {
@@ -59,7 +57,7 @@ resource "elasticstack_elasticsearch_index" "my_index" {
 
 ### Optional
 
-- `alias` (Block Set) Aliases for the index. (see [below for nested schema](#nestedblock--alias))
+- `alias` (Attributes Set) Aliases for the index. (see [below for nested schema](#nestedatt--alias))
 - `analysis_analyzer` (String) A JSON string describing the analyzers applied to the index.
 - `analysis_char_filter` (String) A JSON string describing the char_filters applied to the index.
 - `analysis_filter` (String) A JSON string describing the filters applied to the index.
@@ -135,7 +133,7 @@ resource "elasticstack_elasticsearch_index" "my_index" {
 - `id` (String) Internal identifier of the resource
 - `settings_raw` (String) All raw settings fetched from the cluster.
 
-<a id="nestedblock--alias"></a>
+<a id="nestedatt--alias"></a>
 ### Nested Schema for `alias`
 
 Required:

docs/resources/elasticsearch_index_alias.md

@@ -0,0 +1,60 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "elasticstack_elasticsearch_index_alias Resource - terraform-provider-elasticstack"
+subcategory: "Index"
+description: |-
+  Manages an Elasticsearch alias. See the alias documentation https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html for more details.
+---
+
+# elasticstack_elasticsearch_index_alias (Resource)
+
+Manages an Elasticsearch alias. See the [alias documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html) for more details.
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String) The alias name.
+
+### Optional
+
+- `read_indices` (Attributes Set) Set of read indices for the alias. (see [below for nested schema](#nestedatt--read_indices))
+- `write_index` (Attributes) The write index for the alias. Only one write index is allowed per alias. (see [below for nested schema](#nestedatt--write_index))
+
+### Read-Only
+
+- `id` (String) Generated ID of the alias resource.
+
+<a id="nestedatt--read_indices"></a>
+### Nested Schema for `read_indices`
+
+Required:
+
+- `name` (String) Name of the read index.
+
+Optional:
+
+- `filter` (String) Query used to limit documents the alias can access.
+- `index_routing` (String) Value used to route indexing operations to a specific shard.
+- `is_hidden` (Boolean) If true, the alias is hidden.
+- `routing` (String) Value used to route indexing and search operations to a specific shard.
+- `search_routing` (String) Value used to route search operations to a specific shard.
+
+
+<a id="nestedatt--write_index"></a>
+### Nested Schema for `write_index`
+
+Required:
+
+- `name` (String) Name of the write index.
+
+Optional:
+
+- `filter` (String) Query used to limit documents the alias can access.
+- `index_routing` (String) Value used to route indexing operations to a specific shard.
+- `is_hidden` (Boolean) If true, the alias is hidden.
+- `routing` (String) Value used to route indexing and search operations to a specific shard.
+- `search_routing` (String) Value used to route search operations to a specific shard.

examples/resources/elasticstack_elasticsearch_index/resource.tf

@@ -5,16 +5,14 @@ provider "elasticstack" {
 resource "elasticstack_elasticsearch_index" "my_index" {
   name = "my-index"
 
-  alias {
+  alias = [{
     name = "my_alias_1"
-  }
-
-  alias {
+    }, {
     name = "my_alias_2"
     filter = jsonencode({
       term = { "user.id" = "developer" }
     })
-  }
+  }]
 
   mappings = jsonencode({
     properties = {