From 047a4e4d213f31c5ffeac6e37859f11df2bf97af Mon Sep 17 00:00:00 2001
From: John van Hienen <jvanhienen@gmail.com>
Date: Wed, 16 Jul 2025 09:31:04 +0200
Subject: [PATCH] Fix master timeout for serverless flavor

---
 internal/elasticsearch/index/index/models.go      | 4 ++--
 internal/elasticsearch/index/index/models_test.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal/elasticsearch/index/index/models.go b/internal/elasticsearch/index/index/models.go
index 0c9420fbb..d776f09f4 100644
--- a/internal/elasticsearch/index/index/models.go
+++ b/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" {
+		params.MasterTimeout = masterTimeout
 		params.WaitForActiveShards = model.WaitForActiveShards.ValueString()
 	}
 
diff --git a/internal/elasticsearch/index/index/models_test.go b/internal/elasticsearch/index/index/models_test.go
index c81d9bbc0..d91398799 100644
--- a/internal/elasticsearch/index/index/models_test.go
+++ b/internal/elasticsearch/index/index/models_test.go
@@ -365,6 +365,7 @@ func Test_tfModel_toPutIndexParams(t *testing.T) {
 			if isServerless {
 				flavor = "serverless"
 				expectedParams.WaitForActiveShards = ""
+				expectedParams.MasterTimeout = 0
 			}
 
 			params := model.toPutIndexParams(flavor)