fix: Fix the lokitool imports (#12673)

MichelHollands · web-flow · commit 6dce98870d8c · 2024-04-18T15:31:26.000+01:00
Signed-off-by: Michel Hollands &lt;michel.hollands@gmail.com&gt;
diff --git a/cmd/lokitool/main.go b/cmd/lokitool/main.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/prometheus/common/version"
 
-	"github.com/grafana/loki/pkg/tool/commands"
+	"github.com/grafana/loki/v3/pkg/tool/commands"
 )
 
 var (
diff --git a/pkg/tool/client/rules.go b/pkg/tool/client/rules.go
@@ -10,7 +10,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 // CreateRuleGroup creates a new rule group
diff --git a/pkg/tool/commands/rules.go b/pkg/tool/commands/rules.go
@@ -15,10 +15,10 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 	yamlv3 "gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/client"
-	"github.com/grafana/loki/pkg/tool/printer"
-	"github.com/grafana/loki/pkg/tool/rules"
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/client"
+	"github.com/grafana/loki/v3/pkg/tool/printer"
+	"github.com/grafana/loki/v3/pkg/tool/rules"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 const (
diff --git a/pkg/tool/commands/rules_test.go b/pkg/tool/commands/rules_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 func TestCheckDuplicates(t *testing.T) {
diff --git a/pkg/tool/printer/printer.go b/pkg/tool/printer/printer.go
@@ -13,8 +13,8 @@ import (
 	"github.com/mitchellh/colorstring"
 	"gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/rules"
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 // Printer is  used for printing formatted output from the cortextool
diff --git a/pkg/tool/printer/printer_test.go b/pkg/tool/printer/printer_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 func TestPrintRuleSet(t *testing.T) {
diff --git a/pkg/tool/rules/compare.go b/pkg/tool/rules/compare.go
@@ -10,7 +10,7 @@ import (
 	"github.com/prometheus/prometheus/model/rulefmt"
 	yaml "gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 var (
diff --git a/pkg/tool/rules/compare_test.go b/pkg/tool/rules/compare_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/prometheus/prometheus/model/rulefmt"
 	yaml "gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 func Test_rulesEqual(t *testing.T) {
diff --git a/pkg/tool/rules/parser.go b/pkg/tool/rules/parser.go
@@ -12,7 +12,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v3"
 
-	"github.com/grafana/loki/pkg/ruler"
+	"github.com/grafana/loki/v3/pkg/ruler"
 )
 
 const (
diff --git a/pkg/tool/rules/parser_test.go b/pkg/tool/rules/parser_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/prometheus/prometheus/model/rulefmt"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 func TestParseFiles(t *testing.T) {
diff --git a/pkg/tool/rules/rules.go b/pkg/tool/rules/rules.go
@@ -8,9 +8,9 @@ import (
 	"github.com/prometheus/prometheus/promql/parser"
 	log "github.com/sirupsen/logrus"
 
-	logql "github.com/grafana/loki/pkg/logql/syntax"
+	logql "github.com/grafana/loki/v3/pkg/logql/syntax"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 // RuleNamespace is used to parse a slightly modified prometheus
diff --git a/pkg/tool/rules/rules_test.go b/pkg/tool/rules/rules_test.go
@@ -8,7 +8,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"gotest.tools/assert"
 
-	"github.com/grafana/loki/pkg/tool/rules/rwrulefmt"
+	"github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"
 )
 
 func TestAggregateBy(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/prometheus/common/version"`
`10`	`10`
`11`		`- "github.com/grafana/loki/pkg/tool/commands"`
	`11`	`+ "github.com/grafana/loki/v3/pkg/tool/commands"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`log "github.com/sirupsen/logrus"`
`11`	`11`	`"gopkg.in/yaml.v3"`
`12`	`12`
`13`		`- "github.com/grafana/loki/pkg/tool/rules/rwrulefmt"`
	`13`	`+ "github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// CreateRuleGroup creates a new rule group`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/stretchr/testify/assert"`
`8`	`8`	`"gopkg.in/yaml.v3"`
`9`	`9`
`10`		`- "github.com/grafana/loki/pkg/tool/rules/rwrulefmt"`
	`10`	`+ "github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestCheckDuplicates(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"github.com/mitchellh/colorstring"`
`14`	`14`	`"gopkg.in/yaml.v3"`
`15`	`15`
`16`		`- "github.com/grafana/loki/pkg/tool/rules"`
`17`		`- "github.com/grafana/loki/pkg/tool/rules/rwrulefmt"`
	`16`	`+ "github.com/grafana/loki/v3/pkg/tool/rules"`
	`17`	`+ "github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// Printer is used for printing formatted output from the cortextool`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/stretchr/testify/assert"`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`	`11`
`12`		`- "github.com/grafana/loki/pkg/tool/rules/rwrulefmt"`
	`12`	`+ "github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestPrintRuleSet(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/prometheus/prometheus/model/rulefmt"`
`7`	`7`	`yaml "gopkg.in/yaml.v3"`
`8`	`8`
`9`		`- "github.com/grafana/loki/pkg/tool/rules/rwrulefmt"`
	`9`	`+ "github.com/grafana/loki/v3/pkg/tool/rules/rwrulefmt"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func Test_rulesEqual(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`log "github.com/sirupsen/logrus"`
`13`	`13`	`yaml "gopkg.in/yaml.v3"`
`14`	`14`
`15`		`- "github.com/grafana/loki/pkg/ruler"`
	`15`	`+ "github.com/grafana/loki/v3/pkg/ruler"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`