Skip to content

Commit 04acdd5

Browse files
SungJin1212SungJin1212
committed
Move user related files to pkg/util/users
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
1 parent ac82835 commit 04acdd5

File tree

92 files changed

+434
-425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+434
-425
lines changed

‎pkg/alertmanager/alertstore/bucketclient/bucket_client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717

1818
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
1919
"github.com/cortexproject/cortex/pkg/storage/bucket"
20-
"github.com/cortexproject/cortex/pkg/storage/tsdb"
21-
"github.com/cortexproject/cortex/pkg/storage/tsdb/users"
2220
"github.com/cortexproject/cortex/pkg/util/concurrency"
21+
cortex_errors "github.com/cortexproject/cortex/pkg/util/errors"
2322
"github.com/cortexproject/cortex/pkg/util/runutil"
23+
"github.com/cortexproject/cortex/pkg/util/users"
2424
)
2525

2626
const (
@@ -52,7 +52,7 @@ type BucketAlertStore struct {
5252
usersScanner users.Scanner
5353
}
5454

55-
func NewBucketAlertStore(bkt objstore.InstrumentedBucket, userScannerCfg tsdb.UsersScannerConfig, cfgProvider bucket.TenantConfigProvider, logger log.Logger, reg prometheus.Registerer) (*BucketAlertStore, error) {
55+
func NewBucketAlertStore(bkt objstore.InstrumentedBucket, userScannerCfg users.UsersScannerConfig, cfgProvider bucket.TenantConfigProvider, logger log.Logger, reg prometheus.Registerer) (*BucketAlertStore, error) {
5656
alertBucket := bucket.NewPrefixedBucketClient(bkt, alertsPrefix)
5757

5858
usersScanner, err := users.NewScanner(userScannerCfg, alertBucket, logger, extprom.WrapRegistererWith(prometheus.Labels{"component": "alertmanager"}, reg))
@@ -229,5 +229,5 @@ func (s *BucketAlertStore) getUserBucket(userID string) objstore.Bucket {
229229

230230
func (s *BucketAlertStore) getAlertmanagerUserBucket(userID string) objstore.Bucket {
231231
uBucket := bucket.NewUserBucketClient(userID, s.amBucket, s.cfgProvider)
232-
return uBucket.WithExpectedErrs(tsdb.IsOneOfTheExpectedErrors(uBucket.IsAccessDeniedErr, uBucket.IsObjNotFoundErr))
232+
return uBucket.WithExpectedErrs(cortex_errors.IsOneOfTheExpectedErrors(uBucket.IsAccessDeniedErr, uBucket.IsObjNotFoundErr))
233233
}

‎pkg/alertmanager/alertstore/config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore/local"
88
"github.com/cortexproject/cortex/pkg/configs/client"
99
"github.com/cortexproject/cortex/pkg/storage/bucket"
10-
"github.com/cortexproject/cortex/pkg/storage/tsdb"
10+
"github.com/cortexproject/cortex/pkg/util/users"
1111
)
1212

1313
// Config configures the alertmanager storage backend.
1414
type Config struct {
1515
bucket.Config `yaml:",inline"`
16-
ConfigDB client.Config `yaml:"configdb"`
17-
Local local.StoreConfig `yaml:"local"`
18-
UsersScanner tsdb.UsersScannerConfig `yaml:"users_scanner"`
16+
ConfigDB client.Config `yaml:"configdb"`
17+
Local local.StoreConfig `yaml:"local"`
18+
UsersScanner users.UsersScannerConfig `yaml:"users_scanner"`
1919
}
2020

2121
// RegisterFlags registers the backend storage config.

‎pkg/alertmanager/alertstore/store_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
1515
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore/bucketclient"
16-
cortextsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
16+
"github.com/cortexproject/cortex/pkg/util/users"
1717
)
1818

1919
func TestAlertStore_ListAllUsers(t *testing.T) {
@@ -177,7 +177,7 @@ func TestAlertStore_DeleteAlertConfig(t *testing.T) {
177177
func runForEachAlertStore(t *testing.T, testFn func(t *testing.T, store AlertStore, b *MockBucket, client interface{})) {
178178
bucketClient := objstore.NewInMemBucket()
179179
mBucketClient := &MockBucket{Bucket: bucketClient}
180-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
180+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
181181
reg := prometheus.NewPedanticRegistry()
182182
bucketStore, err := bucketclient.NewBucketAlertStore(mBucketClient, usersScannerConfig, nil, log.NewNopLogger(), reg)
183183
assert.NoError(t, err)
@@ -220,7 +220,7 @@ func makeTestFullState(content string) alertspb.FullStateDesc {
220220
func TestBucketAlertStore_GetSetDeleteFullState(t *testing.T) {
221221
bucket := objstore.NewInMemBucket()
222222
mBucketClient := &MockBucket{Bucket: bucket}
223-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
223+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
224224
reg := prometheus.NewPedanticRegistry()
225225
store, err := bucketclient.NewBucketAlertStore(mBucketClient, usersScannerConfig, nil, log.NewNopLogger(), reg)
226226
assert.NoError(t, err)

‎pkg/alertmanager/api_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
2525
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore"
2626
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore/bucketclient"
27-
cortextsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
2827
"github.com/cortexproject/cortex/pkg/util/flagext"
2928
util_log "github.com/cortexproject/cortex/pkg/util/log"
3029
"github.com/cortexproject/cortex/pkg/util/services"
30+
"github.com/cortexproject/cortex/pkg/util/users"
3131
)
3232

3333
func TestAMConfigValidationAPI(t *testing.T) {
@@ -745,7 +745,7 @@ func TestMultitenantAlertmanager_DeleteUserConfig(t *testing.T) {
745745
storage := objstore.NewInMemBucket()
746746
bkt := &alertstore.MockBucket{Bucket: storage}
747747

748-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
748+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
749749
reg := prometheus.NewPedanticRegistry()
750750
alertStore, err := bucketclient.NewBucketAlertStore(bkt, usersScannerConfig, nil, log.NewNopLogger(), reg)
751751
require.NoError(t, err)
@@ -834,7 +834,7 @@ receivers:
834834
storage := objstore.NewInMemBucket()
835835
bkt := &alertstore.MockBucket{Bucket: storage}
836836

837-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
837+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
838838
reg := prometheus.NewPedanticRegistry()
839839
alertStore, err := bucketclient.NewBucketAlertStore(bkt, usersScannerConfig, nil, log.NewNopLogger(), reg)
840840
require.NoError(t, err)

‎pkg/alertmanager/distributor.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/cortexproject/cortex/pkg/util"
2626
util_log "github.com/cortexproject/cortex/pkg/util/log"
2727
"github.com/cortexproject/cortex/pkg/util/services"
28+
"github.com/cortexproject/cortex/pkg/util/users"
2829
)
2930

3031
// Distributor forwards requests to individual alertmanagers.
@@ -97,7 +98,7 @@ func (d *Distributor) isQuorumReadPath(p string) (bool, merger.Merger) {
9798
// In case of reads, it proxies the request to one of the alertmanagers.
9899
// DistributeRequest assumes that the caller has verified IsPathSupported returns
99100
// true for the route.
100-
func (d *Distributor) DistributeRequest(w http.ResponseWriter, r *http.Request, allowedTenants *util.AllowedTenants) {
101+
func (d *Distributor) DistributeRequest(w http.ResponseWriter, r *http.Request, allowedTenants *users.AllowedTenants) {
101102
d.requestsInFlight.Add(1)
102103
defer d.requestsInFlight.Done()
103104

‎pkg/alertmanager/distributor_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727
"github.com/cortexproject/cortex/pkg/ring"
2828
"github.com/cortexproject/cortex/pkg/ring/kv"
2929
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
30-
"github.com/cortexproject/cortex/pkg/util"
3130
"github.com/cortexproject/cortex/pkg/util/flagext"
3231
util_log "github.com/cortexproject/cortex/pkg/util/log"
3332
"github.com/cortexproject/cortex/pkg/util/services"
3433
"github.com/cortexproject/cortex/pkg/util/test"
34+
"github.com/cortexproject/cortex/pkg/util/users"
3535
)
3636

3737
func TestDistributor_DistributeRequest(t *testing.T) {
@@ -262,9 +262,9 @@ func TestDistributor_DistributeRequest(t *testing.T) {
262262
req.Method = http.MethodDelete
263263
}
264264
req.RequestURI = url
265-
var allowedTenants *util.AllowedTenants
265+
var allowedTenants *users.AllowedTenants
266266
if c.isTenantDisabled {
267-
allowedTenants = util.NewAllowedTenants(nil, []string{"1"})
267+
allowedTenants = users.NewAllowedTenants(nil, []string{"1"})
268268
}
269269

270270
w := httptest.NewRecorder()

‎pkg/alertmanager/multitenant.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/cortexproject/cortex/pkg/util/flagext"
4040
util_log "github.com/cortexproject/cortex/pkg/util/log"
4141
"github.com/cortexproject/cortex/pkg/util/services"
42+
"github.com/cortexproject/cortex/pkg/util/users"
4243
)
4344

4445
const (
@@ -284,7 +285,7 @@ type MultitenantAlertmanager struct {
284285

285286
limits Limits
286287

287-
allowedTenants *util.AllowedTenants
288+
allowedTenants *users.AllowedTenants
288289

289290
registry prometheus.Registerer
290291
ringCheckErrors prometheus.Counter
@@ -377,7 +378,7 @@ func createMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig, fallbackC
377378
logger: log.With(logger, "component", "MultiTenantAlertmanager"),
378379
registry: registerer,
379380
limits: limits,
380-
allowedTenants: util.NewAllowedTenants(cfg.EnabledTenants, cfg.DisabledTenants),
381+
allowedTenants: users.NewAllowedTenants(cfg.EnabledTenants, cfg.DisabledTenants),
381382
ringCheckErrors: promauto.With(registerer).NewCounter(prometheus.CounterOpts{
382383
Name: "cortex_alertmanager_ring_check_errors_total",
383384
Help: "Number of errors that have occurred when checking the ring for ownership.",

‎pkg/alertmanager/multitenant_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ import (
4646
"github.com/cortexproject/cortex/pkg/ring"
4747
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
4848
"github.com/cortexproject/cortex/pkg/storage/bucket"
49-
cortextsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
5049
"github.com/cortexproject/cortex/pkg/util"
5150
"github.com/cortexproject/cortex/pkg/util/concurrency"
5251
"github.com/cortexproject/cortex/pkg/util/flagext"
5352
"github.com/cortexproject/cortex/pkg/util/services"
5453
"github.com/cortexproject/cortex/pkg/util/test"
54+
"github.com/cortexproject/cortex/pkg/util/users"
5555
"github.com/cortexproject/cortex/pkg/util/validation"
5656
)
5757

@@ -1133,7 +1133,7 @@ func TestMultitenantAlertmanager_InitialSyncWithSharding(t *testing.T) {
11331133

11341134
// Use an alert store with a mocked backend.
11351135
bkt := &bucket.ClientMock{}
1136-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
1136+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
11371137
reg := prometheus.NewPedanticRegistry()
11381138
alertStore, err := bucketclient.NewBucketAlertStore(bkt, usersScannerConfig, nil, log.NewNopLogger(), reg)
11391139
require.NoError(t, err)
@@ -1631,7 +1631,7 @@ func TestMultitenantAlertmanager_InitialSyncFailureWithSharding(t *testing.T) {
16311631
bkt := &bucket.ClientMock{}
16321632
bkt.MockIter("alerts/", nil, errors.New("failed to list alerts"))
16331633
bkt.MockIter("alertmanager/", nil, nil)
1634-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
1634+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
16351635
reg := prometheus.NewPedanticRegistry()
16361636
store, err := bucketclient.NewBucketAlertStore(bkt, usersScannerConfig, nil, log.NewNopLogger(), reg)
16371637
require.NoError(t, err)
@@ -2131,7 +2131,7 @@ func TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers(t *testi
21312131

21322132
// prepareInMemoryAlertStore builds and returns an in-memory alert store.
21332133
func prepareInMemoryAlertStore() (alertstore.AlertStore, error) {
2134-
usersScannerConfig := cortextsdb.UsersScannerConfig{Strategy: cortextsdb.UserScanStrategyList}
2134+
usersScannerConfig := users.UsersScannerConfig{Strategy: users.UserScanStrategyList}
21352135
reg := prometheus.NewPedanticRegistry()
21362136
bucket := objstore.NewInMemBucket()
21372137
mBucketClient := &alertstore.MockBucket{Bucket: bucket}

‎pkg/compactor/block_visit_marker_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/thanos-io/objstore"
1414
"github.com/thanos-io/thanos/pkg/block/metadata"
1515

16-
cortex_testutil "github.com/cortexproject/cortex/pkg/storage/tsdb/testutil"
16+
cortex_testutil "github.com/cortexproject/cortex/pkg/util/testutil"
1717
)
1818

1919
func TestMarkBlocksVisited(t *testing.T) {

‎pkg/compactor/blocks_cleaner.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020

2121
"github.com/cortexproject/cortex/pkg/storage/bucket"
2222
cortex_parquet "github.com/cortexproject/cortex/pkg/storage/parquet"
23-
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
2423
"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"
25-
"github.com/cortexproject/cortex/pkg/storage/tsdb/users"
24+
"github.com/cortexproject/cortex/pkg/tenant"
2625
"github.com/cortexproject/cortex/pkg/util"
2726
"github.com/cortexproject/cortex/pkg/util/concurrency"
2827
util_log "github.com/cortexproject/cortex/pkg/util/log"
2928
"github.com/cortexproject/cortex/pkg/util/services"
29+
"github.com/cortexproject/cortex/pkg/util/users"
3030
)
3131

3232
const (
@@ -536,7 +536,7 @@ func (c *BlocksCleaner) deleteUserMarkedForDeletion(ctx context.Context, userLog
536536
}
537537
level.Info(userLogger).Log("msg", "completed deleting blocks for tenant marked for deletion", "duration", time.Since(begin), "duration_ms", time.Since(begin).Milliseconds())
538538

539-
mark, err := cortex_tsdb.ReadTenantDeletionMark(ctx, c.bucketClient, userID)
539+
mark, err := tenant.ReadTenantDeletionMark(ctx, c.bucketClient, userID, userLogger)
540540
if err != nil {
541541
return errors.Wrap(err, "failed to read tenant deletion mark")
542542
}
@@ -549,7 +549,7 @@ func (c *BlocksCleaner) deleteUserMarkedForDeletion(ctx context.Context, userLog
549549
if deletedBlocks.Load() > 0 || mark.FinishedTime == 0 {
550550
level.Info(userLogger).Log("msg", "updating finished time in tenant deletion mark")
551551
mark.FinishedTime = time.Now().Unix()
552-
return errors.Wrap(cortex_tsdb.WriteTenantDeletionMark(ctx, c.bucketClient, userID, mark), "failed to update tenant deletion mark")
552+
return errors.Wrap(tenant.WriteTenantDeletionMark(ctx, c.bucketClient, userID, mark), "failed to update tenant deletion mark")
553553
}
554554
if time.Since(time.Unix(mark.FinishedTime, 0)) < c.cfg.TenantCleanupDelay {
555555
return nil
@@ -567,7 +567,7 @@ func (c *BlocksCleaner) deleteUserMarkedForDeletion(ctx context.Context, userLog
567567
} else if deleted > 0 {
568568
level.Info(userLogger).Log("msg", "deleted marker files for tenant marked for deletion", "count", deleted, "duration", time.Since(begin), "duration_ms", time.Since(begin).Milliseconds())
569569
}
570-
if err := cortex_tsdb.DeleteTenantDeletionMark(ctx, c.bucketClient, userID); err != nil {
570+
if err := tenant.DeleteTenantDeletionMark(ctx, c.bucketClient, userID); err != nil {
571571
return errors.Wrap(err, "failed to delete tenant deletion mark")
572572
}
573573
return nil

0 commit comments

Comments
 (0)