refactor(telegraf): remove references to kv service telegraf service implementation

Author: GeorgeMac

cmd/influxd/launcher/launcher.go

@@ -65,6 +65,7 @@ import (
 	"github.com/influxdata/influxdb/v2/task/backend/executor"
 	"github.com/influxdata/influxdb/v2/task/backend/middleware"
 	"github.com/influxdata/influxdb/v2/task/backend/scheduler"
+	telegrafservice "github.com/influxdata/influxdb/v2/telegraf/service"
 	"github.com/influxdata/influxdb/v2/telemetry"
 	"github.com/influxdata/influxdb/v2/tenant"
 	_ "github.com/influxdata/influxdb/v2/tsdb/engine/tsm1" // needed for tsm1
@@ -768,8 +769,6 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 		bucketLogSvc     platform.BucketOperationLogService       = m.kvService
 		orgLogSvc        platform.OrganizationOperationLogService = m.kvService
 		scraperTargetSvc platform.ScraperTargetStoreService       = m.kvService
-		telegrafSvc      platform.TelegrafConfigStore             = m.kvService
-		lookupSvc        platform.LookupService                   = m.kvService
 	)
 
 	tenantStore := tenant.NewStore(m.kvStore)
@@ -1006,6 +1005,11 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 		notificationRuleSvc = middleware.NewNotificationRuleStore(notificationRuleSvc, m.kvService, coordinator)
 	}
 
+	var telegrafSvc platform.TelegrafConfigStore
+	{
+		telegrafSvc = telegrafservice.New(m.kvStore)
+	}
+
 	// NATS streaming server
 	natsOpts := nats.NewDefaultServerOptions()
 
@@ -1158,11 +1162,11 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 		}
 	}
 
-	// orgIDResolver is a deprecated type which combines the lookups
+	// resourceResolver is a deprecated type which combines the lookups
 	// of multiple resources into one type, used to resolve the resources
