Fix cat indices API field naming compatibility across OpenSearch versions

OpenSearch 3.2.0+ changed startree query field names from:
- pri.search.startree.query_current -> pri.startree.query_current
- pri.search.startree.query_time -> pri.startree.query_time
- pri.search.startree.query_total -> pri.startree.query_total

This breaks backward compatibility as applications using the client API
would need to change when the server changes field names.

Solution: Implement field consolidation that maintains stable API fields
by consolidating data from version-specific JSON fields into consistent
API fields that applications can rely on.

- Add version-specific fields (V31/V32) for JSON unmarshaling
- Add consolidateFields() method to fan-in data to stable API fields
- Call consolidation after JSON unmarshaling in catClient.Indices()

This ensures applications can use PrimaryStartreeQueryCurrent,
PrimaryStartreeQueryTime, and PrimaryStartreeQueryTotal consistently
regardless of which OpenSearch server version is running.

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

Author: sean-

CHANGELOG.md

@@ -20,6 +20,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fix nodes stats API compatibility with OpenSearch 3.2.0+ by adding max_last_index_request_timestamp and startree query fields
 - Fix indices stats API compatibility with OpenSearch 3.2.0+ by adding max_last_index_request_timestamp and startree query fields
 - Fix cat APIs compatibility with OpenSearch 3.2.0+ by adding indexing timestamp and startree query fields
+- Fix cat indices API field naming compatibility across OpenSearch versions by implementing field consolidation for startree query fields that changed naming format between 3.1.x and 3.2.0+
 - Fix floating point precision loss in nodes stats concurrent_avg_slice_count field by changing from float32 to float64
 - Fix security plugin health API compatibility with OpenSearch 3.2.0+ by adding settings field
 - Fix nodes stats API compatibility with OpenSearch 3.3.0+ by adding neural_search breaker, query_failed and startree_query_failed search fields, and search pipeline system_generated fields

opensearchapi/api_cat-indices.go

@@ -159,11 +159,17 @@ type CatIndexResp struct {
 	SearchConcurrentAvgSliceCount        *string `json:"search.concurrent_avg_slice_count"`
 	PrimarySearchConcurrentAvgSliceCount *string `json:"pri.search.concurrent_avg_slice_count"`
 	SearchStartreeQueryCurrent           *int    `json:"search.startree_query_current,string"`     // Available in OpenSearch 3.2.0+
-	PrimaryStartreeQueryCurrent          *int    `json:"pri.search.startree.query_current,string"` // Available in OpenSearch 3.2.0+
+	PrimaryStartreeQueryCurrent          *int    `json:"-"`                                        // Consolidated field - populated from V31 or V32 fields
+	PrimaryStartreeQueryCurrentV31       *int    `json:"pri.search.startree.query_current,string"` // Available in OpenSearch 3.2.0+ (format used in 3.1.x)
+	PrimaryStartreeQueryCurrentV32       *int    `json:"pri.startree.query_current,string"`        // Available in OpenSearch 3.2.0+ (new format in 3.2.0+)
 	SearchStartreeQueryTime              *string `json:"search.startree_query_time"`               // Available in OpenSearch 3.2.0+
-	PrimaryStartreeQueryTime             *string `json:"pri.search.startree.query_time"`           // Available in OpenSearch 3.2.0+
+	PrimaryStartreeQueryTime             *string `json:"-"`                                        // Consolidated field - populated from V31 or V32 fields
+	PrimaryStartreeQueryTimeV31          *string `json:"pri.search.startree.query_time"`           // Available in OpenSearch 3.2.0+ (format used in 3.1.x)
+	PrimaryStartreeQueryTimeV32          *string `json:"pri.startree.query_time"`                  // Available in OpenSearch 3.2.0+ (new format in 3.2.0+)
 	SearchStartreeQueryTotal             *string `json:"search.startree_query_total"`              // Available in OpenSearch 3.2.0+
-	PrimaryStartreeQueryTotal            *string `json:"pri.search.startree.query_total"`          // Available in OpenSearch 3.2.0+
+	PrimaryStartreeQueryTotal            *string `json:"-"`                                        // Consolidated field - populated from V31 or V32 fields
+	PrimaryStartreeQueryTotalV31         *string `json:"pri.search.startree.query_total"`          // Available in OpenSearch 3.2.0+ (format used in 3.1.x)
+	PrimaryStartreeQueryTotalV32         *string `json:"pri.startree.query_total"`                 // Available in OpenSearch 3.2.0+ (new format in 3.2.0+)
 	SearchStartreeQueryFailed            *int    `json:"search.startree_query_failed,string"`      // Available in OpenSearch 3.3.0+
 	PrimaryStartreeQueryFailed           *int    `json:"pri.search.startree_query_failed,string"`  // Available in OpenSearch 3.3.0+
 	SearchScrollCurrent                  *int    `json:"search.scroll_current,string"`
@@ -213,3 +219,31 @@ func (r CatIndicesResp) Inspect() Inspect {
 		Response: r.response,
 	}
 }
