fix tests

Signed-off-by: Sean Chittenden <sean.chittenden@crowdstrike.com>

Author: sean-

CHANGELOG.md

@@ -43,6 +43,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Fixed
 
 - Fix flaky connection integration test by replacing arbitrary sleep times with proper server readiness polling
+- Fix OpenSearch 2.8.0+ Tasks API compatibility by adding cancellation_time_millis field to TasksListTask struct
 - Fix OpenSearch 3.1.0+ API compatibility by adding phase_results_processors field to nodes API and time_in_execution fields to cluster pending tasks API
 - Fix OpenSearch 3.2.0+ API compatibility by adding max_last_index_request_timestamp and startree query fields across nodes stats, indices stats, and cat APIs, plus settings field to security plugin health API
 - Fix OpenSearch 3.3.0+ API compatibility by adding neural_search breaker, query_failed and startree_query_failed search fields, search pipeline system_generated fields across multiple APIs, plus ingestion_status field to cluster state API and jwks_uri field to security config API

opensearchapi/api_mget_test.go

@@ -53,7 +53,7 @@ func TestMGet(t *testing.T) {
 			context.Background(),
 			opensearchapi.MGetReq{
 				Index: testIndex,
-				Body:  strings.NewReader(`{"docs":[{"_id":"1"},{"_id":"2"}]}`),
+				Body:  strings.NewReader(fmt.Sprintf(`{"docs":[{"_id":"%s-1"},{"_id":"%s-2"}]}`, docIDPrefix, docIDPrefix)),
 			},
 		)
 		require.Nil(t, err)

opensearchapi/api_mtermvectors_test.go

@@ -26,7 +26,7 @@ func TestMTermvectors(t *testing.T) {
 	client, err := ostest.NewClient(t)
 	require.Nil(t, err)
 
-	testIndex := "test-mtermvectors"
+	testIndex := testutil.MustUniqueString(t, "test-mtermvectors")
 	t.Cleanup(func() {
 		client.Indices.Delete(t.Context(), opensearchapi.IndicesDeleteReq{Indices: []string{testIndex}})
 	})
@@ -95,7 +95,7 @@ func TestMTermvectors(t *testing.T) {
 			t.Context(),
 			opensearchapi.MTermvectorsReq{
 				Index: testIndex,
-				Body:  strings.NewReader(`{"ids":[1,2]}`),
+				Body:  strings.NewReader(fmt.Sprintf(`{"ids":["%s-0","%s-1"]}`, docIDPrefix, docIDPrefix)),
 			},
 		)
 		require.Nil(t, err)

opensearchapi/api_tasks-list.go

@@ -55,19 +55,20 @@ type TasksListNodes struct {
 
 // TasksListTask is a sub type of TaskListResp, TaskListNodes containing information about a task
 type TasksListTask struct {
-	Node               string                 `json:"node"`
-	ID                 int                    `json:"id"`
-	Type               string                 `json:"type"`
-	Action             string                 `json:"action"`
-	Description        string                 `json:"description"`
-	StartTimeInMillis  int64                  `json:"start_time_in_millis"`
-	RunningTimeInNanos int64                  `json:"running_time_in_nanos"`
-	Cancellable        bool                   `json:"cancellable"`
-	Cancelled          bool                   `json:"cancelled"`
-	Headers            map[string]string      `json:"headers"`
-	ResourceStats      TasksListResourceStats `json:"resource_stats"`
-	ParentTaskID       string                 `json:"parent_task_id"`
-	Children           []TasksListTask        `json:"children,omitempty"`
+	Node                   string                 `json:"node"`
+	ID                     int                    `json:"id"`
+	Type                   string                 `json:"type"`
+	Action                 string                 `json:"action"`
+	Description            string                 `json:"description"`
+	StartTimeInMillis      int64                  `json:"start_time_in_millis"`
+	RunningTimeInNanos     int64                  `json:"running_time_in_nanos"`
+	Cancellable            bool                   `json:"cancellable"`
+	Cancelled              bool                   `json:"cancelled"`
+	CancellationTimeMillis *int64                 `json:"cancellation_time_millis,omitempty"` // Added in OpenSearch 2.8.0
+	Headers                map[string]string      `json:"headers"`
+	ResourceStats          TasksListResourceStats `json:"resource_stats"`
+	ParentTaskID           string                 `json:"parent_task_id"`
+	Children               []TasksListTask        `json:"children,omitempty"`
 }
 
 // TasksListResourceStats is a sub type of TaskListTask containing information about task stats

opensearchapi/api_termvectors_test.go

@@ -27,7 +27,7 @@ func TestTermvectors(t *testing.T) {
 	client, err := ostest.NewClient(t)
 	require.Nil(t, err)
 
-	testIndex := "test-termvectors"
+	testIndex := testutil.MustUniqueString(t, "test-termvectors")
 	t.Cleanup(func() {
 		client.Indices.Delete(t.Context(), opensearchapi.IndicesDeleteReq{Indices: []string{testIndex}})
 	})
@@ -96,7 +96,7 @@ func TestTermvectors(t *testing.T) {
 			context.Background(),
 			opensearchapi.TermvectorsReq{
 				Index:      testIndex,
-				DocumentID: "1",
+				DocumentID: fmt.Sprintf("%s-%d", docIDPrefix, 0),
 				Body: strings.NewReader(`{"fields":["*"],"offsets":true,"payloads":true,"positions":true,` +
 					`"term_statistics":true,"field_statistics":true}`),
 			},

opensearchapi/api_update_test.go

@@ -54,7 +54,7 @@ func TestUpdate(t *testing.T) {
 			opensearchapi.UpdateReq{
 				Params:     opensearchapi.UpdateParams{Source: true},
 				Index:      testIndex,
-				DocumentID: "1",
+				DocumentID: fmt.Sprintf("%s-%d", docIDPrefix, 1),
 				Body:       strings.NewReader(`{"script":{"source":"ctx._source.counter += params.count","lang":"painless","params":{"count":4}}}`),
 			},
 		)