Bump golangci-lint to 2.12.2

- Rename gomodguard to gomodguard_v2 in golangci-lint config

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

Author: sean-

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.11.4
+          version: v2.12.2
           args: --fix --build-tags "integration core plugins plugin_security plugin_index_management multinode"
 
   prettify:

.golangci.yml

@@ -29,7 +29,7 @@ linters:
     - godox
     - goheader
     - gomoddirectives
-    - gomodguard
+    - gomodguard_v2
     - goprintffuncname
     - gosec
     - govet

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 # Tool versions
-GOLANGCI_LINT_VERSION := v2.11.4
+GOLANGCI_LINT_VERSION := v2.12.2
 
 GOLANGCI_LINT_BUILD_TAGS := "integration core plugins plugin_security plugin_index_management multinode"
 

opensearchtransport/cluster_health.go

@@ -34,6 +34,8 @@ import (
 	"time"
 )
 
+const clusterStatusRed = "red"
+
 // NodeStatsResponse represents the response from GET /_nodes/_local/stats/jvm,breaker,thread_pool.
 // Only the "nodes" map is used; the top-level "_nodes" and "cluster_name" fields are ignored.
 // All fields are present in OpenSearch 1.3.0+.
@@ -266,7 +268,7 @@ func (c *Client) evaluateOverload(conn *Connection, stats *NodeStats) bool {
 	health := conn.mu.clusterHealth
 	conn.mu.RUnlock()
 
-	if health != nil && health.Status == "red" {
+	if health != nil && health.Status == clusterStatusRed {
 		if dl := loadDebugLogger(); dl != nil {
 			dl.Logf("Node %q overloaded: cluster status is red\n", conn.URL)
 		}

opensearchtransport/cluster_health_internal_test.go

@@ -1163,7 +1163,7 @@ func TestEvaluateOverload(t *testing.T) {
 		c := makeClient()
 		conn := makeConn()
 		conn.mu.Lock()
-		conn.mu.clusterHealth = &ClusterHealthLocal{Status: "red"}
+		conn.mu.clusterHealth = &ClusterHealthLocal{Status: clusterStatusRed}
 		conn.mu.Unlock()
 
 		stats := &NodeStats{
@@ -1205,7 +1205,7 @@ func TestEvaluateOverload(t *testing.T) {
 		c := makeClient()
 		conn := makeConn()
 		conn.mu.Lock()
-		conn.mu.clusterHealth = &ClusterHealthLocal{Status: "red"}
+		conn.mu.clusterHealth = &ClusterHealthLocal{Status: clusterStatusRed}
 		conn.mu.Unlock()
 
 		stats := &NodeStats{

opensearchtransport/connection_lifecycle.go

@@ -286,23 +286,39 @@ func (lc connLifecycle) hasAny(flags connLifecycle) bool {
 	return lc&flags != 0
 }
 
+// Lifecycle state names used in String() output and test assertions.
+const (
+	lcNameReady                  = "ready"
+	lcNameUnknown                = "unknown"
+	lcNameActive                 = "active"
+	lcNameStandby                = "standby"
+	lcNameNeedsWarmup            = "needsWarmup"
+	lcNameOverloaded             = "overloaded"
+	lcNameHealthChecking         = "healthChecking"
+	lcNameDraining               = "draining"
+	lcNameNeedsHardware          = "needsHardware"
+	lcNameNeedsCatUpdate         = "needsCatUpdate"
+	lcNameClusterHealthProbed    = "clusterHealthProbed"
+	lcNameClusterHealthAvailable = "clusterHealthAvailable"
+)
+
 // connLifecycleBits maps each bit to its human-readable name.
 var connLifecycleBits = [12]struct { //nolint:gochecknoglobals // lookup table, not mutable state
 	bit  connLifecycle
 	name string
 }{
-	{lcReady, "ready"},
-	{lcUnknown, "unknown"},
-	{lcActive, "active"},
-	{lcStandby, "standby"},
-	{lcNeedsWarmup, "needsWarmup"},
-	{lcOverloaded, "overloaded"},
-	{lcHealthChecking, "healthChecking"},
-	{lcDraining, "draining"},
-	{lcNeedsHardware, "needsHardware"},
-	{lcNeedsCatUpdate, "needsCatUpdate"},
-	{lcClusterHealthProbed, "clusterHealthProbed"},
-	{lcClusterHealthAvailable, "clusterHealthAvailable"},
+	{lcReady, lcNameReady},
+	{lcUnknown, lcNameUnknown},
+	{lcActive, lcNameActive},
+	{lcStandby, lcNameStandby},
+	{lcNeedsWarmup, lcNameNeedsWarmup},
+	{lcOverloaded, lcNameOverloaded},
+	{lcHealthChecking, lcNameHealthChecking},
+	{lcDraining, lcNameDraining},
+	{lcNeedsHardware, lcNameNeedsHardware},
+	{lcNeedsCatUpdate, lcNameNeedsCatUpdate},
+	{lcClusterHealthProbed, lcNameClusterHealthProbed},
+	{lcClusterHealthAvailable, lcNameClusterHealthAvailable},
 }
 
 // String returns a human-readable name for the lifecycle.

opensearchtransport/policy_cluster_coordinator.go

@@ -47,7 +47,7 @@ type CoordinatorPolicy struct {
 	policyState atomic.Int32     // Bitfield: psEnabled|psDisabled|psEnvEnabled|psEnvDisabled
 }
 
-func (p *CoordinatorPolicy) policyTypeName() string      { return "coordinator" }
+func (p *CoordinatorPolicy) policyTypeName() string      { return policyTypeNameCoordinator }
 func (p *CoordinatorPolicy) setEnvOverride(enabled bool) { psSetEnvOverride(&p.policyState, enabled) }
 
 // NewCoordinatorPolicy creates a policy that routes to coordinating-only nodes.
@@ -61,7 +61,7 @@ func NewCoordinatorPolicy() Policy {
 func (p *CoordinatorPolicy) configurePolicySettings(config policyConfig) error {
 	// Create pool with proper settings if we don't have one yet
 	if p.pool == nil {
-		config.name = "coordinator"
+		config.name = policyTypeNameCoordinator
 		p.pool = createPoolFromConfig(config)
 	}
 	return nil

opensearchtransport/policy_doc_router.go

@@ -50,7 +50,7 @@ type DocRouter struct {
 	config      policyConfig
 }
 
-func (p *DocRouter) policyTypeName() string { return "document_router" }
+func (p *DocRouter) policyTypeName() string { return policyTypeNameDocumentRouter }
 func (p *DocRouter) setEnvOverride(enabled bool) {
 	psSetEnvOverride(&p.policyState, enabled)
 }

opensearchtransport/policy_ifenabled.go

@@ -52,7 +52,7 @@ type IfEnabledPolicy struct {
 	policyState atomic.Int32  // Bitfield: psEnabled|psDisabled|psEnvEnabled|psEnvDisabled
 }
 
-func (p *IfEnabledPolicy) policyTypeName() string      { return "ifenabled" }
+func (p *IfEnabledPolicy) policyTypeName() string      { return policyTypeNameIfEnabled }
 func (p *IfEnabledPolicy) setEnvOverride(enabled bool) { psSetEnvOverride(&p.policyState, enabled) }
 
 // NewIfEnabledPolicy creates a new conditional policy.

opensearchtransport/policy_index_router.go

@@ -173,7 +173,7 @@ type IndexRouter struct {
 	config      policyConfig
 }
 
-func (p *IndexRouter) policyTypeName() string      { return "index_router" }
+func (p *IndexRouter) policyTypeName() string      { return policyTypeNameIndexRouter }
 func (p *IndexRouter) setEnvOverride(enabled bool) { psSetEnvOverride(&p.policyState, enabled) }
 
 // NewIndexRouter creates an IndexRouter with the given cache configuration.