fixup! fixup! fixup! chore: consistent error

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

Author: akurinnoy

controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

@@ -126,9 +126,10 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(ctx context.Context, req ctrl.
 	}
 
 	workspaceMeta := solvers.DevWorkspaceMetadata{
-		DevWorkspaceId: instance.Spec.DevWorkspaceId,
-		Namespace:      instance.Namespace,
-		PodSelector:    instance.Spec.PodSelector,
+		DevWorkspaceId:   instance.Spec.DevWorkspaceId,
+		DevWorkspaceName: instance.Name,
+		Namespace:        instance.Namespace,
+		PodSelector:      instance.Spec.PodSelector,
 	}
 
 	restrictedAccess, setRestrictedAccess := instance.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]
@@ -152,7 +153,7 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(ctx context.Context, req ctrl.
 
 		var conflict *solvers.ServiceConflictError
 		if errors.As(err, &conflict) {
-			reqLogger.Error(conflict, "Routing controller detected a service conflict", "serviceName", conflict.Reason)
+			reqLogger.Error(conflict, "Routing controller detected a service conflict", "endpointName", conflict.EndpointName, "workspaceName", conflict.WorkspaceName)
 			return reconcile.Result{}, r.markRoutingFailed(instance, fmt.Sprintf("Unable to provision networking for DevWorkspace: %s", conflict))
 		}
 

controllers/controller/devworkspacerouting/solvers/common.go

@@ -34,9 +34,10 @@ import (
 )
 
 type DevWorkspaceMetadata struct {
-	DevWorkspaceId string
-	Namespace      string
-	PodSelector    map[string]string
+	DevWorkspaceId   string
+	DevWorkspaceName string
+	Namespace        string
+	PodSelector      map[string]string
 }
 
 // GetDiscoverableServicesForEndpoints converts the endpoint list into a set of services, each corresponding to a single discoverable
@@ -61,7 +62,8 @@ func GetDiscoverableServicesForEndpoints(endpoints map[string]controllerv1alpha1
 				} else {
 					if existingService.Labels[constants.DevWorkspaceIDLabel] != meta.DevWorkspaceId {
 						return nil, &ServiceConflictError{
-							EndpointName: endpoint.Name,
+							EndpointName:  endpoint.Name,
+							WorkspaceName: existingService.Labels[constants.DevWorkspaceNameLabel],
 						}
 					}
 				}
@@ -77,7 +79,8 @@ func GetDiscoverableServicesForEndpoints(endpoints map[string]controllerv1alpha1
 						Name:      serviceName,
 						Namespace: meta.Namespace,
 						Labels: map[string]string{
-							constants.DevWorkspaceIDLabel: meta.DevWorkspaceId,
+							constants.DevWorkspaceIDLabel:   meta.DevWorkspaceId,
+							constants.DevWorkspaceNameLabel: meta.DevWorkspaceName,
 						},
 						Annotations: map[string]string{
 							constants.DevWorkspaceDiscoverableServiceAnnotation: "true",

controllers/controller/devworkspacerouting/solvers/common_test.go

@@ -44,8 +44,9 @@ func TestGetDiscoverableServicesForEndpoints(t *testing.T) {
 	}
 
 	meta := DevWorkspaceMetadata{
-		DevWorkspaceId: "current-workspace",
-		Namespace:      "test-namespace",
+		DevWorkspaceId:   "current-workspace-id",
+		DevWorkspaceName: "current-workspace",
+		Namespace:        "test-namespace",
 	}
 
 	tests := []struct {
@@ -68,14 +69,15 @@ func TestGetDiscoverableServicesForEndpoints(t *testing.T) {
 						Name:      "test-endpoint",
 						Namespace: "test-namespace",
 						Labels: map[string]string{
-							constants.DevWorkspaceIDLabel: "other-workspace",
+							constants.DevWorkspaceIDLabel:   "other-workspace-id",
+							constants.DevWorkspaceNameLabel: "other-workspace",
 						},
 					},
 				},
 			},
 			expectErr:     true,
 			expectErrType: &ServiceConflictError{},
-			expectMsg:     "conflicts with existing service",
+			expectMsg:     "discoverable endpoint 'test-endpoint' is already in use by workspace 'other-workspace'",
 		},
 		{
 			name: "Existing service with same owner (reconciliation)",
@@ -85,7 +87,8 @@ func TestGetDiscoverableServicesForEndpoints(t *testing.T) {
 						Name:      "test-endpoint",
 						Namespace: "test-namespace",
 						Labels: map[string]string{
-							constants.DevWorkspaceIDLabel: "current-workspace",
+							constants.DevWorkspaceIDLabel:   "current-workspace-id",
+							constants.DevWorkspaceNameLabel: "current-workspace",
 						},
 					},
 				},
@@ -100,7 +103,8 @@ func TestGetDiscoverableServicesForEndpoints(t *testing.T) {
 						Name:      "test-endpoint",
 						Namespace: "other-namespace",
 						Labels: map[string]string{
-							constants.DevWorkspaceIDLabel: "other-workspace",
+							constants.DevWorkspaceIDLabel:   "other-workspace-id",
+							constants.DevWorkspaceNameLabel: "other-workspace",
 						},
 					},
 				},
@@ -175,8 +179,9 @@ func TestGetDiscoverableServicesForEndpoints_MultipleEndpoints(t *testing.T) {
 	}
 
 	meta := DevWorkspaceMetadata{
-		DevWorkspaceId: "current-workspace",
-		Namespace:      "test-namespace",
+		DevWorkspaceId:   "current-workspace-id",
+		DevWorkspaceName: "current-workspace",
+		Namespace:        "test-namespace",
 		PodSelector: map[string]string{
 			constants.DevWorkspaceIDLabel: "current-workspace",
 		},
@@ -203,7 +208,8 @@ func TestGetDiscoverableServicesForEndpoints_MultipleEndpoints(t *testing.T) {
 				Name:      "postgresql",
 				Namespace: "test-namespace",
 				Labels: map[string]string{
-					constants.DevWorkspaceIDLabel: "other-workspace",
+					constants.DevWorkspaceIDLabel:   "other-workspace-id",
+					constants.DevWorkspaceNameLabel: "other-workspace",
 				},
 			},
 		}