fix lint and sanity errors

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

Author: rashmigottipati

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

@@ -211,18 +211,18 @@ func TestByVersionAndRelease_WithCompositeVersionComparison(t *testing.T) {
 	t.Run("feature gate disabled - uses build metadata", func(t *testing.T) {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=false", features.CompositeVersionComparison)))
 		result := compare.ByVersionAndRelease(registryV1_b1, registryV1_b2)
-		assert.Greater(t, result, 0, "should sort by build metadata: 1.0.0+2 > 1.0.0+1")
+		assert.Positive(t, result, "should sort by build metadata: 1.0.0+2 > 1.0.0+1")
 	})
 
 	t.Run("feature gate enabled - registry+v1 bundles use build metadata fallback", func(t *testing.T) {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=true", features.CompositeVersionComparison)))
 		result := compare.ByVersionAndRelease(registryV1_b1, registryV1_b2)
-		assert.Greater(t, result, 0, "should fallback to build metadata: 1.0.0+2 > 1.0.0+1")
+		assert.Positive(t, result, "should fallback to build metadata: 1.0.0+2 > 1.0.0+1")
 	})
 
 	t.Run("feature gate enabled - new format bundles use .spec.release", func(t *testing.T) {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=true", features.CompositeVersionComparison)))
 		result := compare.ByVersionAndRelease(newFormat_b1, newFormat_b2)
-		assert.Greater(t, result, 0, "should use .spec.release: release=2 > release=1")
+		assert.Positive(t, result, "should use .spec.release: release=2 > release=1")
 	})
 }

internal/operator-controller/features/features.go

@@ -2,7 +2,7 @@ package features
 
 import (
 	"github.com/go-logr/logr"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/component-base/featuregate"
 
 	featuregatesutil "github.com/operator-framework/operator-controller/internal/shared/util/featuregates"
@@ -17,9 +17,9 @@ const (
 	WebhookProviderCertManager        featuregate.Feature = "WebhookProviderCertManager"
 	WebhookProviderOpenshiftServiceCA featuregate.Feature = "WebhookProviderOpenshiftServiceCA"
 	HelmChartSupport                  featuregate.Feature = "HelmChartSupport"
-	BoxcutterRuntime           featuregate.Feature = "BoxcutterRuntime"
-	DeploymentConfig           featuregate.Feature = "DeploymentConfig"
-	CompositeVersionComparison featuregate.Feature = "CompositeVersionComparison"
+	BoxcutterRuntime                  featuregate.Feature = "BoxcutterRuntime"
+	DeploymentConfig                  featuregate.Feature = "DeploymentConfig"
+	CompositeVersionComparison        featuregate.Feature = "CompositeVersionComparison"
 )
 
 var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
@@ -106,7 +106,7 @@ var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.Feature
 var OperatorControllerFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()
 
 func init() {
-	utilruntime.Must(OperatorControllerFeatureGate.Add(operatorControllerFeatureGates))
+	runtime.Must(OperatorControllerFeatureGate.Add(operatorControllerFeatureGates))
 }
 
 // LogFeatureGateStates logs the state of all known feature gates.