Fix null value handling and data stream alias test passing

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

Author: Copilot

internal/elasticsearch/index/alias/acc_test.go

@@ -80,40 +80,96 @@ func TestAccResourceAliasDataStream(t *testing.T) {
 
 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"
+  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"
+  name                = "%s"
+  deletion_protection = false
+  
+  mappings = jsonencode({
+    properties = {
+      title = {
+        type = "text"
+      }
+    }
+  })
 }
 
 resource "elasticstack_elasticsearch_index" "test_index2" {
-  name = "%s"
+  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"
+  name                = "%s"
+  deletion_protection = false
+  
+  mappings = jsonencode({
+    properties = {
+      title = {
+        type = "text"
+      }
+      status = {
+        type = "keyword"
+      }
+    }
+  })
 }
 
 resource "elasticstack_elasticsearch_alias" "test_alias" {
@@ -124,12 +180,18 @@ resource "elasticstack_elasticsearch_alias" "test_alias" {
       status = "published"
     }
   })
+  
+  depends_on = [elasticstack_elasticsearch_index.test_index]
 }
 	`, indexName, aliasName)
 }
 
 func testAccResourceAliasDataStreamCreate(aliasName, dsName string) string {
 	return fmt.Sprintf(`
+provider "elasticstack" {
+  elasticsearch {}
+}
+
 resource "elasticstack_elasticsearch_index_template" "test_ds_template" {
   name           = "%s"
   index_patterns = ["%s"]
@@ -160,22 +222,28 @@ func checkResourceAliasDestroy(s *terraform.State) error {
 		if rs.Type != "elasticstack_elasticsearch_alias" {
 			continue
 		}
-		compId, _ := clients.CompositeIdFromStr(rs.Primary.ID)
+		
+		// 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 {
+			aliasName = compId.ResourceId
+		}
 
 		esClient, err := client.GetESClient()
 		if err != nil {
 			return err
 		}
 
 		res, err := esClient.Indices.GetAlias(
-			esClient.Indices.GetAlias.WithName(compId.ResourceId),
+			esClient.Indices.GetAlias.WithName(aliasName),
 		)
 		if err != nil {
 			return err
 		}
+		defer res.Body.Close()
 
 		if res.StatusCode != 404 {
-			return fmt.Errorf("Alias (%s) still exists", compId.ResourceId)
+			return fmt.Errorf("Alias (%s) still exists", aliasName)
 		}
 	}
 	return nil

internal/elasticsearch/index/alias/models.go

@@ -33,11 +33,27 @@ func (model *tfModel) populateFromAPI(ctx context.Context, aliasName string, ali
 	}
 	model.Indices = indicesSet
 
-	model.IndexRouting = types.StringValue(aliasData.IndexRouting)
+	// Only set string values if they are not empty
+	if aliasData.IndexRouting != "" {
+		model.IndexRouting = types.StringValue(aliasData.IndexRouting)
+	} else {
+		model.IndexRouting = types.StringNull()
+	}
+	
 	model.IsHidden = types.BoolValue(aliasData.IsHidden)
 	model.IsWriteIndex = types.BoolValue(aliasData.IsWriteIndex)
-	model.Routing = types.StringValue(aliasData.Routing)
-	model.SearchRouting = types.StringValue(aliasData.SearchRouting)
+	
+	if aliasData.Routing != "" {
+		model.Routing = types.StringValue(aliasData.Routing)
+	} else {
+		model.Routing = types.StringNull()
+	}
+	
+	if aliasData.SearchRouting != "" {
+		model.SearchRouting = types.StringValue(aliasData.SearchRouting)
+	} else {
+		model.SearchRouting = types.StringNull()
+	}
 
 	if aliasData.Filter != nil {
 		filterBytes, err := json.Marshal(aliasData.Filter)
@@ -47,6 +63,8 @@ func (model *tfModel) populateFromAPI(ctx context.Context, aliasName string, ali
 			}
 		}
 		model.Filter = jsontypes.NewNormalizedValue(string(filterBytes))
+	} else {
+		model.Filter = jsontypes.NewNormalizedNull()
 	}
 
 	return nil