Merge branch 'main' of github.com:togish/terraform-provider-elasticstack into indextemplate-component-ignore-missing

Author: togish

CHANGELOG.md

@@ -1,6 +1,9 @@
 ## [Unreleased]
 
 - Add support for `timeslice_metric_indicator` in `elasticstack_kibana_slo` ([#1195](https://github.com/elastic/terraform-provider-elasticstack/pull/1195))
+- Add `elasticstack_elasticsearch_ingest_processor_reroute` data source ([#678](https://github.com/elastic/terraform-provider-elasticstack/issues/678))
+- Add support for `supports_agentless` to `elasticstack_fleet_agent_policy` ([#1197](https://github.com/elastic/terraform-provider-elasticstack/pull/1197))
+- Ignore `master_timeout` when targeting Serverless projects ([#1207](https://github.com/elastic/terraform-provider-elasticstack/pull/1207))
 - Add `ignore_missing_component_templates` to `elasticstack_elasticsearch_index_template` ([#1206](https://github.com/elastic/terraform-provider-elasticstack/pull/1206))
 
 ## [0.11.16] - 2025-07-09

docs/data-sources/elasticsearch_ingest_processor_reroute.md

@@ -0,0 +1,55 @@
+---
+subcategory: "Ingest"
+layout: ""
+page_title: "Elasticstack: elasticstack_elasticsearch_ingest_processor_reroute Data Source"
+description: |-
+  Helper data source to create a processor which reroutes a document to a different data stream, index, or index alias.
+---
+
+# Data Source: elasticstack_elasticsearch_ingest_processor_reroute
+
+Reroutes a document to a different data stream, index, or index alias. This processor is useful for routing documents based on data stream routing rules.
+
+See: https://www.elastic.co/guide/en/elasticsearch/reference/current/reroute-processor.html
+
+
+## Example Usage
+
+```terraform
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+data "elasticstack_elasticsearch_ingest_processor_reroute" "reroute" {
+  destination = "logs-generic-default"
+  dataset     = "generic"
+  namespace   = "default"
+}
+
+resource "elasticstack_elasticsearch_ingest_pipeline" "my_ingest_pipeline" {
+  name = "reroute-ingest"
+
+  processors = [
+    data.elasticstack_elasticsearch_ingest_processor_reroute.reroute.json
+  ]
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `dataset` (String) The destination dataset to route the document to.
+- `description` (String) Description of the processor.
+- `destination` (String) The destination data stream, index, or index alias to route the document to.
+- `if` (String) Conditionally execute the processor
+- `ignore_failure` (Boolean) Ignore failures for the processor.
+- `namespace` (String) The destination namespace to route the document to.
+- `on_failure` (List of String) Handle failures for the processor.
+- `tag` (String) Identifier for the processor.
+
+### Read-Only
+
+- `id` (String) Internal identifier of the resource.
+- `json` (String) JSON representation of this data source.

docs/resources/fleet_agent_policy.md

@@ -56,6 +56,7 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
 - `monitoring_output_id` (String) The identifier for monitoring output.
 - `policy_id` (String) Unique identifier of the agent policy.
 - `skip_destroy` (Boolean) Set to true if you do not wish the agent policy to be deleted at destroy time, and instead just remove the agent policy from the Terraform state.
+- `supports_agentless` (Boolean) Set to true to enable agentless data collection.
 - `sys_monitoring` (Boolean) Enable collection of system logs and metrics.
 
 ### Read-Only

examples/data-sources/elasticstack_elasticsearch_ingest_processor_reroute/data-source.tf

@@ -0,0 +1,17 @@
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+data "elasticstack_elasticsearch_ingest_processor_reroute" "reroute" {
+  destination = "logs-generic-default"
+  dataset     = "generic"
+  namespace   = "default"
+}
+
+resource "elasticstack_elasticsearch_ingest_pipeline" "my_ingest_pipeline" {
+  name = "reroute-ingest"
+
+  processors = [
+    data.elasticstack_elasticsearch_ingest_processor_reroute.reroute.json
+  ]
+}

internal/clients/api_client.go

@@ -33,6 +33,8 @@ type CompositeId struct {
 	ResourceId string
 }
 
+const ServerlessFlavor = "serverless"
+
 func CompositeIdFromStr(id string) (*CompositeId, diag.Diagnostics) {
 	var diags diag.Diagnostics
 	idParts := strings.Split(id, "/")
@@ -352,6 +354,24 @@ func (a *ApiClient) serverInfo(ctx context.Context) (*models.ClusterInfo, diag.D
 	return &info, diags
 }
 
+func (a *ApiClient) EnforceMinVersion(ctx context.Context, minVersion *version.Version) (bool, diag.Diagnostics) {
+	flavor, diags := a.ServerFlavor(ctx)
+	if diags.HasError() {
+		return false, diags
+	}
+
+	if flavor == ServerlessFlavor {
+		return true, nil
+	}
+
+	serverVersion, diags := a.ServerVersion(ctx)
+	if diags.HasError() {
+		return false, diags
+	}
+
+	return serverVersion.GreaterThanOrEqual(minVersion), nil
+}
+
 func (a *ApiClient) ServerVersion(ctx context.Context) (*version.Version, diag.Diagnostics) {
 	if a.elasticsearch != nil {
 		return a.versionFromElasticsearch(ctx)

internal/elasticsearch/index/index/models.go

@@ -286,11 +286,11 @@ func (model tfModel) toPutIndexParams(serverFlavor string) models.PutIndexParams
 	timeout, _ := model.Timeout.Parse()
 
 	params := models.PutIndexParams{
-		MasterTimeout: masterTimeout,
-		Timeout:       timeout,
+		Timeout: timeout,
 	}
 
-	if serverFlavor != "serverless" {
+	if serverFlavor != clients.ServerlessFlavor {
+		params.MasterTimeout = masterTimeout
 		params.WaitForActiveShards = model.WaitForActiveShards.ValueString()
 	}
 

internal/elasticsearch/index/index/models_test.go

@@ -7,6 +7,7 @@ import (
 
 	fuzz "github.com/google/gofuzz"
 
+	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/models"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils/customtypes"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
@@ -363,8 +364,9 @@ func Test_tfModel_toPutIndexParams(t *testing.T) {
 
 			flavor := "not_serverless"
 			if isServerless {
-				flavor = "serverless"
+				flavor = clients.ServerlessFlavor
 				expectedParams.WaitForActiveShards = ""
+				expectedParams.MasterTimeout = 0
 			}
 
 			params := model.toPutIndexParams(flavor)

internal/elasticsearch/ingest/processor_reroute_data_source.go

@@ -0,0 +1,139 @@
+package ingest
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+
+	"github.com/elastic/terraform-provider-elasticstack/internal/models"
+	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func DataSourceProcessorReroute() *schema.Resource {
+	processorSchema := map[string]*schema.Schema{
+		"id": {
+			Description: "Internal identifier of the resource.",
+			Type:        schema.TypeString,
+			Computed:    true,
+		},
+		"destination": {
+			Description: "The destination data stream, index, or index alias to route the document to.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"dataset": {
+			Description: "The destination dataset to route the document to.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"namespace": {
+			Description: "The destination namespace to route the document to.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"description": {
+			Description: "Description of the processor. ",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"if": {
+			Description: "Conditionally execute the processor",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"ignore_failure": {
+			Description: "Ignore failures for the processor. ",
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+		},
+		"on_failure": {
+			Description: "Handle failures for the processor.",
+			Type:        schema.TypeList,
+			Optional:    true,
+			MinItems:    1,
+			Elem: &schema.Schema{
+				Type:             schema.TypeString,
+				ValidateFunc:     validation.StringIsJSON,
+				DiffSuppressFunc: utils.DiffJsonSuppress,
+			},
+		},
+		"tag": {
+			Description: "Identifier for the processor.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"json": {
+			Description: "JSON representation of this data source.",
+			Type:        schema.TypeString,
+			Computed:    true,
+		},
+	}
+
+	return &schema.Resource{
+		Description: "Reroutes a document to a different data stream, index, or index alias. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/reroute-processor.html",
+
+		ReadContext: dataSourceProcessorRerouteRead,
+
+		Schema: processorSchema,
+	}
+}
+
+func dataSourceProcessorRerouteRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+
+	processor := &models.ProcessorReroute{}
+
+	processor.IgnoreFailure = d.Get("ignore_failure").(bool)
+
+	if v, ok := d.GetOk("destination"); ok {
+		processor.Destination = v.(string)
+	}
+	if v, ok := d.GetOk("dataset"); ok {
+		processor.Dataset = v.(string)
+	}
+	if v, ok := d.GetOk("namespace"); ok {
+		processor.Namespace = v.(string)
+	}
+
+	if v, ok := d.GetOk("description"); ok {
+		processor.Description = v.(string)
+	}
+	if v, ok := d.GetOk("if"); ok {
+		processor.If = v.(string)
+	}
+	if v, ok := d.GetOk("tag"); ok {
+		processor.Tag = v.(string)
+	}
+	if v, ok := d.GetOk("on_failure"); ok {
+		onFailure := make([]map[string]interface{}, len(v.([]interface{})))
+		for i, f := range v.([]interface{}) {
+			item := make(map[string]interface{})
+			if err := json.NewDecoder(strings.NewReader(f.(string))).Decode(&item); err != nil {
+				return diag.FromErr(err)
+			}
+			onFailure[i] = item
+		}
+		processor.OnFailure = onFailure
+	}
+
+	processorJson, err := json.MarshalIndent(map[string]*models.ProcessorReroute{"reroute": processor}, "", " ")
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if err := d.Set("json", string(processorJson)); err != nil {
+		return diag.FromErr(err)
+	}
+
+	hash, err := utils.StringToHash(string(processorJson))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(*hash)
+
+	return diags
+}

internal/elasticsearch/ingest/processor_reroute_data_source_test.go

@@ -0,0 +1,40 @@
+package ingest_test
+
+import (
+	"testing"
+
+	"github.com/elastic/terraform-provider-elasticstack/internal/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccDataSourceIngestProcessorReroute(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: acctest.Providers,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceIngestProcessorReroute,
+				Check: resource.ComposeTestCheckFunc(
+					CheckResourceJson("data.elasticstack_elasticsearch_ingest_processor_reroute.test", "json", expectedJsonReroute),
+				),
+			},
+		},
+	})
+}
+
+const expectedJsonReroute = `{
+	"reroute": {
+		"ignore_failure": false,
+		"destination": "logs-generic-default"
+	}
+}`
+
+const testAccDataSourceIngestProcessorReroute = `
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+data "elasticstack_elasticsearch_ingest_processor_reroute" "test" {
+  destination = "logs-generic-default"
+}
+`