fix codecov patch by explicitly setting feature gate in tests

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

Author: rashmigottipati

internal/operator-controller/bundleutil/bundle_test.go

@@ -2,6 +2,7 @@ package bundleutil_test
 
 import (
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	bsemver "github.com/blang/semver/v4"
@@ -96,14 +97,15 @@ func TestGetVersionAndRelease(t *testing.T) {
 }
 
 // TestGetVersionAndRelease_WithBundleReleaseSupport tests the feature-gated parsing behavior.
-// This test detects the current feature gate state and validates the correct behavior path.
-// When BundleReleaseSupport is enabled (experimental release), bundles with explicit
-// pkg.Release field use that value. When disabled (standard release), explicit release is
-// ignored and parsing falls back to legacy build metadata.
+// Explicitly sets the gate to test both enabled and disabled paths.
 func TestGetVersionAndRelease_WithBundleReleaseSupport(t *testing.T) {
-	// Detect current feature gate state and test the appropriate path
-	if features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport) {
-		t.Log("BundleReleaseSupport enabled - testing explicit release field parsing")
+	t.Run("gate enabled - parses explicit release field", func(t *testing.T) {
+		// Enable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=true"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
 
 		tests := []struct {
 			name               string
@@ -167,8 +169,15 @@ func TestGetVersionAndRelease_WithBundleReleaseSupport(t *testing.T) {
 				}
 			})
 		}
-	} else {
-		t.Log("BundleReleaseSupport disabled - explicit release field ignored, falls back to build metadata")
+	})
+
+	t.Run("gate disabled - ignores explicit release field, uses build metadata", func(t *testing.T) {
+		// Disable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=false"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
 
 		// When gate disabled, explicit release field is ignored and parsing falls back to legacy behavior
 		bundleWithExplicitRelease := declcfg.Bundle{
@@ -192,5 +201,5 @@ func TestGetVersionAndRelease_WithBundleReleaseSupport(t *testing.T) {
 			}),
 		}
 		require.Equal(t, expected, actual)
-	}
+	})
 }

internal/operator-controller/catalogmetadata/compare/compare_test.go

