Move IsOneOfTheExpectedErrors to bucket package

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

Author: SungJin1212

pkg/alertmanager/alertstore/bucketclient/bucket_client.go

@@ -18,7 +18,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
 	"github.com/cortexproject/cortex/pkg/util/concurrency"
-	cortex_errors "github.com/cortexproject/cortex/pkg/util/errors"
 	"github.com/cortexproject/cortex/pkg/util/runutil"
 	"github.com/cortexproject/cortex/pkg/util/users"
 )
@@ -229,5 +228,5 @@ func (s *BucketAlertStore) getUserBucket(userID string) objstore.Bucket {
 
 func (s *BucketAlertStore) getAlertmanagerUserBucket(userID string) objstore.Bucket {
 	uBucket := bucket.NewUserBucketClient(userID, s.amBucket, s.cfgProvider)
-	return uBucket.WithExpectedErrs(cortex_errors.IsOneOfTheExpectedErrors(uBucket.IsAccessDeniedErr, uBucket.IsObjNotFoundErr))
+	return uBucket.WithExpectedErrs(bucket.IsOneOfTheExpectedErrors(uBucket.IsAccessDeniedErr, uBucket.IsObjNotFoundErr))
 }

pkg/storage/bucket/bucket_util.go

@@ -49,3 +49,14 @@ func ListPrefixes(ctx context.Context, bkt objstore.Bucket, prefix string, logge
 	})
 	return keys, err
 }
+
+func IsOneOfTheExpectedErrors(f ...objstore.IsOpFailureExpectedFunc) objstore.IsOpFailureExpectedFunc {
+	return func(err error) bool {
+		for _, f := range f {
+			if f(err) {
+				return true
+			}
+		}
+		return false
+	}
+}

pkg/storage/parquet/converter_marker.go

@@ -13,7 +13,7 @@ import (
 	"github.com/thanos-io/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 
-	cortex_errors "github.com/cortexproject/cortex/pkg/util/errors"
+	"github.com/cortexproject/cortex/pkg/storage/bucket"
 )
 
 const (
@@ -28,7 +28,7 @@ type ConverterMark struct {
 
 func ReadConverterMark(ctx context.Context, id ulid.ULID, userBkt objstore.InstrumentedBucket, logger log.Logger) (*ConverterMark, error) {
 	markerPath := path.Join(id.String(), ConverterMarkerFileName)
-	reader, err := userBkt.WithExpectedErrs(cortex_errors.IsOneOfTheExpectedErrors(userBkt.IsAccessDeniedErr, userBkt.IsObjNotFoundErr)).Get(ctx, markerPath)
+	reader, err := userBkt.WithExpectedErrs(bucket.IsOneOfTheExpectedErrors(userBkt.IsAccessDeniedErr, userBkt.IsObjNotFoundErr)).Get(ctx, markerPath)
 	if err != nil {
 		if userBkt.IsObjNotFoundErr(err) || userBkt.IsAccessDeniedErr(err) {
 			return &ConverterMark{}, nil

pkg/storage/tsdb/bucketindex/storage.go

@@ -69,7 +69,7 @@ func ReadIndex(ctx context.Context, bkt objstore.Bucket, userID string, cfgProvi
 	userBkt := bucket.NewUserBucketClient(userID, bkt, cfgProvider)
 
 	// Get the bucket index.
-	reader, err := userBkt.WithExpectedErrs(cortex_errors.IsOneOfTheExpectedErrors(userBkt.IsAccessDeniedErr, userBkt.IsObjNotFoundErr)).Get(ctx, IndexCompressedFilename)
+	reader, err := userBkt.WithExpectedErrs(bucket.IsOneOfTheExpectedErrors(userBkt.IsAccessDeniedErr, userBkt.IsObjNotFoundErr)).Get(ctx, IndexCompressedFilename)
 	if err != nil {
 		if userBkt.IsObjNotFoundErr(err) {
 			return nil, ErrIndexNotFound

pkg/storage/tsdb/bucketindex/updater.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
 	"github.com/cortexproject/cortex/pkg/storage/parquet"
-	cortex_errors "github.com/cortexproject/cortex/pkg/util/errors"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/cortexproject/cortex/pkg/util/runutil"
 )
@@ -150,7 +149,7 @@ func (w *Updater) updateBlockIndexEntry(ctx context.Context, id ulid.ULID) (*Blo
 	metaFile := path.Join(id.String(), block.MetaFilename)
 
 	// Get the block's meta.json file.
-	r, err := w.bkt.ReaderWithExpectedErrs(cortex_errors.IsOneOfTheExpectedErrors(w.bkt.IsObjNotFoundErr, w.bkt.IsAccessDeniedErr)).Get(ctx, metaFile)
+	r, err := w.bkt.ReaderWithExpectedErrs(bucket.IsOneOfTheExpectedErrors(w.bkt.IsObjNotFoundErr, w.bkt.IsAccessDeniedErr)).Get(ctx, metaFile)
 	if w.bkt.IsObjNotFoundErr(err) {
 		return nil, ErrBlockMetaNotFound
 	}

pkg/util/errors/errors.go

@@ -2,8 +2,6 @@ package errors
 
 import (
 	"errors"
-
-	"github.com/thanos-io/objstore"
 )
 
 type errWithCause struct {
@@ -54,14 +52,3 @@ func ErrorIs(err error, f func(err error) bool) bool {
 		}
 	}
 }
-
-func IsOneOfTheExpectedErrors(f ...objstore.IsOpFailureExpectedFunc) objstore.IsOpFailureExpectedFunc {
-	return func(err error) bool {
-		for _, f := range f {
-			if f(err) {
-				return true
-			}
-		}
-		return false
-	}
-}