Merge remote-tracking branch 'origin/vc-empty-ns-fix' into vc-empty-ns-fix

Author: prakash100198

internal/util/ValidateUtil.go

@@ -115,6 +115,10 @@ func IntValidator() (*validator.Validate, error) {
 	if err != nil {
 		return v, err
 	}
+	err = v.RegisterValidation("validate-devtron-entity-name", validateDevtronEntityName)
+	if err != nil {
+		return v, err
+	}
 	return v, err
 }
 
@@ -174,3 +178,8 @@ func validateSSOConfigName(fl validator.FieldLevel) bool {
 	return false
 }
 
+func validateDevtronEntityName(fl validator.FieldLevel) bool {
+	hostnameRegexString := `^[a-z0-9]+(-[a-z0-9]+)*$`
+	hostnameRegexRFC952 := regexp.MustCompile(hostnameRegexString)
+	return hostnameRegexRFC952.MatchString(fl.Field().String())
+}

pkg/team/bean/bean.go

@@ -6,7 +6,7 @@ import (
 
 type TeamRequest struct {
 	Id        int       `json:"id,omitempty" validate:"number"`
-	Name      string    `json:"name,omitempty" validate:"required"`
+	Name      string    `json:"name,omitempty" validate:"required,max=20,validate-devtron-entity-name"`
 	Active    bool      `json:"active"`
 	UserId    int32     `json:"-"`
 	CreatedOn time.Time `json:"-"`