From 785102c9f6215efcc077726d3ff1f79eecddc864 Mon Sep 17 00:00:00 2001 From: ilangofman Date: Wed, 14 Sep 2022 14:31:43 -0400 Subject: [PATCH 1/2] move purger to different directory Signed-off-by: ilangofman --- pkg/api/api.go | 2 +- pkg/api/handlers.go | 2 +- pkg/api/middlewares.go | 2 +- pkg/cortex/cortex.go | 2 +- pkg/cortex/modules.go | 2 +- pkg/querier/querier.go | 2 +- pkg/querier/querier_test.go | 2 +- pkg/querier/series/series_set.go | 2 +- pkg/ruler/ruler_test.go | 2 +- pkg/{chunk => storage}/purger/tenant_deletion_api.go | 0 pkg/{chunk => storage}/purger/tenant_deletion_api_test.go | 0 pkg/{chunk => storage}/purger/tombstones.go | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename pkg/{chunk => storage}/purger/tenant_deletion_api.go (100%) rename pkg/{chunk => storage}/purger/tenant_deletion_api_test.go (100%) rename pkg/{chunk => storage}/purger/tombstones.go (100%) diff --git a/pkg/api/api.go b/pkg/api/api.go index 0419a18e2df..80eccd5ba72 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -17,7 +17,7 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/distributor" diff --git a/pkg/api/handlers.go b/pkg/api/handlers.go index 67cdadfcd94..ee2b8ad9f53 100644 --- a/pkg/api/handlers.go +++ b/pkg/api/handlers.go @@ -22,7 +22,7 @@ import ( "github.com/weaveworks/common/instrument" "github.com/weaveworks/common/middleware" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/querier/stats" "github.com/cortexproject/cortex/pkg/util" diff --git a/pkg/api/middlewares.go b/pkg/api/middlewares.go index cf92689c105..9f6f714423e 100644 --- a/pkg/api/middlewares.go +++ b/pkg/api/middlewares.go @@ -6,7 +6,7 @@ import ( "github.com/weaveworks/common/middleware" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/querier/tripperware/queryrange" "github.com/cortexproject/cortex/pkg/tenant" util_log "github.com/cortexproject/cortex/pkg/util/log" diff --git a/pkg/cortex/cortex.go b/pkg/cortex/cortex.go index 2092358b8b8..50df9999c1a 100644 --- a/pkg/cortex/cortex.go +++ b/pkg/cortex/cortex.go @@ -24,7 +24,7 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertstore" "github.com/cortexproject/cortex/pkg/api" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" "github.com/cortexproject/cortex/pkg/configs" configAPI "github.com/cortexproject/cortex/pkg/configs/api" diff --git a/pkg/cortex/modules.go b/pkg/cortex/modules.go index 3ef5f891b8a..a687ce3d0a6 100644 --- a/pkg/cortex/modules.go +++ b/pkg/cortex/modules.go @@ -22,7 +22,7 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertstore" "github.com/cortexproject/cortex/pkg/api" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" configAPI "github.com/cortexproject/cortex/pkg/configs/api" "github.com/cortexproject/cortex/pkg/configs/db" diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go index 1333880615c..ad5fb36aca8 100644 --- a/pkg/querier/querier.go +++ b/pkg/querier/querier.go @@ -22,7 +22,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/cortexproject/cortex/pkg/chunk" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/querier/batch" "github.com/cortexproject/cortex/pkg/querier/iterators" "github.com/cortexproject/cortex/pkg/querier/lazyquery" diff --git a/pkg/querier/querier_test.go b/pkg/querier/querier_test.go index e22328913cd..11c80d2f4d6 100644 --- a/pkg/querier/querier_test.go +++ b/pkg/querier/querier_test.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/mock" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/util/validation" diff --git a/pkg/querier/series/series_set.go b/pkg/querier/series/series_set.go index ee3a9a4ef08..f60564f80b5 100644 --- a/pkg/querier/series/series_set.go +++ b/pkg/querier/series/series_set.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/tsdb/chunkenc" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/prom1/storage/metric" ) diff --git a/pkg/ruler/ruler_test.go b/pkg/ruler/ruler_test.go index 23848a543a9..baf69321dd8 100644 --- a/pkg/ruler/ruler_test.go +++ b/pkg/ruler/ruler_test.go @@ -40,7 +40,7 @@ import ( "google.golang.org/grpc" "gopkg.in/yaml.v3" - "github.com/cortexproject/cortex/pkg/chunk/purger" + "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/ring" diff --git a/pkg/chunk/purger/tenant_deletion_api.go b/pkg/storage/purger/tenant_deletion_api.go similarity index 100% rename from pkg/chunk/purger/tenant_deletion_api.go rename to pkg/storage/purger/tenant_deletion_api.go diff --git a/pkg/chunk/purger/tenant_deletion_api_test.go b/pkg/storage/purger/tenant_deletion_api_test.go similarity index 100% rename from pkg/chunk/purger/tenant_deletion_api_test.go rename to pkg/storage/purger/tenant_deletion_api_test.go diff --git a/pkg/chunk/purger/tombstones.go b/pkg/storage/purger/tombstones.go similarity index 100% rename from pkg/chunk/purger/tombstones.go rename to pkg/storage/purger/tombstones.go From 669e52212197e85d411054514d3b1be6ce4d17be Mon Sep 17 00:00:00 2001 From: ilangofman Date: Sat, 17 Sep 2022 23:17:59 -0400 Subject: [PATCH 2/2] Move purger to pkg directory Signed-off-by: ilangofman --- pkg/api/api.go | 2 +- pkg/api/handlers.go | 2 +- pkg/api/middlewares.go | 2 +- pkg/cortex/cortex.go | 2 +- pkg/cortex/modules.go | 2 +- pkg/{storage => }/purger/tenant_deletion_api.go | 0 pkg/{storage => }/purger/tenant_deletion_api_test.go | 0 pkg/{storage => }/purger/tombstones.go | 0 pkg/querier/querier.go | 2 +- pkg/querier/querier_test.go | 2 +- pkg/querier/series/series_set.go | 2 +- pkg/ruler/ruler_test.go | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) rename pkg/{storage => }/purger/tenant_deletion_api.go (100%) rename pkg/{storage => }/purger/tenant_deletion_api_test.go (100%) rename pkg/{storage => }/purger/tombstones.go (100%) diff --git a/pkg/api/api.go b/pkg/api/api.go index 80eccd5ba72..2e4d6645ba7 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -17,7 +17,6 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/distributor" @@ -27,6 +26,7 @@ import ( frontendv2 "github.com/cortexproject/cortex/pkg/frontend/v2" "github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb" "github.com/cortexproject/cortex/pkg/ingester/client" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/ring" "github.com/cortexproject/cortex/pkg/ruler" diff --git a/pkg/api/handlers.go b/pkg/api/handlers.go index ee2b8ad9f53..3a4b5a010b9 100644 --- a/pkg/api/handlers.go +++ b/pkg/api/handlers.go @@ -22,7 +22,7 @@ import ( "github.com/weaveworks/common/instrument" "github.com/weaveworks/common/middleware" - "github.com/cortexproject/cortex/pkg/storage/purger" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/querier/stats" "github.com/cortexproject/cortex/pkg/util" diff --git a/pkg/api/middlewares.go b/pkg/api/middlewares.go index 9f6f714423e..5ca69bb6ab3 100644 --- a/pkg/api/middlewares.go +++ b/pkg/api/middlewares.go @@ -6,7 +6,7 @@ import ( "github.com/weaveworks/common/middleware" - "github.com/cortexproject/cortex/pkg/storage/purger" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier/tripperware/queryrange" "github.com/cortexproject/cortex/pkg/tenant" util_log "github.com/cortexproject/cortex/pkg/util/log" diff --git a/pkg/cortex/cortex.go b/pkg/cortex/cortex.go index 50df9999c1a..639a8452d0d 100644 --- a/pkg/cortex/cortex.go +++ b/pkg/cortex/cortex.go @@ -24,7 +24,6 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertstore" "github.com/cortexproject/cortex/pkg/api" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" "github.com/cortexproject/cortex/pkg/configs" configAPI "github.com/cortexproject/cortex/pkg/configs/api" @@ -37,6 +36,7 @@ import ( frontendv1 "github.com/cortexproject/cortex/pkg/frontend/v1" "github.com/cortexproject/cortex/pkg/ingester" "github.com/cortexproject/cortex/pkg/ingester/client" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/querier/tenantfederation" "github.com/cortexproject/cortex/pkg/querier/tripperware" diff --git a/pkg/cortex/modules.go b/pkg/cortex/modules.go index a687ce3d0a6..38060c68646 100644 --- a/pkg/cortex/modules.go +++ b/pkg/cortex/modules.go @@ -22,7 +22,6 @@ import ( "github.com/cortexproject/cortex/pkg/alertmanager" "github.com/cortexproject/cortex/pkg/alertmanager/alertstore" "github.com/cortexproject/cortex/pkg/api" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/compactor" configAPI "github.com/cortexproject/cortex/pkg/configs/api" "github.com/cortexproject/cortex/pkg/configs/db" @@ -31,6 +30,7 @@ import ( "github.com/cortexproject/cortex/pkg/frontend" "github.com/cortexproject/cortex/pkg/frontend/transport" "github.com/cortexproject/cortex/pkg/ingester" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/querier/tenantfederation" "github.com/cortexproject/cortex/pkg/querier/tripperware" diff --git a/pkg/storage/purger/tenant_deletion_api.go b/pkg/purger/tenant_deletion_api.go similarity index 100% rename from pkg/storage/purger/tenant_deletion_api.go rename to pkg/purger/tenant_deletion_api.go diff --git a/pkg/storage/purger/tenant_deletion_api_test.go b/pkg/purger/tenant_deletion_api_test.go similarity index 100% rename from pkg/storage/purger/tenant_deletion_api_test.go rename to pkg/purger/tenant_deletion_api_test.go diff --git a/pkg/storage/purger/tombstones.go b/pkg/purger/tombstones.go similarity index 100% rename from pkg/storage/purger/tombstones.go rename to pkg/purger/tombstones.go diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go index ad5fb36aca8..dcac25ad190 100644 --- a/pkg/querier/querier.go +++ b/pkg/querier/querier.go @@ -22,7 +22,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/cortexproject/cortex/pkg/chunk" - "github.com/cortexproject/cortex/pkg/storage/purger" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier/batch" "github.com/cortexproject/cortex/pkg/querier/iterators" "github.com/cortexproject/cortex/pkg/querier/lazyquery" diff --git a/pkg/querier/querier_test.go b/pkg/querier/querier_test.go index 11c80d2f4d6..c4d2b134495 100644 --- a/pkg/querier/querier_test.go +++ b/pkg/querier/querier_test.go @@ -15,8 +15,8 @@ import ( "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/mock" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/cortexpb" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/util/validation" "github.com/prometheus/common/model" diff --git a/pkg/querier/series/series_set.go b/pkg/querier/series/series_set.go index f60564f80b5..c3ddfa62f09 100644 --- a/pkg/querier/series/series_set.go +++ b/pkg/querier/series/series_set.go @@ -24,8 +24,8 @@ import ( "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/tsdb/chunkenc" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/prom1/storage/metric" + "github.com/cortexproject/cortex/pkg/purger" ) // ConcreteSeriesSet implements storage.SeriesSet. diff --git a/pkg/ruler/ruler_test.go b/pkg/ruler/ruler_test.go index baf69321dd8..2bcb6f813d2 100644 --- a/pkg/ruler/ruler_test.go +++ b/pkg/ruler/ruler_test.go @@ -40,8 +40,8 @@ import ( "google.golang.org/grpc" "gopkg.in/yaml.v3" - "github.com/cortexproject/cortex/pkg/storage/purger" "github.com/cortexproject/cortex/pkg/cortexpb" + "github.com/cortexproject/cortex/pkg/purger" "github.com/cortexproject/cortex/pkg/querier" "github.com/cortexproject/cortex/pkg/ring" "github.com/cortexproject/cortex/pkg/ring/kv"