Enable and run the modernize linter

sean- · sean- · commit 1d74d7f9f50e · 2026-01-27T07:41:40.000-08:00
Signed-off-by: Sean Chittenden &lt;sean.chittenden@crowdstrike.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -42,6 +42,7 @@ linters:
     - makezero
     - mirror
     - misspell
+    - modernize
     - musttag
     - nakedret
     - nestif
diff --git a/opensearch.go b/opensearch.go
@@ -237,7 +237,7 @@ func (c *Client) Perform(req *http.Request) (*http.Response, error) {
 }
 
 // Do gets and performs the request. It also tries to parse the response into the dataPointer
-func (c *Client) Do(ctx context.Context, req Request, dataPointer interface{}) (*Response, error) {
+func (c *Client) Do(ctx context.Context, req Request, dataPointer any) (*Response, error) {
 	httpReq, err := req.GetRequest()
 	if err != nil {
 		return nil, err
diff --git a/opensearchapi/api_document-delete_by_query-params.go b/opensearchapi/api_document-delete_by_query-params.go
@@ -57,9 +57,9 @@ type DocumentDeleteByQueryParams struct {
 	SearchTimeout       time.Duration
 	SearchType          string
 	Size                *int
-	Slices              interface{}
+	Slices              any
 	Sort                []string
-	Source              interface{}
+	Source              any
 	SourceExcludes      []string
 	SourceIncludes      []string
 	Stats               []string
diff --git a/opensearchapi/api_document-exists-params.go b/opensearchapi/api_document-exists-params.go
@@ -37,7 +37,7 @@ type DocumentExistsParams struct {
 	Realtime       *bool
 	Refresh        *bool
 	Routing        string
-	Source         interface{}
+	Source         any
 	SourceExcludes []string
 	SourceIncludes []string
 	StoredFields   []string
diff --git a/opensearchapi/api_document-exists_source-params.go b/opensearchapi/api_document-exists_source-params.go
@@ -37,7 +37,7 @@ type DocumentExistsSourceParams struct {
 	Realtime       *bool
 	Refresh        *bool
 	Routing        string
-	Source         interface{}
+	Source         any
 	SourceExcludes []string
 	SourceIncludes []string
 	Version        *int
diff --git a/opensearchapi/api_document-explain-params.go b/opensearchapi/api_document-explain-params.go
@@ -41,7 +41,7 @@ type DocumentExplainParams struct {
 	Preference      string
 	Query           string
 	Routing         string
-	Source          interface{}
+	Source          any
 	SourceExcludes  []string
 	SourceIncludes  []string
 	StoredFields    []string
diff --git a/opensearchapi/api_document-get-params.go b/opensearchapi/api_document-get-params.go
@@ -37,7 +37,7 @@ type DocumentGetParams struct {
 	Realtime       *bool
 	Refresh        *bool
 	Routing        string
-	Source         interface{}
+	Source         any
 	SourceExcludes []string
 	SourceIncludes []string
 	StoredFields   []string
diff --git a/opensearchapi/api_document-source-params.go b/opensearchapi/api_document-source-params.go
@@ -38,7 +38,7 @@ type DocumentSourceParams struct {
 	Refresh    *bool
 	Routing    string
 	// Deprecated: This parameter is similar to SourceIncludes, please use that instead.
-	Source         interface{}
+	Source         any
 	SourceExcludes []string
 	SourceIncludes []string
 	Version        *int
diff --git a/opensearchapi/api_mget-params.go b/opensearchapi/api_mget-params.go
@@ -37,7 +37,7 @@ type MGetParams struct {
 	Realtime       *bool
 	Refresh        *bool
 	Routing        string
-	Source         interface{}
+	Source         any
 	SourceExcludes []string
 	SourceIncludes []string
 	StoredFields   []string
diff --git a/opensearchapi/api_reindex-params.go b/opensearchapi/api_reindex-params.go
@@ -39,7 +39,7 @@ type ReindexParams struct {
 	Refresh             *bool
 	RequestsPerSecond   *int
 	Scroll              time.Duration
-	Slices              interface{}
+	Slices              any
 	Timeout             time.Duration
 	WaitForActiveShards string
 	WaitForCompletion   *bool
diff --git a/opensearchapi/api_search-params.go b/opensearchapi/api_search-params.go
@@ -64,7 +64,7 @@ type SearchParams struct {
 	SeqNoPrimaryTerm           *bool
 	Size                       *int
 	Sort                       []string
-	Source                     interface{}
+	Source                     any
 	SourceExcludes             []string
 	SourceIncludes             []string
 	Stats                      []string
@@ -76,7 +76,7 @@ type SearchParams struct {
 	TerminateAfter             *int
 	Timeout                    time.Duration
 	TrackScores                *bool
-	TrackTotalHits             interface{}
+	TrackTotalHits             any
 	TypedKeys                  *bool
 	Version                    *bool
 	PhaseTook                  bool
diff --git a/opensearchapi/api_search-params_test.go b/opensearchapi/api_search-params_test.go
@@ -50,7 +50,7 @@ func TestSearchParams_get(t *testing.T) {
 		SeqNoPrimaryTerm           *bool
 		Size                       *int
 		Sort                       []string
-		Source                     interface{}
+		Source                     any
 		SourceExcludes             []string
 		SourceIncludes             []string
 		Stats                      []string
@@ -62,7 +62,7 @@ func TestSearchParams_get(t *testing.T) {
 		TerminateAfter             *int
 		Timeout                    time.Duration
 		TrackScores                *bool
-		TrackTotalHits             interface{}
+		TrackTotalHits             any
 		TypedKeys                  *bool
 		Version                    *bool
 		Pretty                     bool
diff --git a/opensearchapi/api_update-params.go b/opensearchapi/api_update-params.go
@@ -41,7 +41,7 @@ type UpdateParams struct {
 	RequireAlias        *bool
 	RetryOnConflict     *int
 	Routing             string
-	Source              interface{}
+	Source              any
 	SourceExcludes      []string
 	SourceIncludes      []string
 	Timeout             time.Duration
diff --git a/opensearchapi/api_update_by_query-params.go b/opensearchapi/api_update_by_query-params.go
@@ -58,9 +58,9 @@ type UpdateByQueryParams struct {
 	SearchTimeout       time.Duration
 	SearchType          string
 	Size                *int
-	Slices              interface{}
+	Slices              any
 	Sort                []string
-	Source              interface{}
+	Source              any
 	SourceExcludes      []string
 	SourceIncludes      []string
 	Stats               []string
diff --git a/opensearchtransport/connection.go b/opensearchtransport/connection.go
@@ -69,7 +69,7 @@ type Connection struct {
 	ID         string
 	Name       string
 	Roles      []string
-	Attributes map[string]interface{}
+	Attributes map[string]any
 
 	failures atomic.Int64
 
diff --git a/opensearchtransport/connection_benchmark_test.go b/opensearchtransport/connection_benchmark_test.go
@@ -134,7 +134,7 @@ func BenchmarkStatusConnectionPool(b *testing.B) {
 	b.ReportAllocs()
 
 	conns := make([]*Connection, 1000)
-	for i := 0; i < 1000; i++ {
+	for i := range 1000 {
 		conns[i] = &Connection{URL: &url.URL{Scheme: "http", Host: fmt.Sprintf("foo%d", i)}}
 	}
 
diff --git a/opensearchtransport/connection_internal_test.go b/opensearchtransport/connection_internal_test.go
@@ -41,7 +41,7 @@ func TestSingleConnectionPoolNext(t *testing.T) {
 			connection: &Connection{URL: &url.URL{Scheme: "http", Host: "foo1"}},
 		}
 
-		for i := 0; i < 7; i++ {
+		for range 7 {
 			c, err := pool.Next()
 			if err != nil {
 				t.Errorf("Unexpected error: %s", err)
@@ -121,7 +121,7 @@ func TestStatusConnectionPoolNext(t *testing.T) {
 		}
 
 		var expected string
-		for i := 0; i < 11; i++ {
+		for i := range 11 {
 			c, err := pool.Next()
 			if err != nil {
 				t.Errorf("Unexpected error: %s", err)
diff --git a/opensearchtransport/discovery.go b/opensearchtransport/discovery.go
@@ -46,11 +46,11 @@ type Discoverable interface {
 
 // nodeInfo represents the information about node in a cluster.
 type nodeInfo struct {
-	ID         string                 `json:"id"`
-	Name       string                 `json:"name"`
-	URL        *url.URL               `json:"url"`
-	Roles      []string               `json:"roles"`
-	Attributes map[string]interface{} `json:"attributes"`
+	ID         string         `json:"id"`
+	Name       string         `json:"name"`
+	URL        *url.URL       `json:"url"`
+	Roles      []string       `json:"roles"`
+	Attributes map[string]any `json:"attributes"`
 	HTTP       struct {
 		PublishAddress string `json:"publish_address"`
 	} `json:"http"`
diff --git a/opensearchtransport/gzip_internal_test.go b/opensearchtransport/gzip_internal_test.go
@@ -38,7 +38,7 @@ func TestCompress(t *testing.T) {
 
 	t.Run("gzip multiple times", func(t *testing.T) {
 		gzipCompressor := newGzipCompressor()
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			body := generateRandomString()
 			rc := io.NopCloser(strings.NewReader(body))
 
@@ -115,7 +115,7 @@ func generateRandomString() string {
 	randomBytes := make([]byte, length)
 
 	// Generate a random character from the charset for each byte in the slice
-	for i := 0; i < length; i++ {
+	for i := range length {
 		randomBytes[i] = charset[rand.Intn(len(charset))]
 	}
 
diff --git a/opensearchtransport/logger.go b/opensearchtransport/logger.go
@@ -54,8 +54,8 @@ type Logger interface {
 
 // DebuggingLogger defines the interface for a debugging logger.
 type DebuggingLogger interface {
-	Log(a ...interface{}) error
-	Logf(format string, a ...interface{}) error
+	Log(a ...any) error
+	Logf(format string, a ...any) error
 }
 
 // TextLogger prints the log message in plain text.
@@ -400,13 +400,13 @@ func (l *JSONLogger) RequestBodyEnabled() bool { return l.EnableRequestBody }
 func (l *JSONLogger) ResponseBodyEnabled() bool { return l.EnableResponseBody }
 
 // Log prints the arguments to output in default format.
-func (l *debuggingLogger) Log(a ...interface{}) error {
+func (l *debuggingLogger) Log(a ...any) error {
 	_, err := fmt.Fprint(l.Output, a...)
 	return err
 }
 
 // Logf prints formats the arguments and prints them to output.
-func (l *debuggingLogger) Logf(format string, a ...interface{}) error {
+func (l *debuggingLogger) Logf(format string, a ...any) error {
 	_, err := fmt.Fprintf(l.Output, format, a...)
 	return err
 }
diff --git a/opensearchtransport/logger_internal_test.go b/opensearchtransport/logger_internal_test.go
@@ -72,7 +72,7 @@ func TestTransportLogger(t *testing.T) {
 			// Logger: io.Discard,
 		})
 
-		for i := 0; i < 100; i++ {
+		for range 100 {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -229,7 +229,7 @@ func TestTransportLogger(t *testing.T) {
 
 		var output string
 		stripANSI := regexp.MustCompile("(?sm)\x1b\\[.+?m([^\x1b]+?)|\x1b\\[0m")
-		for _, v := range strings.Split(dst.String(), "\n") {
+		for v := range strings.SplitSeq(dst.String(), "\n") {
 			if v != "" {
 				output += stripANSI.ReplaceAllString(v, "$1")
 				if !strings.HasSuffix(output, "\n") {
@@ -323,12 +323,12 @@ func TestTransportLogger(t *testing.T) {
 			t.Fatalf("Expected 1 line, got %d", len(lines))
 		}
 
-		var j map[string]interface{}
+		var j map[string]any
 		if err := json.Unmarshal([]byte(output), &j); err != nil {
 			t.Errorf("Error decoding JSON: %s", err)
 		}
 
-		domain := j["url"].(map[string]interface{})["domain"]
+		domain := j["url"].(map[string]any)["domain"]
 		if domain != "foo" {
 			t.Errorf("Unexpected JSON output: %s", domain)
 		}
@@ -367,12 +367,12 @@ func TestTransportLogger(t *testing.T) {
 			t.Fatalf("Expected 1 line, got %d", len(lines))
 		}
 
-		var j map[string]interface{}
+		var j map[string]any
 		if err := json.Unmarshal([]byte(output), &j); err != nil {
 			t.Errorf("Error decoding JSON: %s", err)
 		}
 
-		body := j["http"].(map[string]interface{})["request"].(map[string]interface{})["body"].(string)
+		body := j["http"].(map[string]any)["request"].(map[string]any)["body"].(string)
 		if !strings.Contains(body, "query") {
 			t.Errorf("Unexpected JSON output: %s", body)
 		}
diff --git a/opensearchutil/bulk_indexer.go b/opensearchutil/bulk_indexer.go
@@ -112,7 +112,7 @@ type BulkIndexerItem struct {
 	VersionType         *string
 	IfSeqNum            *int64
 	IfPrimaryTerm       *int64
-	WaitForActiveShards interface{}
+	WaitForActiveShards any
 	Refresh             *string
 	RequireAlias        *bool
 	Body                io.ReadSeeker
@@ -123,22 +123,22 @@ type BulkIndexerItem struct {
 }
 
 type bulkActionMetadata struct {
-	Index               string      `json:"_index,omitempty"`
-	DocumentID          string      `json:"_id,omitempty"`
-	Routing             *string     `json:"routing,omitempty"`
-	Version             *int64      `json:"version,omitempty"`
-	VersionType         *string     `json:"version_type,omitempty"`
-	IfSeqNum            *int64      `json:"if_seq_no,omitempty"`
-	IfPrimaryTerm       *int64      `json:"if_primary_term,omitempty"`
-	WaitForActiveShards interface{} `json:"wait_for_active_shards,omitempty"`
-	Refresh             *string     `json:"refresh,omitempty"`
-	RequireAlias        *bool       `json:"require_alias,omitempty"`
-	RetryOnConflict     *int        `json:"retry_on_conflict,omitempty"`
+	Index               string  `json:"_index,omitempty"`
+	DocumentID          string  `json:"_id,omitempty"`
+	Routing             *string `json:"routing,omitempty"`
+	Version             *int64  `json:"version,omitempty"`
+	VersionType         *string `json:"version_type,omitempty"`
+	IfSeqNum            *int64  `json:"if_seq_no,omitempty"`
+	IfPrimaryTerm       *int64  `json:"if_primary_term,omitempty"`
+	WaitForActiveShards any     `json:"wait_for_active_shards,omitempty"`
+	Refresh             *string `json:"refresh,omitempty"`
+	RequireAlias        *bool   `json:"require_alias,omitempty"`
+	RetryOnConflict     *int    `json:"retry_on_conflict,omitempty"`
 }
 
 // BulkIndexerDebugLogger defines the interface for a debugging logger.
 type BulkIndexerDebugLogger interface {
-	Printf(string, ...interface{})
+	Printf(string, ...any)
 }
 
 type bulkIndexer struct {
diff --git a/opensearchutil/bulk_indexer_internal_test.go b/opensearchutil/bulk_indexer_internal_test.go
@@ -188,7 +188,7 @@ func TestBulkIndexer(t *testing.T) {
 		time.Sleep(100 * time.Millisecond)
 
 		var errs []error
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			errs = append(errs, bi.Add(ctx, BulkIndexerItem{Action: "delete", DocumentID: "timeout"}))
 		}
 		if err := bi.Close(context.Background()); err != nil {
@@ -214,7 +214,7 @@ func TestBulkIndexer(t *testing.T) {
 			Client:     client,
 		})
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			bi.Add(context.Background(), BulkIndexerItem{Action: "foo"})
 		}
 
@@ -789,8 +789,6 @@ func TestBulkIndexer(t *testing.T) {
 			},
 		}
 		for _, tt := range tests {
-			tt := tt
-
 			t.Run(tt.name, func(t *testing.T) {
 				w := &worker{
 					buf: bytes.NewBuffer(make([]byte, 0, 5e+6)),
diff --git a/opensearchutil/json_reader.go b/opensearchutil/json_reader.go
@@ -33,7 +33,7 @@ import (
 )
 
 // NewJSONReader encodes v into JSON and returns it as an io.Reader.
-func NewJSONReader(v interface{}) io.Reader {
+func NewJSONReader(v any) io.Reader {
 	return &JSONReader{val: v, buf: nil}
 }
 
@@ -45,7 +45,7 @@ type JSONEncoder interface {
 // JSONReader represents a reader which takes an interface value,
 // encodes it into JSON, and wraps it in an io.Reader.
 type JSONReader struct {
-	val interface{}
+	val any
 	buf interface {
 		io.ReadWriter
 		io.WriterTo
diff --git a/plugins/security/api_health.go b/plugins/security/api_health.go
@@ -48,10 +48,10 @@ func (r HealthReq) GetRequest() (*http.Request, error) {
 
 // HealthResp represents the returned struct of the health get response
 type HealthResp struct {
-	Message  *string                `json:"message"`
-	Mode     string                 `json:"mode"`
-	Status   string                 `json:"status"`
-	Settings map[string]interface{} `json:"settings"` // Available in OpenSearch 3.2.0+
+	Message  *string        `json:"message"`
+	Mode     string         `json:"mode"`
+	Status   string         `json:"status"`
+	Settings map[string]any `json:"settings"` // Available in OpenSearch 3.2.0+
 	response *opensearch.Response
 }
 
diff --git a/response.go b/response.go

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func (c Client) Perform(req http.Request) (*http.Response, error) {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`// Do gets and performs the request. It also tries to parse the response into the dataPointer`
`240`		`-func (c Client) Do(ctx context.Context, req Request, dataPointer interface{}) (Response, error) {`
	`240`	`+func (c Client) Do(ctx context.Context, req Request, dataPointer any) (Response, error) {`
`241`	`241`	`httpReq, err := req.GetRequest()`
`242`	`242`	`if err != nil {`
`243`	`243`	`return nil, err`