Update error messages

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/operator-controller/rukpak/render/registryv1/validators/validator.go

@@ -105,24 +105,29 @@ func CheckPackageNameNotEmpty(rv1 *bundle.RegistryV1) []error {
 // that the bundle also only supports AllNamespaces install mode. This keeps parity with OLMv0 behavior for conversion webhooks,
 // https://github.com/operator-framework/operator-lifecycle-manager/blob/dfd0b2bea85038d3c0d65348bc812d297f16b8d2/pkg/controller/install/webhook.go#L193
 func CheckConversionWebhookSupport(rv1 *bundle.RegistryV1) []error {
-	hasConversionWebhooks := false
+	var conversionWebhookNames []string
 	for _, wh := range rv1.CSV.Spec.WebhookDefinitions {
 		if wh.Type == v1alpha1.ConversionWebhook {
-			hasConversionWebhooks = true
-			break
+			conversionWebhookNames = append(conversionWebhookNames, wh.GenerateName)
 		}
 	}
 
-	if hasConversionWebhooks {
+	if len(conversionWebhookNames) > 0 {
 		supportedInstallModes := sets.Set[v1alpha1.InstallModeType]{}
 		for _, mode := range rv1.CSV.Spec.InstallModes {
 			if mode.Supported {
 				supportedInstallModes.Insert(mode.Type)
 			}
 		}
+		slices.Sort(conversionWebhookNames)
+
 		if len(supportedInstallModes) != 1 || !supportedInstallModes.Has(v1alpha1.InstallModeTypeAllNamespaces) {
 			sortedModes := slices.Sorted(slices.Values(supportedInstallModes.UnsortedList()))
-			return []error{fmt.Errorf("bundle contains conversion webhooks and supports install modes %v - conversion webhooks are only supported for bundles that only support AllNamespaces install mode", sortedModes)}
+			errs := make([]error, len(conversionWebhookNames))
+			for i, webhookName := range conversionWebhookNames {
+				errs[i] = fmt.Errorf("bundle contains conversion webhook %q and supports install modes %v - conversion webhooks are only supported for bundles that only support AllNamespaces install mode", webhookName, sortedModes)
+			}
+			return errs
 		}
 	}
 

internal/operator-controller/rukpak/render/registryv1/validators/validator_test.go

@@ -292,15 +292,24 @@ func Test_CheckWebhookSupport(t *testing.T) {
 			name: "rejects bundles with conversion webhook definitions when they support more modes than AllNamespaces install mode",
 			bundle: &bundle.RegistryV1{
 				CSV: MakeCSV(
-					WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces, v1alpha1.InstallModeTypeSingleNamespace),
+					WithInstallModeSupportFor(v1alpha1.InstallModeTypeSingleNamespace, v1alpha1.InstallModeTypeAllNamespaces),
 					WithWebhookDefinitions(
 						v1alpha1.WebhookDescription{
-							Type: v1alpha1.ConversionWebhook,
+							GenerateName: "webhook-b",
+							Type:         v1alpha1.ConversionWebhook,
+						},
+						v1alpha1.WebhookDescription{
+							GenerateName: "webhook-a",
+							Type:         v1alpha1.ConversionWebhook,
 						},
 					),
 				),
 			},
-			expectedErrs: []error{errors.New("bundle contains conversion webhooks and supports install modes [AllNamespaces SingleNamespace] - conversion webhooks are only supported for bundles that only support AllNamespaces install mode")},
+			expectedErrs: []error{
+				// Webhook names and install modes are sorted in alphanumerical order
+				errors.New("bundle contains conversion webhook \"webhook-a\" and supports install modes [AllNamespaces SingleNamespace] - conversion webhooks are only supported for bundles that only support AllNamespaces install mode"),
+				errors.New("bundle contains conversion webhook \"webhook-b\" and supports install modes [AllNamespaces SingleNamespace] - conversion webhooks are only supported for bundles that only support AllNamespaces install mode"),
+			},
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {