Move validation under create project method

Signed-off-by: hiteshwani29 <hiteshwani29@gmail.com>
paralus · Mar 1, 2023 · a53757c · a53757c
1 parent b38f125
commit a53757c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/pkg/service/project.go b/pkg/service/project.go
@@ -10,6 +10,7 @@ import (
 	cdao "github.com/paralus/paralus/internal/cluster/dao"
 	"github.com/paralus/paralus/internal/dao"
 	"github.com/paralus/paralus/internal/models"
+	"github.com/paralus/paralus/pkg/common"
 	authzv1 "github.com/paralus/paralus/proto/types/authz"
 	commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
 	v3 "github.com/paralus/paralus/proto/types/commonpb/v3"
@@ -60,8 +61,13 @@ func (s *projectService) Create(ctx context.Context, project *systemv3.Project)
 		return nil, fmt.Errorf("missing organization in metadata")
 	}
 
+	err, matched := MatchStringToRegx(project.Metadata.GetName(), common.PROJECT_NAME_REGEX)
+	if err != nil || !matched {
+		return nil, fmt.Errorf("cluster name contains invalid characters. valid characters are `%s`",common.PROJECT_NAME_REGEX)
+	}
+
 	var org models.Organization
-	_, err := dao.GetByName(ctx, s.db, project.Metadata.Organization, &org)
+	_, err = dao.GetByName(ctx, s.db, project.Metadata.Organization, &org)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/service/utils.go b/pkg/service/utils.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"regexp"
 
 	"github.com/google/uuid"
 	"github.com/paralus/paralus/internal/dao"
@@ -33,3 +34,15 @@ func IsInternalRequest(ctx context.Context) bool {
 	b, ok := v.(bool)
 	return ok && b
 }
+
+func MatchStringToRegx(matchString, regex string) (error, bool) {
+	re, err := regexp.Compile(regex)
+	if err != nil {
+		_log.Errorf("Error while commpling regex %s : %s", regex, err.Error())
+		return err, false
+	}
+	if re.MatchString(matchString) {
+		return nil, true
+	}
+	return nil, false
+}
diff --git a/server/project.go b/server/project.go
@@ -2,9 +2,7 @@ package server
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/paralus/paralus/pkg/common"
 	"github.com/paralus/paralus/pkg/service"
 	systemrpc "github.com/paralus/paralus/proto/rpc/system"
 	v3 "github.com/paralus/paralus/proto/types/commonpb/v3"
@@ -35,11 +33,7 @@ func updateProjectStatus(req *systempbv3.Project, resp *systempbv3.Project, err
 }
 
 func (s *projectServer) CreateProject(ctx context.Context, req *systempbv3.Project) (*systempbv3.Project, error) {
-
-	err, matched := MatchStringToRegx(req.Metadata.GetName(), common.PROJECT_NAME_REGEX)
-	if err != nil || !matched {
-		return nil, fmt.Errorf("invalid project name. Valid project name must be like demo-proj-test3")
-	}
+
 	resp, err := s.Create(ctx, req)
 	return updateProjectStatus(req, resp, err), err
 }

diff --git a/server/utils.go b/server/utils.go
@@ -1,8 +1,6 @@
 package server
 
 import (
-	"regexp"
-
 	v3 "github.com/paralus/paralus/proto/types/commonpb/v3"
 
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -20,15 +18,3 @@ func getStatus(err error) *v3.Status {
 		ConditionStatus: v3.ConditionStatus_StatusOK,
 	}
 }
-
-func MatchStringToRegx(matchString, regex string) (error, bool) {
-	re, err := regexp.Compile(regex)
-	if err != nil {
-		_log.Errorf("Error while commpling regex %s : %s", regex, err.Error())
-		return err, false
-	}
-	if re.MatchString(matchString) {
-		return nil, true
-	}
-	return nil, false
-}