Fix tests

Author: tobio

Makefile

@@ -101,7 +101,7 @@ setup-kibana-fleet: ## Creates the agent and integration policies required to ru
 
 .PHONY: docker-clean
 docker-clean: ## Try to remove provisioned nodes and assigned network
-	@ docker compose -f $(COMPOSE_FILE) down 
+	@ docker compose -f $(COMPOSE_FILE) down -v
 
 .PHONY: copy-kibana-ca
 copy-kibana-ca: ## Copy Kibana CA certificate to local machine

internal/elasticsearch/ml/job_state/acc_test.go

@@ -1,20 +1,15 @@
 package job_state_test
 
 import (
-	"encoding/json"
 	"fmt"
-	"maps"
 	"regexp"
-	"slices"
 	"testing"
 
 	"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/stretchr/testify/require"
 )
 
 func TestAccResourceMLJobState(t *testing.T) {
@@ -134,44 +129,9 @@ func TestAccResourceMLJobState_timeouts(t *testing.T) {
 				ConfigVariables: config.Variables{
 					"job_id":     config.StringVariable(jobID),
 					"index_name": config.StringVariable(indexName),
-					"job_memory": config.StringVariable(GetMaxMLJobMemory(t)),
 				},
 				ExpectError: regexp.MustCompile("Operation timed out"),
 			},
 		},
 	})
 }
-
-func GetMaxMLJobMemory(t *testing.T) string {
-	client, err := clients.NewAcceptanceTestingClient()
-	require.NoError(t, err)
-
-	esClient, err := client.GetESClient()
-	require.NoError(t, err)
-
-	resp, err := esClient.ML.GetMemoryStats()
-	require.NoError(t, err)
-
-	defer resp.Body.Close()
-	type mlNode struct {
-		Memory struct {
-			ML struct {
-				MaxInBytes int64 `json:"max_in_bytes"`
-			} `json:"ml"`
-		} `json:"mem"`
-	}
-	var mlMemoryStats struct {
-		Nodes map[string]mlNode `json:"nodes"`
-	}
-
-	err = json.NewDecoder(resp.Body).Decode(&mlMemoryStats)
-	require.NoError(t, err)
-
-	nodes := slices.Collect(maps.Values(mlMemoryStats.Nodes))
-	nodeWithMaxMemory := slices.MaxFunc(nodes, func(a, b mlNode) int {
-		return int(b.Memory.ML.MaxInBytes - a.Memory.ML.MaxInBytes)
-	})
-
-	maxAvailableMemoryInMB := nodeWithMaxMemory.Memory.ML.MaxInBytes / (1024 * 1024)
-	return fmt.Sprintf("%dmb", maxAvailableMemoryInMB+50)
-}

internal/elasticsearch/ml/job_state/testdata/TestAccResourceMLJobState_timeouts/timeouts/job_state.tf

@@ -8,11 +8,6 @@ variable "index_name" {
   type        = string
 }
 
-variable "job_memory" {
-  description = "The ML job memory limit"
-  type        = string
-}
-
 provider "elasticstack" {
   elasticsearch {}
 }
@@ -47,7 +42,7 @@ resource "elasticstack_elasticsearch_ml_anomaly_detection_job" "test" {
     time_format = "epoch_ms"
   }
   analysis_limits = {
-    model_memory_limit = var.job_memory
+    model_memory_limit = "2gb"
   }
   allow_lazy_open = true # This should cause datafeed to wait for available node
 }