feat(kv): label names to be unique

CHANGELOG.md

@@ -24,6 +24,7 @@
 1. [15556](https://github.com/influxdata/influxdb/pull/15556): Creating a check now displays on the checklist
 1. [15592](https://github.com/influxdata/influxdb/pull/15592): Changed task runs success status code from 200 to 201 to match Swagger documentation.
 1. [15634](https://github.com/influxdata/influxdb/pull/15634): TextAreas have the correct height
+1. [15647](https://github.com/influxdata/influxdb/pull/15647): Ensures labels are unique by organization in the kv store
 
 ## v2.0.0-alpha.18 [2019-09-26]
 

kv/label.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
+	"strings"
 
 	"github.com/influxdata/influxdb"
 	"github.com/influxdata/influxdb/kit/tracing"
@@ -12,6 +14,7 @@ import (
 var (
 	labelBucket        = []byte("labelsv1")
 	labelMappingBucket = []byte("labelmappingsv1")
+	labelIndex         = []byte("labelindexv1")
 )
 
 func (s *Service) initializeLabels(ctx context.Context, tx Tx) error {
@@ -23,6 +26,10 @@ func (s *Service) initializeLabels(ctx context.Context, tx Tx) error {
 		return err
 	}
 
+	if _, err := tx.Bucket(labelIndex); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -85,7 +92,7 @@ func (s *Service) findLabelByID(ctx context.Context, tx Tx, id influxdb.ID) (*in
 
 func filterLabelsFn(filter influxdb.LabelFilter) func(l *influxdb.Label) bool {
 	return func(label *influxdb.Label) bool {
-		return (filter.Name == "" || (filter.Name == label.Name)) &&
+		return (filter.Name == "" || (strings.EqualFold(filter.Name, label.Name))) &&
 			((filter.OrgID == nil) || (filter.OrgID != nil && *filter.OrgID == label.OrgID))
 	}
 }
@@ -248,6 +255,19 @@ func (s *Service) deleteLabelMapping(ctx context.Context, tx Tx, m *influxdb.Lab
 // CreateLabel creates a new label.
 func (s *Service) CreateLabel(ctx context.Context, l *influxdb.Label) error {
 	err := s.kv.Update(ctx, func(tx Tx) error {
+		if err := l.Validate(); err != nil {
+			return &influxdb.Error{
+				Code: influxdb.EInvalid,
+				Err:  err,
+			}
+		}
+
+		l.Name = strings.TrimSpace(l.Name)
+
+		if err := s.uniqueLabelName(ctx, tx, l); err != nil {
+			return err
+		}
+
 		l.ID = s.IDGenerator.ID()
 
 		if err := s.putLabel(ctx, tx, l); err != nil {
@@ -395,7 +415,34 @@ func (s *Service) updateLabel(ctx context.Context, tx Tx, id influxdb.ID, upd in
 	}
 
 	if upd.Name != "" {
+		upd.Name = strings.TrimSpace(upd.Name)
+
+		idx, err := tx.Bucket(labelIndex)
+		if err != nil {
+			return nil, &influxdb.Error{
+				Err: err,
+			}
+		}
+
+		key, err := labelIndexKey(label)
+		if err != nil {
+			return nil, &influxdb.Error{
+				Err: err,
+			}
+		}
+
+		if err := idx.Delete(key); err != nil {
+			return nil, &influxdb.Error{
+				Err: err,
+			}
+		}
+
 		label.Name = upd.Name
+		if err := s.uniqueLabelName(ctx, tx, label); err != nil {
+			return nil, &influxdb.Error{
+				Err: err,
+			}
+		}
 	}
 
 	if err := label.Validate(); err != nil {
@@ -430,6 +477,26 @@ func (s *Service) putLabel(ctx context.Context, tx Tx, l *influxdb.Label) error
 		}
 	}
 
+	idx, err := tx.Bucket(labelIndex)
+	if err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
+	key, err := labelIndexKey(l)
+	if err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
+	if err := idx.Put([]byte(key), encodedID); err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
 	b, err := tx.Bucket(labelBucket)
 	if err != nil {
 		return err
@@ -499,7 +566,7 @@ func (s *Service) DeleteLabel(ctx context.Context, id influxdb.ID) error {
 }
 
 func (s *Service) deleteLabel(ctx context.Context, tx Tx, id influxdb.ID) error {
-	_, err := s.findLabelByID(ctx, tx, id)
+	label, err := s.findLabelByID(ctx, tx, id)
 	if err != nil {
 		return err
 	}
@@ -521,6 +588,26 @@ func (s *Service) deleteLabel(ctx context.Context, tx Tx, id influxdb.ID) error
 		}
 	}
 
+	idx, err := tx.Bucket(labelIndex)
+	if err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
+	key, err := labelIndexKey(label)
+	if err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
+	if err := idx.Delete(key); err != nil {
+		return &influxdb.Error{
+			Err: err,
+		}
+	}
+
 	if err := s.deleteUserResourceMappings(ctx, tx, influxdb.UserResourceMappingFilter{
 		ResourceID:   id,
 		ResourceType: influxdb.LabelsResourceType,
@@ -530,3 +617,41 @@ func (s *Service) deleteLabel(ctx context.Context, tx Tx, id influxdb.ID) error
 
 	return nil
 }
+
+// labelAlreadyExistsError is used when creating a new label with
+// a name that has already been used. Label names must be unique.
+func labelAlreadyExistsError(lbl *influxdb.Label) error {
+	return &influxdb.Error{
+		Code: influxdb.EConflict,
+		Msg:  fmt.Sprintf("label with name %s already exists", lbl.Name),
+	}
+}
+
+func labelIndexKey(l *influxdb.Label) ([]byte, error) {
+	orgID, err := l.OrgID.Encode()
+	if err != nil {
+		return nil, &influxdb.Error{
+			Code: influxdb.EInvalid,
+			Err:  err,
+		}
+	}
+
+	k := make([]byte, influxdb.IDLength+len(l.Name))
+	copy(k, orgID)
+	copy(k[influxdb.IDLength:], []byte(strings.ToLower((l.Name))))
+	return k, nil
+}
+
+func (s *Service) uniqueLabelName(ctx context.Context, tx Tx, lbl *influxdb.Label) error {
+	key, err := labelIndexKey(lbl)
+	if err != nil {
+		return err
+	}
+
+	// labels are unique by `organization:label_name`
+	err = s.unique(ctx, tx, labelIndex, key)
+	if err == NotUniqueError {
+		return labelAlreadyExistsError(lbl)
+	}
+	return err
+}

label.go

@@ -18,6 +18,15 @@ const (
 	OpDeleteLabelMapping = "DeleteLabelMapping"
 )
 
+// errors on label
+var (
+	// ErrLabelNameisEmpty is error when org name is empty
+	ErrLabelNameisEmpty = &Error{
+		Code: EInvalid,
+		Msg:  "label name is empty",
+	}
+)
+
 // LabelService represents a service for managing resource labels
 type LabelService interface {
 	// FindLabelByID a single label by ID.

testing/document.go

@@ -36,8 +36,8 @@ func NewDocumentIntegrationTest(store kv.Store) func(t *testing.T) {
 			t.Fatalf("failed to find document store: %v", err)
 		}
 
-		l1 := &influxdb.Label{Name: "l1"}
-		l2 := &influxdb.Label{Name: "l2"}
+		l1 := &influxdb.Label{Name: "l1", OrgID: MustIDBase16("41a9f7288d4e2d64")}
+		l2 := &influxdb.Label{Name: "l2", OrgID: MustIDBase16("41a9f7288d4e2d64")}
 		mustCreateLabels(ctx, svc, l1, l2)
 		lBad := &influxdb.Label{ID: MustIDBase16(oneID), Name: "bad"}