refactor: remove urms from new label service (#18301)

cmd/influxd/launcher/launcher.go

@@ -876,7 +876,7 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 			m.log.Error("Failed creating new labels store", zap.Error(err))
 			return err
 		}
-		ls := label.NewService(labelsStore, m.kvService)
+		ls := label.NewService(labelsStore)
 		labelSvc = label.NewLabelController(flagger, m.kvService, ls)
 	}
 

label/service.go

@@ -2,7 +2,6 @@ package label
 
 import (
 	"context"
-	"fmt"
 	"strings"
 
 	"github.com/influxdata/influxdb/v2"
@@ -10,18 +9,12 @@ import (
 )
 
 type Service struct {
-	store      *Store
+	store *Store
-	urmCreator UserResourceMappingCreator
 }
 
-type UserResourceMappingCreator interface {
+func NewService(st *Store) influxdb.LabelService {
-	CreateUserResourceMappingForOrg(ctx context.Context, tx kv.Tx, orgID influxdb.ID, resID influxdb.ID, resType influxdb.ResourceType) error
-}
-
-func NewService(st *Store, urmCreator UserResourceMappingCreator) influxdb.LabelService {
 	return &Service{
-		store:      st,
+		store: st,
-		urmCreator: urmCreator, // todo (al) this can be removed once URMs are removed from the Label service
 	}
 }
 
@@ -45,10 +38,6 @@ func (s *Service) CreateLabel(ctx context.Context, l *influxdb.Label) error {
 			return err
 		}
 
-		if err := s.urmCreator.CreateUserResourceMappingForOrg(ctx, tx, l.OrgID, l.ID, influxdb.LabelsResourceType); err != nil {
-			return err
-		}
-
 		return nil
 	})
 
@@ -145,17 +134,14 @@ func (s *Service) DeleteLabel(ctx context.Context, id influxdb.ID) error {
 
 // CreateLabelMapping creates a new mapping between a resource and a label.
 func (s *Service) CreateLabelMapping(ctx context.Context, m *influxdb.LabelMapping) error {
-	fmt.Println("creating label mapping")
 	err := s.store.View(ctx, func(tx kv.Tx) error {
 		if _, err := s.store.GetLabel(ctx, tx, m.LabelID); err != nil {
-			fmt.Println("could not get label")
 			return err
 		}
 
 		ls := []*influxdb.Label{}
 		err := s.store.FindResourceLabels(ctx, tx, influxdb.LabelMappingFilter{ResourceID: m.ResourceID, ResourceType: m.ResourceType}, &ls)
 		if err != nil {
-			fmt.Println("could not get resource labels")
 			return err
 		}
 		for i := 0; i < len(ls); i++ {
@@ -167,12 +153,10 @@ func (s *Service) CreateLabelMapping(ctx context.Context, m *influxdb.LabelMappi
 		return nil
 	})
 	if err != nil {
-		fmt.Println("could not .....?")
 		return err
 	}
 
 	return s.store.Update(ctx, func(tx kv.Tx) error {
-		fmt.Println("calling to store ")
 		return s.store.CreateLabelMapping(ctx, tx, m)
 	})
 }

label/service_test.go

@@ -59,9 +59,7 @@ func initLabelService(s kv.Store, f influxdbtesting.LabelFields, t *testing.T) (
 		t.Fatalf("failed to create label store: %v", err)
 	}
 
-	kvSvc := kv.NewService(zaptest.NewLogger(t), s)
+	svc := label.NewService(st)
-
-	svc := label.NewService(st, kvSvc)
 	ctx := context.Background()
 
 	for _, l := range f.Labels {