test: for validating trigger name

api/config.go

@@ -1,10 +1,11 @@
 package api
 
 import (
-	"github.com/moira-alert/moira/limits"
 	"net/http"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 )
 

api/dto/triggers.go

@@ -20,8 +20,19 @@ import (
 
 var targetNameRegex = regexp.MustCompile("^t\\d+$")
 
-// ErrBadAloneMetricName is used when any key in map TriggerModel.AloneMetric doesn't match targetNameRegex.
-var ErrBadAloneMetricName = fmt.Errorf("alone metrics' target name must match the pattern: ^t\\d+$, for example: 't1'")
+var (
+	// ErrBadAloneMetricName is used when any key in map TriggerModel.AloneMetric doesn't match targetNameRegex.
+	ErrBadAloneMetricName = fmt.Errorf("alone metrics' target name must match the pattern: ^t\\d+$, for example: 't1'")
+
+	// ErrTargetsRequired is returned when there is no targets in Trigger.
+	ErrTargetsRequired = fmt.Errorf("targets is required")
+
+	// ErrTagsRequired is returned when there is no tags in Trigger.
+	ErrTagsRequired = fmt.Errorf("tags is required")
+
+	// ErrTriggerNameRequired is returned when there is empty Name in Trigger.
+	ErrTriggerNameRequired = fmt.Errorf("trigger name is required")
+)
 
 // TODO(litleleprikon): Remove after https://github.com/moira-alert/moira/issues/550 will be resolved.
 var asteriskPattern = "*"
@@ -153,21 +164,22 @@ func CreateTriggerModel(trigger *moira.Trigger) TriggerModel {
 func (trigger *Trigger) Bind(request *http.Request) error {
 	trigger.Tags = normalizeTags(trigger.Tags)
 	if len(trigger.Targets) == 0 {
-		return api.ErrInvalidRequestContent{ValidationError: fmt.Errorf("targets is required")}
+		return api.ErrInvalidRequestContent{ValidationError: ErrTargetsRequired}
 	}
 
 	if len(trigger.Tags) == 0 {
-		return api.ErrInvalidRequestContent{ValidationError: fmt.Errorf("tags is required")}
+		return api.ErrInvalidRequestContent{ValidationError: ErrTagsRequired}
 	}
 
 	if trigger.Name == "" {
-		return api.ErrInvalidRequestContent{ValidationError: fmt.Errorf("trigger name is required")}
+		return api.ErrInvalidRequestContent{ValidationError: ErrTriggerNameRequired}
 	}
 
 	limits := middleware.GetLimits(request)
 	if utf8.RuneCountInString(trigger.Name) > limits.Trigger.MaxNameSize {
 		return api.ErrInvalidRequestContent{
-			ValidationError: fmt.Errorf("trigger name too long, should be less than %d symbols", limits.Trigger.MaxNameSize)}
+			ValidationError: fmt.Errorf("trigger name too long, should not be greater than %d symbols", limits.Trigger.MaxNameSize),
+		}
 	}
 
 	if err := checkWarnErrorExpression(trigger); err != nil {

api/dto/triggers_test.go

@@ -3,11 +3,13 @@ package dto
 import (
 	"context"
 	"fmt"
-	"github.com/moira-alert/moira/limits"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/api"
 	"github.com/moira-alert/moira/api/middleware"
@@ -19,6 +21,52 @@ import (
 )
 
 func TestTriggerValidation(t *testing.T) {
+	Convey("Test trigger name and tags", t, func() {
+		trigger := Trigger{
+			TriggerModel: TriggerModel{},
+		}
+
+		limit := limits.GetTestConfig()
+
+		request, _ := http.NewRequest("PUT", "/api/trigger", nil)
+		request.Header.Set("Content-Type", "application/json")
+		request = request.WithContext(middleware.SetContextValueForTest(request.Context(), "limits", limit))
+
+		Convey("with empty targets", func() {
+			err := trigger.Bind(request)
+
+			So(err, ShouldResemble, api.ErrInvalidRequestContent{ValidationError: ErrTargetsRequired})
+		})
+
+		trigger.Targets = []string{"foo.bar"}
+
+		Convey("with empty tag in tag list", func() {
+			trigger.Tags = []string{""}
+
+			err := trigger.Bind(request)
+
+			So(err, ShouldResemble, api.ErrInvalidRequestContent{ValidationError: ErrTagsRequired})
+		})
+
+		trigger.Tags = append(trigger.Tags, "tag1")
+
+		Convey("with empty Name", func() {
+			err := trigger.Bind(request)
+
+			So(err, ShouldResemble, api.ErrInvalidRequestContent{ValidationError: ErrTriggerNameRequired})
+		})
+
+		Convey("with too long Name", func() {
+			trigger.Name = strings.Repeat("ё", limit.Trigger.MaxNameSize+1)
+
+			err := trigger.Bind(request)
+
+			So(err, ShouldResemble, api.ErrInvalidRequestContent{
+				ValidationError: fmt.Errorf("trigger name too long, should not be greater than %d symbols", limit.Trigger.MaxNameSize),
+			})
+		})
+	})
+
 	Convey("Tests targets, values and expression validation", t, func() {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()

api/handler/trigger_test.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/moira-alert/moira/limits"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/api/dto"
 	"github.com/moira-alert/moira/api/middleware"

api/handler/triggers_test.go

@@ -5,14 +5,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/moira-alert/moira/limits"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/api"
 	dataBase "github.com/moira-alert/moira/database"

api/middleware/context.go

@@ -3,13 +3,14 @@ package middleware
 import (
 	"context"
 	"fmt"
-	"github.com/moira-alert/moira/limits"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"
 	"github.com/moira-alert/moira"

api/middleware/middleware.go

@@ -2,10 +2,11 @@ package middleware
 
 import (
 	"context"
-	"github.com/moira-alert/moira/limits"
 	"net/http"
 	"time"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/api"
 	metricSource "github.com/moira-alert/moira/metric_source"

cmd/config.go

@@ -3,10 +3,11 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/moira-alert/moira/limits"
 	"os"
 	"strings"
 
+	"github.com/moira-alert/moira/limits"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/metrics"