Fix master timeout for serverless flavor (#1207)

johnvanhienen · web-flow · commit 6dea22c094e5 · 2025-07-18T20:52:48.000+10:00
diff --git 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
@@ -365,6 +365,7 @@ func Test_tfModel_toPutIndexParams(t *testing.T) {
 			if isServerless {
 				flavor = "serverless"
 				expectedParams.WaitForActiveShards = ""
+				expectedParams.MasterTimeout = 0
 			}
 
 			params := model.toPutIndexParams(flavor)

Original file line number	Diff line number	Diff line change
`@@ -286,11 +286,11 @@ func (model tfModel) toPutIndexParams(serverFlavor string) models.PutIndexParams`
`286`	`286`	`timeout, _ := model.Timeout.Parse()`
`287`	`287`
`288`	`288`	`params := models.PutIndexParams{`
`289`		`- MasterTimeout: masterTimeout,`
`290`		`- Timeout: timeout,`
	`289`	`+ Timeout: timeout,`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`if serverFlavor != "serverless" {`
	`293`	`+ params.MasterTimeout = masterTimeout`
`294`	`294`	`params.WaitForActiveShards = model.WaitForActiveShards.ValueString()`
`295`	`295`	`}`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,7 @@ func Test_tfModel_toPutIndexParams(t *testing.T) {`
`365`	`365`	`if isServerless {`
`366`	`366`	`flavor = "serverless"`
`367`	`367`	`expectedParams.WaitForActiveShards = ""`
	`368`	`+ expectedParams.MasterTimeout = 0`
`368`	`369`	`}`
`369`	`370`
`370`	`371`	`params := model.toPutIndexParams(flavor)`