Skip shard routing tests on OpenSearch < 2.2.0 with security

OpenSearch < 2.2.0 with the security plugin throws
java.io.OptionalDataException on shard-routed requests due to
non-thread-safe HashSet/HashMap in User serialization. Fixed in 2.2.0
by opensearch-project/security#1970 (50a94b47).

Widen the existing 2.1.0-only skip to cover all versions below 2.2.0.

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

Author: sean-

opensearchtransport/operation.go

@@ -616,7 +616,7 @@ const OpPing = CatPing | minPing
 // String
 // ---------------------------------------------------------------------------
 
-//nolint:cyclop,gocyclo,exhaustive,goconst // intentional large switch with default fallback
+//nolint:cyclop,gocyclo,exhaustive // intentional large switch with default fallback
 func (op OperationID) String() string {
 	switch op {
 	// Search

opensearchtransport/policy_pool_router.go

@@ -238,7 +238,7 @@ func (p *poolRouter) Eval(ctx context.Context, req *http.Request) (NextHop, erro
 	// data nodes) when available. Falls back to the selected connection's
 	// per-node cwnd before the first poll cycle completes.
 	var adaptiveMCSR int
-	if p.poolName == "search" && best != nil {
+	if p.poolName == RoleSearch && best != nil {
 		cwnd := loadClusterSearchCwnd(p.clusterSearchCwnd)
 		if cwnd <= 0 {
 			cwnd = best.loadCwnd(p.poolName, loadPoolInfoReady(p.poolInfoReady))
@@ -391,13 +391,13 @@ func (p *poolRouter) configurePolicySettings(config policyConfig) error {
 
 	// Register the MCSR metric callback for the search pool so that
 	// ConnectionMetric snapshots include the current per-node value.
-	if p.poolName == "search" && config.metrics != nil && p.cache.features.adaptiveConcurrencyEnabled() {
+	if p.poolName == RoleSearch && config.metrics != nil && p.cache.features.adaptiveConcurrencyEnabled() {
 		cache := p.cache
 		poolInfoReady := p.poolInfoReady
 		config.metrics.connMetricCallbacks = append(config.metrics.connMetricCallbacks,
 			func(conns []*Connection, cms []ConnectionMetric) error {
 				for i, conn := range conns {
-					cwnd := conn.loadCwnd("search", loadPoolInfoReady(poolInfoReady))
+					cwnd := conn.loadCwnd(RoleSearch, loadPoolInfoReady(poolInfoReady))
 					mcsr := computeAdaptiveConcurrency(cwnd, cache.adaptiveConcurrency, cache.features)
 					cms[i].MCSR = &mcsr
 				}

opensearchtransport/shard_routing_integration_test.go

@@ -78,10 +78,12 @@ func (s *ShardRoutingSuite) SetupSuite() {
 	testutil.WaitForCluster(t)
 	testutil.RequireMinNodes(t, 2) // 1 replica requires at least 2 nodes for green health
 
-	// OpenSearch 2.1.0 with the security plugin returns HTTP 500 on search
-	// requests routed to specific shard-hosting nodes.
+	// OpenSearch < 2.2.0 with the security plugin returns HTTP 500 on
+	// shard-routed requests due to non-thread-safe User serialization
+	// (java.io.OptionalDataException). Fixed in 2.2.0 by
+	// opensearch-project/security#1970 (50a94b47).
 	if testutil.IsSecure(t) {
-		testutil.SkipIfVersion(t, "=", "2.1.0", "shard-exact pipeline (security plugin HTTP 500)")
+		testutil.SkipIfVersion(t, "<", "2.2.0", "shard-exact pipeline (security plugin OptionalDataException)")
 	}
 
 	s.ctx, s.cancel = context.WithTimeout(t.Context(), 120*time.Second)