fix lint

Signed-off-by: Daniel Deluiggi <[email protected]>

Author: danielblando

pkg/compactor/blocks_cleaner.go

@@ -761,7 +761,7 @@ func (c *BlocksCleaner) cleanUser(ctx context.Context, userLogger log.Logger, us
 }
 
 func (c *BlocksCleaner) cleanPartitionedGroupInfo(ctx context.Context, userBucket objstore.InstrumentedBucket, userLogger log.Logger, userID string) {
-	err, existentPartitionedGroupInfo := c.iterPartitionGroups(ctx, userBucket, userLogger)
+	existentPartitionedGroupInfo, err := c.iterPartitionGroups(ctx, userBucket, userLogger)
 	if err != nil {
 		level.Warn(userLogger).Log("msg", "error return when going through partitioned group directory", "err", err)
 	}
@@ -800,7 +800,7 @@ func (c *BlocksCleaner) cleanPartitionedGroupInfo(ctx context.Context, userBucke
 }
 
 func (c *BlocksCleaner) emitUserMetrics(ctx context.Context, userLogger log.Logger, userBucket objstore.InstrumentedBucket, userID string) {
-	err, existentPartitionedGroupInfo := c.iterPartitionGroups(ctx, userBucket, userLogger)
+	existentPartitionedGroupInfo, err := c.iterPartitionGroups(ctx, userBucket, userLogger)
 	if err != nil {
 		level.Warn(userLogger).Log("msg", "error return when going through partitioned group directory", "err", err)
 	}
@@ -829,10 +829,10 @@ func (c *BlocksCleaner) emitUserMetrics(ctx context.Context, userLogger log.Logg
 	}
 }
 
-func (c *BlocksCleaner) iterPartitionGroups(ctx context.Context, userBucket objstore.InstrumentedBucket, userLogger log.Logger) (error, map[*PartitionedGroupInfo]struct {
+func (c *BlocksCleaner) iterPartitionGroups(ctx context.Context, userBucket objstore.InstrumentedBucket, userLogger log.Logger) (map[*PartitionedGroupInfo]struct {
 	path   string
 	status PartitionedGroupStatus
-}) {
+}, error) {
 	existentPartitionedGroupInfo := make(map[*PartitionedGroupInfo]struct {
 		path   string
 		status PartitionedGroupStatus
@@ -858,7 +858,7 @@ func (c *BlocksCleaner) iterPartitionGroups(ctx context.Context, userBucket objs
 		}
 		return nil
 	})
-	return err, existentPartitionedGroupInfo
+	return existentPartitionedGroupInfo, err
 }
 
 // cleanUserPartialBlocks delete partial blocks which are safe to be deleted. The provided partials map

pkg/compactor/blocks_cleaner_test.go

@@ -28,7 +28,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/util"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/cortexproject/cortex/pkg/util/services"
-	"github.com/prometheus/client_golang/prometheus/testutil"
 )
 
 type testBlocksCleanerOptions struct {
@@ -1142,7 +1141,7 @@ func TestBlocksCleaner_EmitUserMetrics(t *testing.T) {
 		cortex_compactor_remaining_planned_compactions{user="user-1"} 3
 	`
 
-	assert.NoError(t, testutil.GatherAndCompare(registry, strings.NewReader(expectedMetrics), metricNames...))
+	assert.NoError(t, prom_testutil.GatherAndCompare(registry, strings.NewReader(expectedMetrics), metricNames...))
 }
 
 type mockConfigProvider struct {