@@ -2,6 +2,7 @@ package compare_test
 
 import (
 	"encoding/json"
+	"fmt"
 	"slices"
 	"testing"
 
@@ -171,27 +172,30 @@ func TestByDeprecationFunc(t *testing.T) {
 }
 
 // TestByVersionAndRelease_WithBundleReleaseSupport tests the feature-gated hybrid comparison.
-// This test detects the current feature gate state and validates the correct behavior path.
-// When BundleReleaseSupport is enabled (experimental release), it uses Bundle.Compare()
-// with build metadata fallback. When disabled (standard release), it uses legacy build metadata only.
+// Explicitly sets the gate to test both enabled and disabled paths.
 func TestByVersionAndRelease_WithBundleReleaseSupport(t *testing.T) {
-	// Registry+v1 bundles: same version, different build metadata
-	b1 := declcfg.Bundle{
-		Name: "package1.v1.0.0+1",
-		Properties: []property.Property{
-			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+1"}`)},
-		},
-	}
-	b2 := declcfg.Bundle{
-		Name: "package1.v1.0.0+2",
-		Properties: []property.Property{
-			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+2"}`)},
-		},
-	}
+	t.Run("gate enabled - uses Bundle.Compare with build metadata fallback", func(t *testing.T) {
+		// Enable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=true"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
+
+		// Registry+v1 bundles: same version, different build metadata
+		b1 := declcfg.Bundle{
+			Name: "package1.v1.0.0+1",
+			Properties: []property.Property{
+				{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+1"}`)},
+			},
+		}
+		b2 := declcfg.Bundle{
+			Name: "package1.v1.0.0+2",
+			Properties: []property.Property{
+				{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+2"}`)},
+			},
+		}
 
-	// Detect current feature gate state and test the appropriate path
-	if features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport) {
-		t.Log("BundleReleaseSupport enabled - testing hybrid comparison with build metadata fallback")
 		result := compare.ByVersionAndRelease(b1, b2)
 		assert.Positive(t, result, "Bundle.Compare() returns 0 for registry+v1, fallback to build metadata: 1.0.0+2 > 1.0.0+1")
 
@@ -210,9 +214,31 @@ func TestByVersionAndRelease_WithBundleReleaseSupport(t *testing.T) {
 		}
 		result = compare.ByVersionAndRelease(explicitR1, explicitR2)
 		assert.Positive(t, result, "2.0.0+release.2 > 2.0.0+release.1 (explicit release field)")
-	} else {
-		t.Log("BundleReleaseSupport disabled - testing legacy build metadata comparison only")
+	})
+
+	t.Run("gate disabled - uses legacy build metadata comparison only", func(t *testing.T) {
+		// Disable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=false"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
+
+		// Registry+v1 bundles: same version, different build metadata
+		b1 := declcfg.Bundle{
+			Name: "package1.v1.0.0+1",
+			Properties: []property.Property{
+				{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+1"}`)},
+			},
+		}
+		b2 := declcfg.Bundle{
+			Name: "package1.v1.0.0+2",
+			Properties: []property.Property{
+				{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+2"}`)},
+			},
+		}
+
 		result := compare.ByVersionAndRelease(b1, b2)
 		assert.Positive(t, result, "should sort by build metadata: 1.0.0+2 > 1.0.0+1")
-	}
+	})
 }

internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go

@@ -2,6 +2,7 @@ package filter_test
 
 import (
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -172,11 +173,14 @@ func TestSameVersionHigherRelease(t *testing.T) {
 		assert.False(t, f(testBundle))
 	})
 
-	// Test with explicit pkg.Release field (new bundle format) - only when feature gate enabled
+	// Test with explicit pkg.Release field (new bundle format)
 	t.Run("explicit release field - higher release matches", func(t *testing.T) {
-		if !features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport) {
-			t.Skip("BundleReleaseSupport disabled - explicit release field not parsed")
-		}
+		// Enable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=true"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
 
 		expect, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0+1")
 		require.NoError(t, err)

internal/operator-controller/catalogmetadata/filter/successors_test.go

@@ -1,6 +1,7 @@
 package filter
 
 import (
+	"fmt"
 	"slices"
 	"testing"
 
@@ -243,10 +244,7 @@ func TestLegacySuccessor(t *testing.T) {
 }
 
 // TestSuccessorsOf_WithBundleReleaseSupport tests the feature-gated successor filtering.
-// This test detects the current feature gate state and validates the correct behavior path.
-// When BundleReleaseSupport is enabled (experimental release), bundles with the same
-// version but higher release are considered valid successors. When disabled (standard deployments),
-// only explicit channel successors (replaces/skips) are recognized.
+// Explicitly sets the gate to test both enabled and disabled paths.
 func TestSuccessorsOf_WithBundleReleaseSupport(t *testing.T) {
 	channel := declcfg.Channel{
 		Entries: []declcfg.ChannelEntry{
@@ -270,15 +268,29 @@ func TestSuccessorsOf_WithBundleReleaseSupport(t *testing.T) {
 		},
 	}
 
-	predicate, err := SuccessorsOf(installedBundle, channel)
-	require.NoError(t, err)
+	t.Run("gate enabled - same-version higher-release bundles are valid successors", func(t *testing.T) {
+		// Enable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=true"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
 
-	// Detect current feature gate state and test the appropriate behavior
-	if features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport) {
-		t.Log("BundleReleaseSupport enabled - same-version higher-release bundles are valid successors")
+		predicate, err := SuccessorsOf(installedBundle, channel)
+		require.NoError(t, err)
 		assert.True(t, predicate(higherRelease), "1.0.0+2 should be a successor of 1.0.0+1 when feature gate enabled")
-	} else {
-		t.Log("BundleReleaseSupport disabled - only explicit channel successors recognized")
+	})
+
+	t.Run("gate disabled - only explicit channel successors recognized", func(t *testing.T) {
+		// Disable the feature gate for this test
+		prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.BundleReleaseSupport)
+		require.NoError(t, features.OperatorControllerFeatureGate.Set("BundleReleaseSupport=false"))
+		t.Cleanup(func() {
+			require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("BundleReleaseSupport=%t", prevEnabled)))
+		})
+
+		predicate, err := SuccessorsOf(installedBundle, channel)
+		require.NoError(t, err)
 		assert.False(t, predicate(higherRelease), "1.0.0+2 should NOT be a successor of 1.0.0+1 when feature gate disabled")
-	}
+	})
 }