lint

Signed-off-by: Alan Protasio <[email protected]>

Author: alanprot

pkg/compactor/compactor.go

@@ -582,8 +582,8 @@ func (c *Compactor) starting(ctx context.Context) error {
 func (c *Compactor) stopping(_ error) error {
 	ctx := context.Background()
 
-	services.StopAndAwaitTerminated(ctx, c.blocksCleaner)                   //nolint:errcheck
-	services.StopAndAwaitTerminated(context.Background(), c.allowedTenants) //nolint:errcheck
+	services.StopAndAwaitTerminated(ctx, c.blocksCleaner)  //nolint:errcheck
+	services.StopAndAwaitTerminated(ctx, c.allowedTenants) //nolint:errcheck
 	if c.ringSubservices != nil {
 		return services.StopManagerAndAwaitStopped(ctx, c.ringSubservices)
 	}

pkg/ruler/ruler.go

@@ -340,7 +340,7 @@ func (r *Ruler) starting(ctx context.Context) error {
 	if r.cfg.EnableSharding {
 		var err error
 
-		if r.subservices, err = services.NewManager(r.lifecycler, r.ring, r.clientsPool, r.allowedTenants); err != nil {
+		if r.subservices, err = services.NewManager(r.lifecycler, r.ring, r.clientsPool); err != nil {
 			return errors.Wrap(err, "unable to start ruler subservices")
 		}
 
@@ -366,7 +366,7 @@ func (r *Ruler) stopping(_ error) error {
 	}
 
 	services.StopAndAwaitTerminated(context.Background(), r.allowedTenants) //nolint:errcheck
-	
+
 	return nil
 }
 

pkg/util/allowed_tenants.go

@@ -34,15 +34,15 @@ type AllowedTenants struct {
 // If there are any enabled tenants, then only those tenants are allowed.
 // If there are any disabled tenants, then tenant from that list, that would normally be allowed, is disabled instead.
 func NewAllowedTenants(cfg AllowedTenantConfig, allowedTenantConfigFn func() *AllowedTenantConfig) *AllowedTenants {
+	if allowedTenantConfigFn == nil {
+		allowedTenantConfigFn = func() *AllowedTenantConfig { return &cfg }
+	}
+
 	a := &AllowedTenants{
 		allowedTenantConfigFn: allowedTenantConfigFn,
 		defaultCfg:            &cfg,
 	}
 
-	if allowedTenantConfigFn == nil {
-		allowedTenantConfigFn = func() *AllowedTenantConfig { return a.defaultCfg }
-	}
-
 	a.setConfig(allowedTenantConfigFn())
 
 	a.Service = services.NewBasicService(nil, a.running, nil)