Final fixes: correct test configurations and linting cleanup

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

Author: Copilot

docs/resources/elasticsearch_alias.md

@@ -18,18 +18,44 @@ Manages an Elasticsearch alias. See, https://www.elastic.co/guide/en/elasticsear
 
 ### Required
 
-- `indices` (Set of String) A set of indices to which the alias should point.
 - `name` (String) The alias name.
 
 ### Optional
 
+- `read_indices` (Block Set) Set of read indices for the alias. (see [below for nested schema](#nestedblock--read_indices))
+- `write_index` (Block, Optional) The write index for the alias. Only one write index is allowed per alias. (see [below for nested schema](#nestedblock--write_index))
+
+### Read-Only
+
+- `id` (String) Generated ID of the alias resource.
+
+<a id="nestedblock--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. If specified, this overwrites the `routing` value for indexing operations.
+- `index_routing` (String) Value used to route indexing operations to a specific shard.
 - `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.
+- `search_routing` (String) Value used to route search operations to a specific shard.
 
-### Read-Only
 
-- `id` (String) Generated ID of the alias resource.
+<a id="nestedblock--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.

internal/clients/elasticsearch/index.go

@@ -756,14 +756,15 @@ func UpdateAliasesAtomic(ctx context.Context, apiClient *clients.ApiClient, acti
 	var aliasActions []map[string]interface{}
 
 	for _, action := range actions {
-		if action.Type == "remove" {
+		switch action.Type {
+		case "remove":
 			aliasActions = append(aliasActions, map[string]interface{}{
 				"remove": map[string]interface{}{
 					"index": action.Index,
 					"alias": action.Alias,
 				},
 			})
-		} else if action.Type == "add" {
+		case "add":
 			addDetails := map[string]interface{}{
 				"index": action.Index,
 				"alias": action.Alias,

internal/elasticsearch/index/alias/acc_test.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/acctest"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
+	"github.com/hashicorp/terraform-plugin-testing/config"
 	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	"github.com/hashicorp/terraform-plugin-testing/config"
 )
 
 func TestAccResourceAlias(t *testing.T) {
@@ -24,7 +24,7 @@ func TestAccResourceAlias(t *testing.T) {
 		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccResourceAliasCreate(),
+				Config: testAccResourceAliasCreate,
 				ConfigVariables: map[string]config.Variable{
 					"alias_name":  config.StringVariable(aliasName),
 					"index_name":  config.StringVariable(indexName),
@@ -38,7 +38,7 @@ func TestAccResourceAlias(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccResourceAliasUpdate(),
+				Config: testAccResourceAliasUpdate,
 				ConfigVariables: map[string]config.Variable{
 					"alias_name":  config.StringVariable(aliasName),
 					"index_name":  config.StringVariable(indexName),
@@ -51,7 +51,7 @@ func TestAccResourceAlias(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccResourceAliasWithFilter(),
+				Config: testAccResourceAliasWithFilter,
 				ConfigVariables: map[string]config.Variable{
 					"alias_name":  config.StringVariable(aliasName),
 					"index_name":  config.StringVariable(indexName),
@@ -70,7 +70,7 @@ func TestAccResourceAlias(t *testing.T) {
 }
 
 func TestAccResourceAliasWriteIndex(t *testing.T) {
-	// generate random names  
+	// generate random names
 	aliasName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlpha)
 	indexName1 := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlpha)
 	indexName2 := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlpha)
@@ -83,12 +83,12 @@ func TestAccResourceAliasWriteIndex(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Case 1: Single index with is_write_index=true
 			{
-				Config: testAccResourceAliasWriteIndexSingle(),
+				Config: testAccResourceAliasWriteIndexSingle,
 				ConfigVariables: map[string]config.Variable{
-					"alias_name":   config.StringVariable(aliasName),
-					"index_name1":  config.StringVariable(indexName1),
-					"index_name2":  config.StringVariable(indexName2),
-					"index_name3":  config.StringVariable(indexName3),
+					"alias_name":  config.StringVariable(aliasName),
+					"index_name1": config.StringVariable(indexName1),
+					"index_name2": config.StringVariable(indexName2),
+					"index_name3": config.StringVariable(indexName3),
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_alias.test_alias", "name", aliasName),
@@ -98,12 +98,12 @@ func TestAccResourceAliasWriteIndex(t *testing.T) {
 			},
 			// Case 2: Add new index with is_write_index=true, existing becomes read index
 			{
-				Config: testAccResourceAliasWriteIndexSwitch(),
+				Config: testAccResourceAliasWriteIndexSwitch,
 				ConfigVariables: map[string]config.Variable{
-					"alias_name":   config.StringVariable(aliasName),
-					"index_name1":  config.StringVariable(indexName1),
-					"index_name2":  config.StringVariable(indexName2),
-					"index_name3":  config.StringVariable(indexName3),
+					"alias_name":  config.StringVariable(aliasName),
+					"index_name1": config.StringVariable(indexName1),
+					"index_name2": config.StringVariable(indexName2),
+					"index_name3": config.StringVariable(indexName3),
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_alias.test_alias", "name", aliasName),
@@ -113,12 +113,12 @@ func TestAccResourceAliasWriteIndex(t *testing.T) {
 			},
 			// Case 3: Add third index as write index
 			{
-				Config: testAccResourceAliasWriteIndexTriple(),
+				Config: testAccResourceAliasWriteIndexTriple,
 				ConfigVariables: map[string]config.Variable{
-					"alias_name":   config.StringVariable(aliasName),
-					"index_name1":  config.StringVariable(indexName1),
-					"index_name2":  config.StringVariable(indexName2),
-					"index_name3":  config.StringVariable(indexName3),
+					"alias_name":  config.StringVariable(aliasName),
+					"index_name1": config.StringVariable(indexName1),
+					"index_name2": config.StringVariable(indexName2),
+					"index_name3": config.StringVariable(indexName3),
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_alias.test_alias", "name", aliasName),
@@ -128,12 +128,12 @@ func TestAccResourceAliasWriteIndex(t *testing.T) {
 			},
 			// Case 4: Remove initial index, keep two indices with one as write index
 			{
-				Config: testAccResourceAliasWriteIndexRemoveFirst(),
+				Config: testAccResourceAliasWriteIndexRemoveFirst,
 				ConfigVariables: map[string]config.Variable{
-					"alias_name":   config.StringVariable(aliasName),
-					"index_name1":  config.StringVariable(indexName1),
-					"index_name2":  config.StringVariable(indexName2),
-					"index_name3":  config.StringVariable(indexName3),
+					"alias_name":  config.StringVariable(aliasName),
+					"index_name1": config.StringVariable(indexName1),
+					"index_name2": config.StringVariable(indexName2),
+					"index_name3": config.StringVariable(indexName3),
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_alias.test_alias", "name", aliasName),
@@ -156,7 +156,7 @@ func TestAccResourceAliasDataStream(t *testing.T) {
 		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccResourceAliasDataStreamCreate(),
+				Config: testAccResourceAliasDataStreamCreate,
 				ConfigVariables: map[string]config.Variable{
 					"alias_name": config.StringVariable(aliasName),
 					"ds_name":    config.StringVariable(dsName),
@@ -469,7 +469,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 {
@@ -480,7 +480,7 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		
+
 		res, err := esClient.Indices.GetAlias(
 			esClient.Indices.GetAlias.WithName(aliasName),
 		)
@@ -494,4 +494,4 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		}
 	}
 	return nil
-}
+}

internal/elasticsearch/index/alias/create.go

@@ -65,4 +65,4 @@ func (r *aliasResource) Create(ctx context.Context, req resource.CreateRequest,
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, planModel)...)
-}
+}

internal/elasticsearch/index/alias/delete.go

@@ -41,4 +41,4 @@ func (r *aliasResource) Delete(ctx context.Context, req resource.DeleteRequest,
 			return
 		}
 	}
-}
+}

internal/elasticsearch/index/alias/models.go

@@ -224,4 +224,4 @@ func (readIndexModel) attrTypes() map[string]attr.Type {
 		"routing":        types.StringType,
 		"search_routing": types.StringType,
 	}
-}
+}

internal/elasticsearch/index/alias/read.go

@@ -70,4 +70,4 @@ func readAliasIntoModel(ctx context.Context, client *clients.ApiClient, aliasNam
 
 	// Update the model with API data
 	return model.populateFromAPI(ctx, aliasName, aliasData)
-}
+}

internal/elasticsearch/index/alias/update.go

@@ -94,4 +94,4 @@ func (r *aliasResource) Update(ctx context.Context, req resource.UpdateRequest,
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, planModel)...)
-}
+}