Complete alias resource implementation with linting and documentation

Co-authored-by: tobio <444668+tobio@users.noreply.github.com>

Author: Copilot

docs/resources/elasticsearch_alias.md

@@ -0,0 +1,35 @@
+
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "elasticstack_elasticsearch_alias Resource - terraform-provider-elasticstack"
+subcategory: "Elasticsearch"
+description: |-
+  Manages an Elasticsearch alias. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
+---
+
+# elasticstack_elasticsearch_alias (Resource)
+
+Manages an Elasticsearch alias. See, https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `indices` (Set of String) A set of indices to which the alias should point.
+- `name` (String) The alias name.
+
+### 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. If specified, this overwrites the `routing` value for indexing operations.
+- `is_hidden` (Boolean) If true, the alias is hidden.
+- `is_write_index` (Boolean) If true, the index is the write index for the alias.
+- `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. If specified, this overwrites the routing value for search operations.
+
+### Read-Only
+
+- `id` (String) Generated ID of the alias resource.

internal/clients/elasticsearch/index.go

@@ -640,7 +640,7 @@ func PutAlias(ctx context.Context, apiClient *clients.ApiClient, aliasName strin
 
 		// Only include non-empty optional fields in the add action
 		addActionDetails := addAction["add"].(map[string]interface{})
-		
+
 		if alias.Filter != nil {
 			addActionDetails["filter"] = alias.Filter
 		}

internal/elasticsearch/index/alias/acc_test.go

@@ -19,7 +19,7 @@ func TestAccResourceAlias(t *testing.T) {
 	indexName2 := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlpha)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() { 
+		PreCheck: func() {
 			acctest.PreCheck(t)
 			// Create indices directly via curl to avoid terraform index resource conflicts
 			createTestIndex(t, indexName)
@@ -154,114 +154,6 @@ resource "elasticstack_elasticsearch_alias" "test_alias" {
 	`, aliasName, indexName)
 }
 
