lint

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

Author: alanprot

pkg/querier/blocks_finder_bucket_index.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/thanos-io/objstore"
 
+	"github.com/cortexproject/cortex/pkg/util/validation"
+
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
 	"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"
 	"github.com/cortexproject/cortex/pkg/util/services"

pkg/querier/blocks_finder_bucket_index_test.go

@@ -7,13 +7,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/thanos-io/objstore"
 
+	"github.com/cortexproject/cortex/pkg/util/validation"
+
 	"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"
 	cortex_testutil "github.com/cortexproject/cortex/pkg/storage/tsdb/testutil"
 	"github.com/cortexproject/cortex/pkg/util/services"

pkg/storage/tsdb/bucketindex/loader_test.go

@@ -604,7 +604,7 @@ func TestLoader_ShouldUpdateIndexInBackgroundOnPreviousKeyAcessDenied(t *testing
 	require.True(t, errors.Is(err, ErrCustomerManagedKeyError))
 
 	// Check cached
-	loader.checkCachedIndexes(ctx)
+	require.NoError(t, loader.checkCachedIndexes(ctx))
 
 	loader.bkt = bkt
 
@@ -623,7 +623,7 @@ func TestLoader_ShouldUpdateIndexInBackgroundOnPreviousKeyAcessDenied(t *testing
 	test.Poll(t, 3*time.Second, nil, func() interface{} {
 		_, err := loader.GetIndex(ctx, "user-1")
 		// Check cached
-		loader.checkCachedIndexes(ctx)
+		require.NoError(t, loader.checkCachedIndexes(ctx))
 		return err
 	})
 

pkg/storage/tsdb/bucketindex/storage.go

@@ -6,11 +6,12 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/cortexproject/cortex/pkg/storage/tsdb"
 	"github.com/go-kit/log"
 	"github.com/pkg/errors"
 	"github.com/thanos-io/objstore"
 
+	"github.com/cortexproject/cortex/pkg/storage/tsdb"
+
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
 	"github.com/cortexproject/cortex/pkg/util/runutil"
 )

pkg/storage/tsdb/bucketindex/updater.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/storage/tsdb"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/oklog/ulid"
@@ -16,6 +15,8 @@ import (
 	"github.com/thanos-io/thanos/pkg/block"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
 
+	"github.com/cortexproject/cortex/pkg/storage/tsdb"
+
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/cortexproject/cortex/pkg/util/runutil"

pkg/storage/tsdb/testutil/objstore.go

@@ -6,11 +6,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"github.com/thanos-io/objstore"
 
+	"github.com/cortexproject/cortex/pkg/util"
+
 	"github.com/cortexproject/cortex/pkg/storage/bucket/filesystem"
 )