feat(project): validate before create

aybabtme · aybabtme · commit 3bd4936c47ed · 2025-10-28T14:54:08.000+09:00
diff --git a/internal/localproject/dashboard_lifecycle_test.go b/internal/localproject/dashboard_lifecycle_test.go
@@ -2047,10 +2047,11 @@ func TestProjectDirectoryConflictWarnings(t *testing.T) {
 
 	type operation string
 	const (
-		opGet    operation = "GetProject"
-		opCreate operation = "CreateProject"
-		opUpdate operation = "UpdateProject"
-		opList   operation = "ListProject"
+		opGet      operation = "GetProject"
+		opCreate   operation = "CreateProject"
+		opValidate operation = "ValidateProject"
+		opUpdate   operation = "UpdateProject"
+		opList     operation = "ListProject"
 	)
 
 	tests := []struct {
@@ -2120,7 +2121,7 @@ func TestProjectDirectoryConflictWarnings(t *testing.T) {
 		},
 	}
 
-	operations := []operation{opGet, opCreate, opUpdate, opList}
+	operations := []operation{opGet, opCreate, opValidate, opUpdate, opList}
 
 	for _, tt := range tests {
 		for _, op := range operations {
@@ -2129,10 +2130,10 @@ func TestProjectDirectoryConflictWarnings(t *testing.T) {
 				ctx := context.Background()
 				fs := memfs.New()
 
-				// For CreateProject, we need one less project in the initial config
+				// For CreateProject and ValidateProject, we need one less project in the initial config
 				initProjects := tt.initProjects
-				if op == opCreate {
-					// Find the project we're going to create and exclude it from init
+				if op == opCreate || op == opValidate {
+					// Find the project we're going to create/validate and exclude it from init
 					var filtered []*typesv1.ProjectsConfig_Project
 					for _, proj := range tt.initProjects {
 						if proj.Name != tt.checkProject {
@@ -2185,6 +2186,30 @@ func TestProjectDirectoryConflictWarnings(t *testing.T) {
 					require.NotNil(t, resp.Project)
 					project = resp.Project
 
+				case opValidate:
+					// Find the project spec we're validating
+					var projectToValidate *typesv1.ProjectsConfig_Project
+					for _, proj := range tt.initProjects {
+						if proj.Name == tt.checkProject {
+							projectToValidate = proj
+							break
+						}
+					}
+					require.NotNil(t, projectToValidate, "test case must include the project being validated")
+
+					resp, err := db.ValidateProject(ctx, &projectv1.ValidateProjectRequest{
+						Spec: &typesv1.ProjectSpec{
+							Name:    projectToValidate.Name,
+							Pointer: projectToValidate.Pointer,
+						},
+					})
+					require.NoError(t, err)
+					require.NotNil(t, resp.Status)
+					// Create a dummy project with the returned status for consistent assertion logic
+					project = &typesv1.Project{
+						Status: resp.Status,
+					}
+
 				case opUpdate:
 					// Find the project spec to update
 					var projectToUpdate *typesv1.ProjectsConfig_Project
diff --git a/internal/localproject/watch.go b/internal/localproject/watch.go
@@ -206,13 +206,62 @@ func (wt *watch) CreateProject(ctx context.Context, req *projectv1.CreateProject
 		return storage.getProject(ctx, ptr.Name, ptr.Pointer, func(p *typesv1.Project) error {
 			out = p
 			// Enrich project with all warnings
-			wt.enrichProjectWithWarnings(p, ptr)
+			wt.enrichProjectWithWarnings(p.Status, ptr)
 			return nil
 		})
 	})
 	return &projectv1.CreateProjectResponse{Project: out}, err
 }
 
+func (wt *watch) ValidateProject(ctx context.Context, req *projectv1.ValidateProjectRequest) (*projectv1.ValidateProjectResponse, error) {
+	name := req.Spec.Name
+
+	var status *typesv1.ProjectStatus
+	err := func() error {
+		wt.mu.Lock()
+		defer wt.mu.Unlock()
+		cfg, err := wt.cfg.Reload()
+		if err != nil {
+			return fmt.Errorf("reading config file: %v", err)
+		}
+		wt.cfg = cfg
+		if cfg.Runtime == nil {
+			cfg.Runtime = &typesv1.RuntimeConfig{}
+		}
+		if cfg.Runtime.ExperimentalFeatures == nil {
+			cfg.Runtime.ExperimentalFeatures = &typesv1.RuntimeConfig_ExperimentalFeatures{}
+		}
+		if cfg.Runtime.ExperimentalFeatures.Projects == nil {
+			cfg.Runtime.ExperimentalFeatures.Projects = &typesv1.ProjectsConfig{}
+		}
+		projects := cfg.Runtime.ExperimentalFeatures.Projects
+
+		sp := &typesv1.ProjectsConfig_Project{
+			Name:    name,
+			Pointer: req.Spec.Pointer,
+		}
+
+		storage, err := wt.storageForPointer(req.Spec.Pointer)
+		if err != nil {
+			return err
+		}
+		// Run the same validation as CreateProject
+		if err := wt.validateProjectPointer(ctx, projects.Projects, name, sp, storage); err != nil {
+			return err
+		}
+
+		// Create a status object to compute warnings using the same code path
+		status = &typesv1.ProjectStatus{}
+		wt.enrichProjectWithWarnings(status, sp)
+		return nil
+	}()
+	if err != nil {
+		return nil, err
+	}
+
+	return &projectv1.ValidateProjectResponse{Status: status}, nil
+}
+
 func (wt *watch) validateProjectPointer(ctx context.Context, projects []*typesv1.ProjectsConfig_Project, name string, sp *typesv1.ProjectsConfig_Project, storage projectStorage) error {
 	if name == "" {
 		return connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("project name cannot be empty"))
@@ -265,7 +314,7 @@ func (wt *watch) UpdateProject(ctx context.Context, req *projectv1.UpdateProject
 		return storage.getProject(ctx, ptr.Name, ptr.Pointer, func(p *typesv1.Project) error {
 			out = p
 			// Enrich project with all warnings
-			wt.enrichProjectWithWarnings(p, ptr)
+			wt.enrichProjectWithWarnings(p.Status, ptr)
 			return nil
 		})
 	})
@@ -311,7 +360,7 @@ func (wt *watch) GetProject(ctx context.Context, req *projectv1.GetProjectReques
 			alertGroups = ag
 
 			// Enrich project with all warnings
-			wt.enrichProjectWithWarnings(p, ptr)
+			wt.enrichProjectWithWarnings(p.Status, ptr)
 
 			return nil
 		})
@@ -360,7 +409,7 @@ func (wt *watch) ListProject(ctx context.Context, req *projectv1.ListProjectRequ
 				}
 				return storage.getProject(ctx, sp.Name, sp.Pointer, func(p *typesv1.Project) error {
 					// Enrich project with all warnings
-					wt.enrichProjectWithWarnings(p, sp)
+					wt.enrichProjectWithWarnings(p.Status, sp)
 					out = append(out, &projectv1.ListProjectResponse_ListItem{Project: p})
 					return nil
 				})
@@ -720,33 +769,24 @@ func sharedAlertDirWarning(otherProjectName, dirPath string) string {
 	return fmt.Sprintf("Project %q shares the same alert directory (%s). Changes in one project will affect the other.", otherProjectName, dirPath)
 }
 
-// enrichProjectWithWarnings populates all warnings for a project
+// enrichProjectWithWarnings populates all warnings for a project status
 // This should be called whenever returning a project to ensure warnings are up-to-date
-func (wt *watch) enrichProjectWithWarnings(project *typesv1.Project, ptr *typesv1.ProjectsConfig_Project) {
-	wt.addDirectoryConflictWarnings(project, ptr)
+func (wt *watch) enrichProjectWithWarnings(status *typesv1.ProjectStatus, ptr *typesv1.ProjectsConfig_Project) {
+	wt.addDirectoryConflictWarnings(status, ptr)
 	// Future warning checks can be added here
 }
 
-// addDirectoryConflictWarnings checks if this project shares directories with other projects
-// and adds warnings to the project status if conflicts are found
-func (wt *watch) addDirectoryConflictWarnings(project *typesv1.Project, currentPtr *typesv1.ProjectsConfig_Project) {
+// computeProjectWarnings computes warnings for a project without modifying it
+// Used by ValidateProject to preview warnings before creating the project
+func (wt *watch) computeProjectWarnings(currentPtr *typesv1.ProjectsConfig_Project, allProjects []*typesv1.ProjectsConfig_Project) []string {
 	// Only check for localhost projects
 	localhost := currentPtr.Pointer.GetLocalhost()
 	if localhost == nil {
-		return
-	}
-
-	cfg, err := wt.cfg.Reload()
-	if err != nil {
-		return // Can't check, skip
-	}
-
-	if cfg.Runtime == nil || cfg.Runtime.ExperimentalFeatures == nil || cfg.Runtime.ExperimentalFeatures.Projects == nil {
-		return
+		return nil
 	}
 
 	var conflicts []string
-	for _, otherProj := range cfg.Runtime.ExperimentalFeatures.Projects.Projects {
+	for _, otherProj := range allProjects {
 		if otherProj.Name == currentPtr.Name {
 			continue // Skip self
 		}
@@ -771,8 +811,24 @@ func (wt *watch) addDirectoryConflictWarnings(project *typesv1.Project, currentP
 		}
 	}
 
+	return conflicts
+}
+
+// addDirectoryConflictWarnings checks if this project shares directories with other projects
+// and adds warnings to the project status if conflicts are found
+func (wt *watch) addDirectoryConflictWarnings(status *typesv1.ProjectStatus, currentPtr *typesv1.ProjectsConfig_Project) {
+	cfg, err := wt.cfg.Reload()
+	if err != nil {
+		return // Can't check, skip
+	}
+
+	if cfg.Runtime == nil || cfg.Runtime.ExperimentalFeatures == nil || cfg.Runtime.ExperimentalFeatures.Projects == nil {
+		return
+	}
+
+	conflicts := wt.computeProjectWarnings(currentPtr, cfg.Runtime.ExperimentalFeatures.Projects.Projects)
 	if len(conflicts) > 0 {
-		project.Status.Warnings = append(project.Status.Warnings, conflicts...)
+		status.Warnings = append(status.Warnings, conflicts...)
 	}
 }
 
diff --git a/internal/localstate/inmem.go b/internal/localstate/inmem.go
@@ -120,6 +120,23 @@ func (db *Mem) CreateProject(ctx context.Context, req *projectv1.CreateProjectRe
 	return &projectv1.CreateProjectResponse{Project: out}, nil
 }
 
+func (db *Mem) ValidateProject(ctx context.Context, req *projectv1.ValidateProjectRequest) (*projectv1.ValidateProjectResponse, error) {
+	db.mu.Lock()
+	defer db.mu.Unlock()
+
+	// Run the same validation as CreateProject
+	for _, project := range db.projects {
+		if project.project.Spec.Name == req.Spec.Name {
+			return nil, connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("project %q already uses the name %q", project.project.Meta.Id, req.Spec.Name))
+		}
+	}
+
+	// In-memory projects don't have directory conflicts, so return empty status
+	return &projectv1.ValidateProjectResponse{
+		Status: &typesv1.ProjectStatus{},
+	}, nil
+}
+
 func (db *Mem) SyncProject(ctx context.Context, req *projectv1.SyncProjectRequest) (*projectv1.SyncProjectResponse, error) {
 	var (
 		out         *typesv1.Project
diff --git a/internal/localstate/localstate.go b/internal/localstate/localstate.go
@@ -10,6 +10,7 @@ import (
 
 type DB interface {
 	CreateProject(context.Context, *projectv1.CreateProjectRequest) (*projectv1.CreateProjectResponse, error)
+	ValidateProject(context.Context, *projectv1.ValidateProjectRequest) (*projectv1.ValidateProjectResponse, error)
 	GetProject(context.Context, *projectv1.GetProjectRequest) (*projectv1.GetProjectResponse, error)
 	SyncProject(context.Context, *projectv1.SyncProjectRequest) (*projectv1.SyncProjectResponse, error)
 	UpdateProject(context.Context, *projectv1.UpdateProjectRequest) (*projectv1.UpdateProjectResponse, error)
diff --git a/internal/localsvc/svc.go b/internal/localsvc/svc.go
@@ -663,6 +663,15 @@ func (svc *Service) CreateProject(ctx context.Context, req *connect.Request[proj
 	return connect.NewResponse(out), nil
 }
 
+func (svc *Service) ValidateProject(ctx context.Context, req *connect.Request[projectv1.ValidateProjectRequest]) (*connect.Response[projectv1.ValidateProjectResponse], error) {
+	msg := req.Msg
+	out, err := svc.db.ValidateProject(ctx, msg)
+	if err != nil {
+		return nil, err
+	}
+	return connect.NewResponse(out), nil
+}
+
 func (svc *Service) GetProject(ctx context.Context, req *connect.Request[projectv1.GetProjectRequest]) (*connect.Response[projectv1.GetProjectResponse], error) {
 	msg := req.Msg
 	out, err := svc.db.GetProject(ctx, msg)
