Use error type rather than strings

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

internal/controllers/clusterextension_controller.go

@@ -80,6 +80,37 @@ import (
 	"github.com/operator-framework/operator-controller/internal/labels"
 )
 
+// No Package error type
+
+type NoPackageError struct {
+	message string
+}
+
+func NewNoPackageError(m string) NoPackageError {
+	return NoPackageError{
+		message: m,
+	}
+}
+func (e NoPackageError) Error() string {
+	return e.message
+}
+
+// Invalid Version Range error type
+
+type InvalidVersionRangeError struct {
+	origErr error
+}
+
+func NewInvalidVersionRangeError(e error) InvalidVersionRangeError {
+	return InvalidVersionRangeError{
+		origErr: e,
+	}
+}
+
+func (e InvalidVersionRangeError) Error() string {
+	return e.origErr.Error()
+}
+
 // ClusterExtensionReconciler reconciles a ClusterExtension object
 type ClusterExtensionReconciler struct {
 	client.Client
@@ -184,11 +215,11 @@ func (r *ClusterExtensionReconciler) handleResolutionErrors(ext *ocv1alpha1.Clus
 	if errors.As(err, &aggErrs) {
 		for _, err := range aggErrs.Errors() {
 			errorMessage := err.Error()
-			if strings.Contains(errorMessage, "no package") {
+			if errors.As(err, &NoPackageError{}) {
 				// Handle no package found errors, potentially setting status conditions
 				setResolvedStatusConditionFailed(&ext.Status.Conditions, errorMessage, ext.Generation)
 				ensureAllConditionsWithReason(ext, "ResolutionFailed", errorMessage)
-			} else if strings.Contains(errorMessage, "invalid version range") {
+			} else if errors.As(err, &InvalidVersionRangeError{}) {
 				// Handle invalid version range errors, potentially setting status conditions
 				setResolvedStatusConditionFailed(&ext.Status.Conditions, errorMessage, ext.Generation)
 				ensureAllConditionsWithReason(ext, "ResolutionFailed", errorMessage)
@@ -428,7 +459,7 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1
 	if versionRange != "" {
 		vr, err := mmsemver.NewConstraint(versionRange)
 		if err != nil {
-			return nil, utilerrors.NewAggregate([]error{fmt.Errorf("invalid version range '%s': %w", versionRange, err)})
+			return nil, NewInvalidVersionRangeError(fmt.Errorf("invalid version range %q: %w", versionRange, err))
 		}
 		predicates = append(predicates, catalogfilter.InMastermindsSemverRange(vr))
 	}
@@ -453,16 +484,18 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1
 		upgradeErrorPrefix = fmt.Sprintf("error upgrading from currently installed version %q: ", installedBundleVersion.String())
 	}
 	if len(resultSet) == 0 {
+		var msg string
 		switch {
 		case versionRange != "" && channelName != "":
-			return nil, fmt.Errorf("%sno package %q matching version %q in channel %q found", upgradeErrorPrefix, packageName, versionRange, channelName)
+			msg = fmt.Sprintf("%sno package %q matching version %q in channel %q found", upgradeErrorPrefix, packageName, versionRange, channelName)
 		case versionRange != "":
-			return nil, fmt.Errorf("%sno package %q matching version %q found", upgradeErrorPrefix, packageName, versionRange)
+			msg = fmt.Sprintf("%sno package %q matching version %q found", upgradeErrorPrefix, packageName, versionRange)
 		case channelName != "":
-			return nil, fmt.Errorf("%sno package %q in channel %q found", upgradeErrorPrefix, packageName, channelName)
+			msg = fmt.Sprintf("%sno package %q in channel %q found", upgradeErrorPrefix, packageName, channelName)
 		default:
-			return nil, fmt.Errorf("%sno package %q found", upgradeErrorPrefix, packageName)
+			msg = fmt.Sprintf("%sno package %q found", upgradeErrorPrefix, packageName)
 		}
+		return nil, NewNoPackageError(msg)
 	}
 
 	sort.SliceStable(resultSet, func(i, j int) bool {