Skip to content

Commit 4e797de

Browse files
committed
Fix imports.
Signed-off-by: Peter Štibraný <[email protected]>
1 parent bb91109 commit 4e797de

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

integration/ruler_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ import (
1717
"testing"
1818
"time"
1919

20-
"github.com/cortexproject/cortex/integration/ca"
21-
"github.com/cortexproject/cortex/integration/e2e"
22-
e2edb "github.com/cortexproject/cortex/integration/e2e/db"
23-
"github.com/cortexproject/cortex/integration/e2ecortex"
2420
"github.com/prometheus/common/model"
2521
"github.com/prometheus/prometheus/model/labels"
2622
"github.com/prometheus/prometheus/model/rulefmt"
@@ -29,6 +25,11 @@ import (
2925
"github.com/stretchr/testify/assert"
3026
"github.com/stretchr/testify/require"
3127
"gopkg.in/yaml.v3"
28+
29+
"github.com/cortexproject/cortex/integration/ca"
30+
"github.com/cortexproject/cortex/integration/e2e"
31+
e2edb "github.com/cortexproject/cortex/integration/e2e/db"
32+
"github.com/cortexproject/cortex/integration/e2ecortex"
3233
)
3334

3435
func TestRulerAPI(t *testing.T) {

pkg/ruler/api.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/cortexproject/cortex/pkg/cortexpb"
14-
"github.com/cortexproject/cortex/pkg/ruler/rulespb"
15-
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
16-
"github.com/cortexproject/cortex/pkg/tenant"
17-
util_log "github.com/cortexproject/cortex/pkg/util/log"
1813
"github.com/go-kit/log"
1914
"github.com/go-kit/log/level"
2015
"github.com/gorilla/mux"
@@ -24,6 +19,12 @@ import (
2419
"github.com/prometheus/prometheus/model/rulefmt"
2520
"github.com/weaveworks/common/user"
2621
"gopkg.in/yaml.v2"
22+
23+
"github.com/cortexproject/cortex/pkg/cortexpb"
24+
"github.com/cortexproject/cortex/pkg/ruler/rulespb"
25+
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
26+
"github.com/cortexproject/cortex/pkg/tenant"
27+
util_log "github.com/cortexproject/cortex/pkg/util/log"
2728
)
2829

2930
// In order to reimplement the prometheus rules API, a large amount of code was copied over

pkg/ruler/ruler_test.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,18 @@ import (
1717
"time"
1818
"unsafe"
1919

20-
"github.com/cortexproject/cortex/pkg/chunk/purger"
21-
"github.com/cortexproject/cortex/pkg/querier"
22-
"github.com/cortexproject/cortex/pkg/util/validation"
2320
"github.com/prometheus/common/model"
2421
"github.com/stretchr/testify/mock"
2522
"gopkg.in/yaml.v2"
2623

24+
"github.com/cortexproject/cortex/pkg/chunk/purger"
25+
"github.com/cortexproject/cortex/pkg/querier"
26+
"github.com/cortexproject/cortex/pkg/util/validation"
27+
2728
"go.uber.org/atomic"
2829

2930
"google.golang.org/grpc"
3031

31-
"github.com/cortexproject/cortex/pkg/chunk"
32-
"github.com/cortexproject/cortex/pkg/cortexpb"
33-
"github.com/cortexproject/cortex/pkg/ruler/rulespb"
34-
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
35-
"github.com/cortexproject/cortex/pkg/ruler/rulestore/objectclient"
36-
"github.com/cortexproject/cortex/pkg/tenant"
37-
"github.com/cortexproject/cortex/pkg/util"
3832
"github.com/go-kit/log"
3933
"github.com/go-kit/log/level"
4034
"github.com/gorilla/mux"
@@ -54,6 +48,14 @@ import (
5448
"github.com/stretchr/testify/assert"
5549
"github.com/stretchr/testify/require"
5650
"github.com/weaveworks/common/user"
51+
52+
"github.com/cortexproject/cortex/pkg/chunk"
53+
"github.com/cortexproject/cortex/pkg/cortexpb"
54+
"github.com/cortexproject/cortex/pkg/ruler/rulespb"
55+
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
56+
"github.com/cortexproject/cortex/pkg/ruler/rulestore/objectclient"
57+
"github.com/cortexproject/cortex/pkg/tenant"
58+
"github.com/cortexproject/cortex/pkg/util"
5759
)
5860

5961
func defaultRulerConfig(t testing.TB, store rulestore.RuleStore) (Config, func()) {

0 commit comments

Comments
 (0)