+
+// consolidateFields consolidates version-specific fields for all indices in the response.
+// This method should be called after JSON unmarshaling to ensure backward compatibility
+// across different OpenSearch server versions that may use different field names.
+func (r *CatIndicesResp) consolidateFields() {
+	for i := range r.Indices {
+		// Consolidate PrimaryStartreeQueryCurrent from V31 or V32 fields
+		if r.Indices[i].PrimaryStartreeQueryCurrentV31 != nil && *r.Indices[i].PrimaryStartreeQueryCurrentV31 != 0 {
+			r.Indices[i].PrimaryStartreeQueryCurrent = r.Indices[i].PrimaryStartreeQueryCurrentV31
+		} else if r.Indices[i].PrimaryStartreeQueryCurrentV32 != nil {
+			r.Indices[i].PrimaryStartreeQueryCurrent = r.Indices[i].PrimaryStartreeQueryCurrentV32
+		}
+
+		// Consolidate PrimaryStartreeQueryTime from V31 or V32 fields
+		if r.Indices[i].PrimaryStartreeQueryTimeV31 != nil && *r.Indices[i].PrimaryStartreeQueryTimeV31 != "" {
+			r.Indices[i].PrimaryStartreeQueryTime = r.Indices[i].PrimaryStartreeQueryTimeV31
+		} else if r.Indices[i].PrimaryStartreeQueryTimeV32 != nil {
+			r.Indices[i].PrimaryStartreeQueryTime = r.Indices[i].PrimaryStartreeQueryTimeV32
+		}
+
+		// Consolidate PrimaryStartreeQueryTotal from V31 or V32 fields
+		if r.Indices[i].PrimaryStartreeQueryTotalV31 != nil && *r.Indices[i].PrimaryStartreeQueryTotalV31 != "" {
+			r.Indices[i].PrimaryStartreeQueryTotal = r.Indices[i].PrimaryStartreeQueryTotalV31
+		} else if r.Indices[i].PrimaryStartreeQueryTotalV32 != nil {
+			r.Indices[i].PrimaryStartreeQueryTotal = r.Indices[i].PrimaryStartreeQueryTotalV32
+		}
+	}
+}

opensearchapi/api_cat.go

@@ -130,6 +130,9 @@ func (c catClient) Indices(ctx context.Context, req *CatIndicesReq) (*CatIndices
 		return &data, err
 	}
 
+	// Consolidate version-specific fields to maintain backward compatibility
+	data.consolidateFields()
+
 	return &data, nil
 }
 

opensearchapi/api_cluster-pending_tasks.go

@@ -48,6 +48,6 @@ type ClusterPendingTasksItem struct {
 	TimeInQueueMillis     int    `json:"time_in_queue_millis"`
 	TimeInQueue           string `json:"time_in_queue"`
 	TimeInExecutionMillis int    `json:"time_in_execution_millis"` // Available in OpenSearch 3.1.0+
-	TimeInExecution       string `json:"time_in_execution"`       // Available in OpenSearch 3.1.0+
+	TimeInExecution       string `json:"time_in_execution"`        // Available in OpenSearch 3.1.0+
 	Executing             bool   `json:"executing"`
 }