-	// associated org ID. It is a stop-gap while we move this behaviour
-	// off of *kv.Service to aid in reducing the coupling on this type.
-	orgIDResolver := &resource.OrgIDResolver{
+	// associated org ID or name . It is a stop-gap while we move this
+	// behaviour off of *kv.Service to aid in reducing the coupling on this type.
+	resourceResolver := &resource.Resolver{
 		AuthorizationFinder:        authSvc,
 		BucketFinder:               ts.BucketService,
 		OrganizationFinder:         ts.OrganizationService,
@@ -1224,9 +1228,9 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 		ScraperTargetStoreService:       scraperTargetSvc,
 		ChronografService:               chronografSvc,
 		SecretService:                   secretSvc,
-		LookupService:                   lookupSvc,
+		LookupService:                   resourceResolver,
 		DocumentService:                 m.kvService,
-		OrgLookupService:                orgIDResolver,
+		OrgLookupService:                resourceResolver,
 		WriteEventRecorder:              infprom.NewEventRecorder("write"),
 		QueryEventRecorder:              infprom.NewEventRecorder("query"),
 		Flagger:                         m.flagger,

http/auth_service.go

@@ -152,7 +152,7 @@ func newPermissionsResponse(ctx context.Context, ps []influxdb.Permission, svc i
 		}
 
 		if p.Resource.ID != nil {
-			name, err := svc.Name(ctx, p.Resource.Type, *p.Resource.ID)
+			name, err := svc.FindResourceName(ctx, p.Resource.Type, *p.Resource.ID)
 			if influxdb.ErrorCode(err) == influxdb.ENotFound {
 				continue
 			}
@@ -163,7 +163,7 @@ func newPermissionsResponse(ctx context.Context, ps []influxdb.Permission, svc i
 		}
 
 		if p.Resource.OrgID != nil {
-			name, err := svc.Name(ctx, influxdb.OrgsResourceType, *p.Resource.OrgID)
+			name, err := svc.FindResourceName(ctx, influxdb.OrgsResourceType, *p.Resource.OrgID)
 			if influxdb.ErrorCode(err) == influxdb.ENotFound {
 				continue
 			}

internal/resource/org_id.go renamed to internal/resource/resolve.go

@@ -7,12 +7,12 @@ import (
 	"github.com/influxdata/influxdb/v2"
 )
 
-// OrgIDResolver is a type which combines multiple resource services
+// Resolver is a type which combines multiple resource services
 // in order to resolve the resources associated org ID.
 // Ideally you do not need to use this type, it is mostly a stop-gap
 // while we migrate responsibilities off of *kv.Service.
 // Consider it deprecated.
-type OrgIDResolver struct {
+type Resolver struct {
 	AuthorizationFinder interface {
 		FindAuthorizationByID(context.Context, influxdb.ID) (*influxdb.Authorization, error)
 	}
@@ -52,7 +52,7 @@ type OrgIDResolver struct {
 }
 
 // FindResourceOrganizationID is used to find the organization that a resource belongs to five the id of a resource and a resource type.
-func (o *OrgIDResolver) FindResourceOrganizationID(ctx context.Context, rt influxdb.ResourceType, id influxdb.ID) (influxdb.ID, error) {
+func (o *Resolver) FindResourceOrganizationID(ctx context.Context, rt influxdb.ResourceType, id influxdb.ID) (influxdb.ID, error) {
 	switch rt {
 	case influxdb.AuthorizationsResourceType:
 		if o.AuthorizationFinder == nil {
@@ -192,3 +192,137 @@ func (o *OrgIDResolver) FindResourceOrganizationID(ctx context.Context, rt influ
 		Msg: fmt.Sprintf("unsupported resource type %s", rt),
 	}
 }
+
+// FindResourceName is used to find the name of the resource associated with the provided type and id.
+func (o *Resolver) FindResourceName(ctx context.Context, rt influxdb.ResourceType, id influxdb.ID) (string, error) {
+	switch rt {
+	case influxdb.AuthorizationsResourceType:
+		// keeping this consistent with the original kv implementation
+		return "", nil
+	case influxdb.BucketsResourceType:
+		if o.BucketFinder == nil {
+			break
+		}
+
+		r, err := o.BucketFinder.FindBucketByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.OrgsResourceType:
+		if o.OrganizationFinder == nil {
+			break
+		}
+
+		r, err := o.OrganizationFinder.FindOrganizationByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.DashboardsResourceType:
+		if o.DashboardFinder == nil {
+			break
+		}
+
+		r, err := o.DashboardFinder.FindDashboardByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.SourcesResourceType:
+		if o.SourceFinder == nil {
+			break
+		}
+
+		r, err := o.SourceFinder.FindSourceByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.TasksResourceType:
+		if o.TaskFinder == nil {
+			break
+		}
+
+		r, err := o.TaskFinder.FindTaskByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.TelegrafsResourceType:
+		if o.TelegrafConfigFinder == nil {
+			break
+		}
+
+		r, err := o.TelegrafConfigFinder.FindTelegrafConfigByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.VariablesResourceType:
+		if o.VariableFinder == nil {
+			break
+		}
+
+		r, err := o.VariableFinder.FindVariableByID(ctx, id)
+		if err != nil {
+			return "", nil
+		}
+
+		return r.Name, nil
+	case influxdb.ScraperResourceType:
+		if o.TargetFinder == nil {
+			break
+		}
+
+		r, err := o.TargetFinder.GetTargetByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.Name, nil
+	case influxdb.ChecksResourceType:
+		if o.CheckFinder == nil {
+			break
+		}
+
+		r, err := o.CheckFinder.FindCheckByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.GetName(), nil
+	case influxdb.NotificationEndpointResourceType:
+		if o.NotificationEndpointFinder == nil {
+			break
+		}
+
+		r, err := o.NotificationEndpointFinder.FindNotificationEndpointByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.GetName(), nil
+	case influxdb.NotificationRuleResourceType:
+		if o.NotificationRuleFinder == nil {
+			break
+		}
+
+		r, err := o.NotificationRuleFinder.FindNotificationRuleByID(ctx, id)
+		if err != nil {
+			return "", err
+		}
+
+		return r.GetName(), nil
+	}
+
+	// default behaviour (in-line with original implementation) is to just return
+	// an empty name
+	return "", nil
+}

kv/initial_migration.go

@@ -43,8 +43,8 @@ func (m InitialMigration) Up(ctx context.Context, store SchemaStore) error {
 		userpasswordBucket,
 		scrapersBucket,
 		secretBucket,
-		telegrafBucket,
-		telegrafPluginsBucket,
+		[]byte("telegrafv1"),
+		[]byte("telegrafPluginsv1"),
 		urmBucket,
 		[]byte("notificationRulev1"),
 		userBucket,