From 8b99414029bc9c9a22987b06c471e3507976fcb1 Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Mon, 10 Sep 2018 11:49:40 -0500
Subject: [PATCH] apply fieldName validation to index.CreateField

---
 field.go |  9 +++++++--
 index.go | 12 +++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/field.go b/field.go
index 9fb352fc1..7a60f3b3f 100644
--- a/field.go
+++ b/field.go
@@ -159,12 +159,17 @@ func OptFieldTypeMutex(cacheType string, cacheSize uint32) FieldOption {
 func NewField(path, index, name string, opts FieldOption) (*Field, error) {
 	err := validateName(name)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "validating name")
 	}
 
+	return newField(path, index, name, opts)
+}
+
+// newField returns a new instance of field (without name validation).
+func newField(path, index, name string, opts FieldOption) (*Field, error) {
 	// Apply functional option.
 	fo := FieldOptions{}
-	err = opts(&fo)
+	err := opts(&fo)
 	if err != nil {
 		return nil, errors.Wrap(err, "applying option")
 	}
diff --git a/index.go b/index.go
index adbc6810e..cccf2de69 100644
--- a/index.go
+++ b/index.go
@@ -289,6 +289,11 @@ func (i *Index) recalculateCaches() {
 
 // CreateField creates a field.
 func (i *Index) CreateField(name string, opts ...FieldOption) (*Field, error) {
+	err := validateName(name)
+	if err != nil {
+		return nil, errors.Wrap(err, "validating name")
+	}
+
 	i.mu.Lock()
 	defer i.mu.Unlock()
 
@@ -311,6 +316,11 @@ func (i *Index) CreateField(name string, opts ...FieldOption) (*Field, error) {
 
 // CreateFieldIfNotExists creates a field with the given options if it doesn't exist.
 func (i *Index) CreateFieldIfNotExists(name string, opts ...FieldOption) (*Field, error) {
+	err := validateName(name)
+	if err != nil {
+		return nil, errors.Wrap(err, "validating name")
+	}
+
 	i.mu.Lock()
 	defer i.mu.Unlock()
 
@@ -379,7 +389,7 @@ func (i *Index) createField(name string, opt FieldOptions) (*Field, error) {
 }
 
 func (i *Index) newField(path, name string) (*Field, error) {
-	f, err := NewField(path, i.name, name, OptFieldTypeDefault())
+	f, err := newField(path, i.name, name, OptFieldTypeDefault())
 	if err != nil {
 		return nil, err
 	}