From 7abab7b795106cea29d7d76fa5be1b35e4cbafcc Mon Sep 17 00:00:00 2001 From: Michael Baird Date: Thu, 29 Jun 2017 11:23:36 -0500 Subject: [PATCH] Error ErrInputDefinitionValueMap --- input_definition.go | 3 +-- input_definition_test.go | 4 ++-- pilosa.go | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input_definition.go b/input_definition.go index 5f748f571..c0f468b55 100644 --- a/input_definition.go +++ b/input_definition.go @@ -15,7 +15,6 @@ package pilosa import ( - "errors" "fmt" "io/ioutil" "os" @@ -209,7 +208,7 @@ func (a *Action) Validate() error { switch a.ValueDestination { case InputMapping: if len(a.ValueMap) == 0 { - return errors.New("valueMap required for map") + return ErrInputDefinitionValueMap } } return nil diff --git a/input_definition_test.go b/input_definition_test.go index 68ac11593..c395b0630 100644 --- a/input_definition_test.go +++ b/input_definition_test.go @@ -167,8 +167,8 @@ func TestActionValidation(t *testing.T) { field = pilosa.InputDefinitionField{Name: "id", PrimaryKey: true, Actions: []pilosa.Action{action}} info = pilosa.InputDefinitionInfo{Frames: []pilosa.InputFrame{frame}, Fields: []pilosa.InputDefinitionField{field}} err = info.Validate("id") - if !strings.Contains(err.Error(), "valueMap required for map") { - t.Fatalf("Expected valueMap required for map error, actual error: %s", err) + if err != pilosa.ErrInputDefinitionValueMap { + t.Fatalf("Expect error: %s, actual err: %s", pilosa.ErrInputDefinitionValueMap, err) } action = pilosa.Action{Frame: "f", ValueDestination: pilosa.InputSingleRowBool, RowID: &rowID} diff --git a/pilosa.go b/pilosa.go index cb650e02d..228a27fd2 100644 --- a/pilosa.go +++ b/pilosa.go @@ -42,6 +42,7 @@ var ( ErrInputDefinitionColumnLabel = errors.New("PrimaryKey field name does not match columnLabel") ErrInputDefinitionNameRequired = errors.New("input-definition name required") ErrInputDefinitionAttrsRequired = errors.New("frames and fields are required") + ErrInputDefinitionValueMap = errors.New("valueMap required for map") ErrFieldNameRequired = errors.New("field name required") ErrInvalidFieldType = errors.New("invalid field type")