-func testAccResourceAliasCreate(aliasName, indexName string) string {
-	return fmt.Sprintf(`
-provider "elasticstack" {
-  elasticsearch {}
-}
-
-# Create index with mappings to avoid alias management
-resource "elasticstack_elasticsearch_index" "test_index" {
-  name                = "%s"
-  deletion_protection = false
-  
-  mappings = jsonencode({
-    properties = {
-      title = {
-        type = "text"
-      }
-    }
-  })
-}
-
-resource "elasticstack_elasticsearch_alias" "test_alias" {
-  name    = "%s"
-  indices = [elasticstack_elasticsearch_index.test_index.name]
-  
-  depends_on = [elasticstack_elasticsearch_index.test_index]
-}
-	`, indexName, aliasName)
-}
-
-func testAccResourceAliasUpdate(aliasName, indexName, indexName2 string) string {
-	return fmt.Sprintf(`
-provider "elasticstack" {
-  elasticsearch {}
-}
-
-resource "elasticstack_elasticsearch_index" "test_index" {
-  name                = "%s"
-  deletion_protection = false
-  
-  mappings = jsonencode({
-    properties = {
-      title = {
-        type = "text"
-      }
-    }
-  })
-}
-
-resource "elasticstack_elasticsearch_index" "test_index2" {
-  name                = "%s"
-  deletion_protection = false
-  
-  mappings = jsonencode({
-    properties = {
-      title = {
-        type = "text"
-      }
-    }
-  })
-}
-
-resource "elasticstack_elasticsearch_alias" "test_alias" {
-  name          = "%s"
-  indices       = [elasticstack_elasticsearch_index.test_index.name, elasticstack_elasticsearch_index.test_index2.name]
-  is_write_index = true
-  routing        = "test-routing"
-  
-  depends_on = [elasticstack_elasticsearch_index.test_index, elasticstack_elasticsearch_index.test_index2]
-}
-	`, indexName, indexName2, aliasName)
-}
-
-func testAccResourceAliasWithFilter(aliasName, indexName string) string {
-	return fmt.Sprintf(`
-provider "elasticstack" {
-  elasticsearch {}
-}
-
-resource "elasticstack_elasticsearch_index" "test_index" {
-  name                = "%s"
-  deletion_protection = false
-  
-  mappings = jsonencode({
-    properties = {
-      title = {
-        type = "text"
-      }
-      status = {
-        type = "keyword"
-      }
-    }
-  })
-}
-
-resource "elasticstack_elasticsearch_alias" "test_alias" {
-  name    = "%s"
-  indices = [elasticstack_elasticsearch_index.test_index.name]
-  filter  = jsonencode({
-    term = {
-      status = "published"
-    }
-  })
-  
-  depends_on = [elasticstack_elasticsearch_index.test_index]
-}
-	`, indexName, aliasName)
-}
-
 func testAccResourceAliasDataStreamCreate(aliasName, dsName string) string {
 	return fmt.Sprintf(`
 provider "elasticstack" {
@@ -298,7 +190,7 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		if rs.Type != "elasticstack_elasticsearch_alias" {
 			continue
 		}
-		
+
 		// Handle the case where ID might not be in the expected format
 		aliasName := rs.Primary.ID
 		if compId, err := clients.CompositeIdFromStr(rs.Primary.ID); err == nil {
@@ -309,7 +201,7 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		
+
 		res, err := esClient.Indices.GetAlias(
 			esClient.Indices.GetAlias.WithName(aliasName),
 		)
@@ -323,4 +215,4 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		}
 	}
 	return nil
-}
+}

internal/elasticsearch/index/alias/create.go

@@ -42,60 +42,13 @@ func (r *aliasResource) Create(ctx context.Context, req resource.CreateRequest,
 	resp.Diagnostics.Append(resp.State.Set(ctx, finalModel)...)
 }
 
-func readAlias(ctx context.Context, client *clients.ApiClient, aliasName string) (*tfModel, diag.Diagnostics) {
-	indices, diags := elasticsearch.GetAlias(ctx, client, aliasName)
-	if diags.HasError() {
-		return nil, diags
-	}
-
-	if indices == nil || len(indices) == 0 {
-		return nil, diag.Diagnostics{
-			diag.NewErrorDiagnostic(
-				"Alias not found after creation",
-				"The alias was not found after creation, which indicates an error in the Elasticsearch API response.",
-			),
-		}
-	}
-
-	// Extract indices and alias data from the response
-	var indexNames []string
-	var aliasData *models.IndexAlias
-	
-	for indexName, index := range indices {
-		if alias, exists := index.Aliases[aliasName]; exists {
-			indexNames = append(indexNames, indexName)
-			if aliasData == nil {
-				// Use the first alias definition we find (they should all be the same)
-				aliasData = &alias
-			}
-		}
-	}
-
-	if aliasData == nil {
-		return nil, diag.Diagnostics{
-			diag.NewErrorDiagnostic(
-				"Alias data not found after creation",
-				"The alias data was not found after creation, which indicates an error in the Elasticsearch API response.",
-			),
-		}
-	}
-
-	finalModel := &tfModel{}
-	diags = finalModel.populateFromAPI(ctx, aliasName, *aliasData, indexNames)
-	if diags.HasError() {
-		return nil, diags
-	}
-
-	return finalModel, nil
-}
-
 func readAliasWithPlan(ctx context.Context, client *clients.ApiClient, aliasName string, planModel *tfModel) (*tfModel, diag.Diagnostics) {
 	indices, diags := elasticsearch.GetAlias(ctx, client, aliasName)
 	if diags.HasError() {
 		return nil, diags
 	}
 
-	if indices == nil || len(indices) == 0 {
+	if len(indices) == 0 {
 		return nil, diag.Diagnostics{
 			diag.NewErrorDiagnostic(
 				"Alias not found after creation",
@@ -107,7 +60,7 @@ func readAliasWithPlan(ctx context.Context, client *clients.ApiClient, aliasName
 	// Extract indices and alias data from the response
 	var indexNames []string
 	var aliasData *models.IndexAlias
-	
+
 	for indexName, index := range indices {
 		if alias, exists := index.Aliases[aliasName]; exists {
 			indexNames = append(indexNames, indexName)
@@ -134,4 +87,4 @@ func readAliasWithPlan(ctx context.Context, client *clients.ApiClient, aliasName
 	}
 
 	return finalModel, nil
-}
+}

internal/elasticsearch/index/alias/delete.go

@@ -16,7 +16,7 @@ func (r *aliasResource) Delete(ctx context.Context, req resource.DeleteRequest,
 	}
 
 	aliasName := stateModel.Name.ValueString()
-	
+
 	// Get the current indices from state
 	var indices []string
 	resp.Diagnostics.Append(stateModel.Indices.ElementsAs(ctx, &indices, false)...)
@@ -29,4 +29,4 @@ func (r *aliasResource) Delete(ctx context.Context, req resource.DeleteRequest,
 	if resp.Diagnostics.HasError() {
 		return
 	}
-}
+}

internal/elasticsearch/index/alias/models.go

@@ -39,16 +39,16 @@ func (model *tfModel) populateFromAPI(ctx context.Context, aliasName string, ali
 	} else {
 		model.IndexRouting = types.StringNull()
 	}
-	
+
 	model.IsHidden = types.BoolValue(aliasData.IsHidden)
 	model.IsWriteIndex = types.BoolValue(aliasData.IsWriteIndex)
-	
+
 	if aliasData.Routing != "" {
 		model.Routing = types.StringValue(aliasData.Routing)
 	} else {
 		model.Routing = types.StringNull()
 	}
-	
+
 	if aliasData.SearchRouting != "" {
 		model.SearchRouting = types.StringValue(aliasData.SearchRouting)
 	} else {
@@ -93,4 +93,4 @@ func (model *tfModel) toAPIModel() (models.IndexAlias, []string, diag.Diagnostic
 	}
 
 	return apiModel, indices, nil
-}
+}

internal/elasticsearch/index/alias/read.go

@@ -26,15 +26,15 @@ func (r *aliasResource) Read(ctx context.Context, req resource.ReadRequest, resp
 	}
 
 	// If no indices returned, the alias doesn't exist
-	if indices == nil || len(indices) == 0 {
+	if len(indices) == 0 {
 		resp.State.RemoveResource(ctx)
 		return
 	}
 
 	// Extract indices and alias data from the response
 	var indexNames []string
 	var aliasData *models.IndexAlias
-	
+
 	for indexName, index := range indices {
 		if alias, exists := index.Aliases[aliasName]; exists {
 			indexNames = append(indexNames, indexName)
@@ -57,4 +57,4 @@ func (r *aliasResource) Read(ctx context.Context, req resource.ReadRequest, resp
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, stateModel)...)
-}
+}

internal/elasticsearch/index/alias/resource.go

@@ -23,4 +23,4 @@ func (r *aliasResource) Configure(_ context.Context, req resource.ConfigureReque
 	client, diags := clients.ConvertProviderData(req.ProviderData)
 	resp.Diagnostics.Append(diags...)
 	r.client = client
-}
+}

internal/elasticsearch/index/alias/schema.go

@@ -72,4 +72,4 @@ func (r *aliasResource) Schema(ctx context.Context, req resource.SchemaRequest,
 			},
 		},
 	}
-}
+}

internal/elasticsearch/index/alias/update.go

@@ -22,7 +22,7 @@ func (r *aliasResource) Update(ctx context.Context, req resource.UpdateRequest,
 	}
 
 	aliasName := planModel.Name.ValueString()
-	
+
 	// Get the current indices from state for removal
 	var currentIndices []string
 	resp.Diagnostics.Append(stateModel.Indices.ElementsAs(ctx, &currentIndices, false)...)
@@ -59,4 +59,4 @@ func (r *aliasResource) Update(ctx context.Context, req resource.UpdateRequest,
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, finalModel)...)
-}
+}