fix(api): avoid worker model name with space (#4690)

close #4602 Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
ovh · Oct 24, 2019 · ef9c54a · ef9c54a
1 parent e698292
commit ef9c54a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sdk/error.go b/sdk/error.go
@@ -197,6 +197,7 @@ var (
 	ErrIntegrationtNotFound                          = Error{ID: 180, Status: http.StatusBadRequest}
 	ErrBadBrokerConfiguration                        = Error{ID: 181, Status: http.StatusBadRequest}
 	ErrInvalidJobRequirementNetworkAccess            = Error{ID: 182, Status: http.StatusBadRequest}
+	ErrInvalidWorkerModelNamePattern                 = Error{ID: 183, Status: http.StatusBadRequest}
 )
 
 var errorsAmericanEnglish = map[int]string{
@@ -236,6 +237,7 @@ var errorsAmericanEnglish = map[int]string{
 	ErrNotEnoughAdmin.ID:                                "not enough group admin left",
 	ErrInvalidProjectName.ID:                            "project name must not be empty",
 	ErrInvalidApplicationPattern.ID:                     "application name must respect '^[a-zA-Z0-9.-_-]{1,}$'",
+	ErrInvalidWorkerModelNamePattern.ID:                 "worker model name must respect '^[a-zA-Z0-9.-_-]{1,}$'",
 	ErrInvalidPipelinePattern.ID:                        "pipeline name must respect '^[a-zA-Z0-9.-_-]{1,}$'",
 	ErrNotFound.ID:                                      "resource not found",
 	ErrNoWorkerModelCapa.ID:                             "capability not found",
@@ -415,6 +417,7 @@ var errorsFrench = map[int]string{
 	ErrNotEnoughAdmin.ID:                                "pas assez d'admin restant",
 	ErrInvalidProjectName.ID:                            "nom de project vide non autorisé",
 	ErrInvalidApplicationPattern.ID:                     "nom de l'application invalide '^[a-zA-Z0-9.-_-]{1,}$'",
+	ErrInvalidWorkerModelNamePattern.ID:                 "nom du worker model invalide '^[a-zA-Z0-9.-_-]{1,}$'",
 	ErrInvalidPipelinePattern.ID:                        "nom du pipeline invalide '^[a-zA-Z0-9.-_-]{1,}$'",
 	ErrNotFound.ID:                                      "la ressource n'existe pas",
 	ErrNoWorkerModelCapa.ID:                             "la capacité n'existe pas",

diff --git a/sdk/worker_model.go b/sdk/worker_model.go
@@ -108,9 +108,10 @@ func (m *Model) Update(data Model) {
 
 // IsValid returns error if the model is not valid.
 func (m Model) IsValid() error {
-	if m.Name == "" {
-		return WrapError(ErrWrongRequest, "invalid worker model name")
+	if !NamePatternRegex.MatchString(m.Name) {
+		return WrapError(ErrInvalidWorkerModelNamePattern, "worker model name %s does not respect pattern %s", m.Name, NamePattern)
 	}
+
 	if m.GroupID == 0 {
 		return WrapError(ErrWrongRequest, "missing worker model group data")
 	}