fixup! chore: consistent error

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

controllers/controller/devworkspacerouting/solvers/common.go

@@ -17,7 +17,6 @@ package solvers
 
 import (
 	"context"
-	"fmt"
 
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/common"
@@ -62,7 +61,7 @@ func GetDiscoverableServicesForEndpoints(endpoints map[string]controllerv1alpha1
 				} else {
 					if existingService.Labels[constants.DevWorkspaceIDLabel] != meta.DevWorkspaceId {
 						return nil, &ServiceConflictError{
-							Reason: fmt.Sprintf("discoverable endpoint %s conflicts with existing service", endpoint.Name),
+							EndpointName: endpoint.Name,
 						}
 					}
 				}

controllers/controller/devworkspacerouting/solvers/errors.go

@@ -17,6 +17,7 @@ package solvers
 
 import (
 	"errors"
+	"fmt"
 	"time"
 )
 
@@ -27,15 +28,15 @@ var _ error = (*ServiceConflictError)(nil)
 // ServiceConflictError is returned when a discoverable endpoint has a name that is already in use by
 // another DevWorkspace's service.
 type ServiceConflictError struct {
-	Reason string
+	EndpointName string
+	WorkspaceName string
 }
 
 func (e *ServiceConflictError) Error() string {
-	reason := "<no reason given>"
-	if len(e.Reason) > 0 {
-		reason = e.Reason
+	if (e.WorkspaceName == "") {
+		return fmt.Sprintf("discoverable endpoint '%s' is already in use by another workspace", e.EndpointName)
 	}
-	return "workspace routing has a service conflict: " + reason
+	return fmt.Sprintf("discoverable endpoint '%s' is already in use by workspace '%s'", e.EndpointName, e.WorkspaceName)
 }
 
 // RoutingNotSupported is used by the solvers when they supported the routingclass of the workspace they've been asked to route

webhook/workspace/handler/validate.go

@@ -124,7 +124,8 @@ func (h *WebhookHandler) validateEndpoints(ctx context.Context, workspace *dwv2.
 				for _, endpoint := range component.Container.Endpoints {
 					if discoverableEndpoints[endpoint.Name] {
 						return &solvers.ServiceConflictError{
-							Reason: fmt.Sprintf("discoverable endpoint '%s' is already in use by workspace '%s'", endpoint.Name, otherWorkspace.Name),
+							EndpointName: endpoint.Name,
+							WorkspaceName: otherWorkspace.Name,
 						}
 					}
 				}