chore: fix db selector read/writes (#685)

Author: adityachoudhari26

apps/workspace-engine/pkg/db/common.go

@@ -2,6 +2,8 @@ package db
 
 import (
 	"encoding/json"
+
+	"workspace-engine/pkg/oapi"
 )
 
 func parseJSONToStruct(jsonData []byte) map[string]interface{} {
@@ -16,3 +18,40 @@ func parseJSONToStruct(jsonData []byte) map[string]interface{} {
 
 	return dataMap
 }
+
+// wrapSelectorFromDB wraps a db selector in oapi JsonSelector format
+func wrapSelectorFromDB(rawMap map[string]interface{}) (*oapi.Selector, error) {
+	if rawMap == nil {
+		return nil, nil
+	}
+
+	// Wrap the raw map in JsonSelector format
+	selector := &oapi.Selector{}
+	err := selector.FromJsonSelector(oapi.JsonSelector{
+		Json: rawMap,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return selector, nil
+}
+
+// unwrapSelectorForDB unwraps a selector for database storage (database stores unwrapped selector format)
+// NOTE: CEL selectors are not currently supported - they will be written as NULL to the database.
+func unwrapSelectorForDB(selector *oapi.Selector) (map[string]interface{}, error) {
+	if selector == nil {
+		return nil, nil
+	}
+
+	// Try as JsonSelector
+	jsonSelector, err := selector.AsJsonSelector()
+	if err == nil && jsonSelector.Json != nil {
+		// Return the unwrapped map directly - pgx can handle it
+		return jsonSelector.Json, nil
+	}
+
+	// CEL selectors are not supported - return nil to store NULL in database
+	// TODO: Add support for CEL selectors in the future
+	return nil, nil
+}

apps/workspace-engine/pkg/db/deployments.go

@@ -39,6 +39,8 @@ func getDeployments(ctx context.Context, workspaceID string) ([]*oapi.Deployment
 	deployments := make([]*oapi.Deployment, 0)
 	for rows.Next() {
 		var deployment oapi.Deployment
+		var rawSelector map[string]interface{}
+
 		err := rows.Scan(
 			&deployment.Id,
 			&deployment.Name,
@@ -47,11 +49,18 @@ func getDeployments(ctx context.Context, workspaceID string) ([]*oapi.Deployment
 			&deployment.SystemId,
 			&deployment.JobAgentId,
 			&deployment.JobAgentConfig,
-			&deployment.ResourceSelector,
+			&rawSelector,
 		)
 		if err != nil {
 			return nil, err
 		}
+
+		// Wrap selector from unwrapped database format to JsonSelector format
+		deployment.ResourceSelector, err = wrapSelectorFromDB(rawSelector)
+		if err != nil {
+			return nil, err
+		}
+
 		deployments = append(deployments, &deployment)
 	}
 	if err := rows.Err(); err != nil {
@@ -74,6 +83,12 @@ const DEPLOYMENT_UPSERT_QUERY = `
 `
 
 func writeDeployment(ctx context.Context, deployment *oapi.Deployment, tx pgx.Tx) error {
+	// Unwrap selector for database storage (database stores unwrapped ResourceCondition format)
+	selectorToStore, err := unwrapSelectorForDB(deployment.ResourceSelector)
+	if err != nil {
+		return err
+	}
+
 	if _, err := tx.Exec(
 		ctx,
 		DEPLOYMENT_UPSERT_QUERY,
@@ -84,7 +99,7 @@ func writeDeployment(ctx context.Context, deployment *oapi.Deployment, tx pgx.Tx
 		deployment.SystemId,
 		deployment.JobAgentId,
 		deployment.JobAgentConfig,
-		deployment.ResourceSelector,
+		selectorToStore,
 	); err != nil {
 		return err
 	}

apps/workspace-engine/pkg/db/deployments_test.go

@@ -464,88 +464,8 @@ func TestDBDeployments_WithJsonResourceSelector(t *testing.T) {
 	}
 }
 
-func TestDBDeployments_WithCelResourceSelector(t *testing.T) {
-	workspaceID, conn := setupTestWithWorkspace(t)
-
-	tx, err := conn.Begin(t.Context())
-	if err != nil {
-		t.Fatalf("failed to begin tx: %v", err)
-	}
-	defer tx.Rollback(t.Context())
-
-	// Create a system first
-	systemID := uuid.New().String()
-	systemDescription := fmt.Sprintf("desc-%s", systemID[:8])
-	sys := &oapi.System{
-		Id:          systemID,
-		WorkspaceId: workspaceID,
-		Name:        fmt.Sprintf("test-system-%s", systemID[:8]),
-		Description: &systemDescription,
-	}
-	err = writeSystem(t.Context(), sys, tx)
-	if err != nil {
-		t.Fatalf("failed to create system: %v", err)
-	}
-
-	// Create deployment with CEL resource selector
-	deploymentID := uuid.New().String()
-	description := "test deployment with CEL selector"
-
-	// Create a CEL selector
-	resourceSelector := &oapi.Selector{}
-	celExpression := "resource.metadata.environment == 'production'"
-	err = resourceSelector.FromCelSelector(oapi.CelSelector{
-		Cel: celExpression,
-	})
-	if err != nil {
-		t.Fatalf("failed to create CEL selector: %v", err)
-	}
-
-	deployment := &oapi.Deployment{
-		Id:               deploymentID,
-		Name:             fmt.Sprintf("test-deployment-%s", deploymentID[:8]),
-		Slug:             fmt.Sprintf("test-deployment-%s", deploymentID[:8]),
-		SystemId:         systemID,
-		Description:      &description,
-		JobAgentConfig:   map[string]interface{}{},
-		ResourceSelector: resourceSelector,
-	}
-
-	err = writeDeployment(t.Context(), deployment, tx)
-	if err != nil {
-		t.Fatalf("expected no errors, got %v", err)
-	}
-
-	err = tx.Commit(t.Context())
-	if err != nil {
-		t.Fatalf("failed to commit: %v", err)
-	}
-
-	// Read back and validate
-	actualDeployments, err := getDeployments(t.Context(), workspaceID)
-	if err != nil {
-		t.Fatalf("expected no errors, got %v", err)
-	}
-
-	if len(actualDeployments) != 1 {
-		t.Fatalf("expected 1 deployment, got %d", len(actualDeployments))
-	}
-
-	actualDeployment := actualDeployments[0]
-	if actualDeployment.ResourceSelector == nil {
-		t.Fatalf("expected resource selector to be non-nil")
-	}
-
-	// Validate the selector content
-	celSelector, err := actualDeployment.ResourceSelector.AsCelSelector()
-	if err != nil {
-		t.Fatalf("expected CEL selector, got error: %v", err)
-	}
-
-	if celSelector.Cel != celExpression {
-		t.Fatalf("expected CEL expression %s, got %s", celExpression, celSelector.Cel)
-	}
-}
+// TODO: Add CEL selector tests when CEL support is implemented
+// func TestDBDeployments_WithCelResourceSelector(t *testing.T) { ... }
 
 func TestDBDeployments_UpdateResourceSelector(t *testing.T) {
 	workspaceID, conn := setupTestWithWorkspace(t)
@@ -605,20 +525,23 @@ func TestDBDeployments_UpdateResourceSelector(t *testing.T) {
 		t.Fatalf("failed to commit: %v", err)
 	}
 
-	// Update with CEL selector
+	// Update with a different JSON selector
 	tx, err = conn.Begin(t.Context())
 	if err != nil {
 		t.Fatalf("failed to begin tx: %v", err)
 	}
 	defer tx.Rollback(t.Context())
 
 	updatedSelector := &oapi.Selector{}
-	celExpression := "resource.kind == 'pod'"
-	err = updatedSelector.FromCelSelector(oapi.CelSelector{
-		Cel: celExpression,
+	err = updatedSelector.FromJsonSelector(oapi.JsonSelector{
+		Json: map[string]interface{}{
+			"type":     "kind",
+			"value":    "pod",
+			"operator": "equals",
+		},
 	})
 	if err != nil {
-		t.Fatalf("failed to create CEL selector: %v", err)
+		t.Fatalf("failed to create updated JSON selector: %v", err)
 	}
 
 	deployment.ResourceSelector = updatedSelector
@@ -648,13 +571,16 @@ func TestDBDeployments_UpdateResourceSelector(t *testing.T) {
 		t.Fatalf("expected resource selector to be non-nil")
 	}
 
-	// Validate it's now a CEL selector
-	celSelector, err := actualDeployment.ResourceSelector.AsCelSelector()
+	// Validate it's the updated JSON selector
+	jsonSelector, err := actualDeployment.ResourceSelector.AsJsonSelector()
 	if err != nil {
-		t.Fatalf("expected CEL selector, got error: %v", err)
+		t.Fatalf("expected JSON selector, got error: %v", err)
 	}
 
-	if celSelector.Cel != celExpression {
-		t.Fatalf("expected CEL expression %s, got %s", celExpression, celSelector.Cel)
+	if jsonSelector.Json["type"] != "kind" {
+		t.Fatalf("expected type 'kind', got %v", jsonSelector.Json["type"])
+	}
+	if jsonSelector.Json["value"] != "pod" {
+		t.Fatalf("expected value 'pod', got %v", jsonSelector.Json["value"])
 	}
 }

apps/workspace-engine/pkg/db/environments.go

@@ -39,18 +39,27 @@ func getEnvironments(ctx context.Context, workspaceID string) ([]*oapi.Environme
 	for rows.Next() {
 		var environment oapi.Environment
 		var createdAt time.Time
+		var rawSelector map[string]interface{}
+
 		err := rows.Scan(
 			&environment.Id,
 			&environment.Name,
 			&environment.SystemId,
 			&createdAt,
 			&environment.Description,
-			&environment.ResourceSelector,
+			&rawSelector,
 		)
 		if err != nil {
 			return nil, err
 		}
 		environment.CreatedAt = createdAt.Format(time.RFC3339)
+
+		// Wrap selector from unwrapped database format to JsonSelector format
+		environment.ResourceSelector, err = wrapSelectorFromDB(rawSelector)
+		if err != nil {
+			return nil, err
+		}
+
 		environments = append(environments, &environment)
 	}
 	if err := rows.Err(); err != nil {
@@ -70,14 +79,20 @@ const ENVIRONMENT_UPSERT_QUERY = `
 `
 
 func writeEnvironment(ctx context.Context, environment *oapi.Environment, tx pgx.Tx) error {
+	// Unwrap selector for database storage (database stores unwrapped ResourceCondition format)
+	selectorToStore, err := unwrapSelectorForDB(environment.ResourceSelector)
+	if err != nil {
+		return err
+	}
+
 	if _, err := tx.Exec(
 		ctx,
 		ENVIRONMENT_UPSERT_QUERY,
 		environment.Id,
 		environment.Name,
 		environment.SystemId,
 		environment.Description,
-		environment.ResourceSelector,
+		selectorToStore,
 	); err != nil {
 		return err
 	}