From 4a6b209d641b29b2f6ddeba1ca2b84630a11c323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Wed, 8 Nov 2023 14:08:20 +0100 Subject: [PATCH] sql: refactor code, eliminate from-core-grafana import (#77810) --- pkg/tsdb/sqleng/resample_test.go | 2 +- pkg/tsdb/sqleng/sql_engine_test.go | 2 +- pkg/tsdb/sqleng/util/util.go | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 pkg/tsdb/sqleng/util/util.go diff --git a/pkg/tsdb/sqleng/resample_test.go b/pkg/tsdb/sqleng/resample_test.go index 17e052d75a2..95976c351cc 100644 --- a/pkg/tsdb/sqleng/resample_test.go +++ b/pkg/tsdb/sqleng/resample_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/grafana/grafana/pkg/util" + "github.com/grafana/grafana/pkg/tsdb/sqleng/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/tsdb/sqleng/sql_engine_test.go b/pkg/tsdb/sqleng/sql_engine_test.go index 307284684e3..500823b0dfa 100644 --- a/pkg/tsdb/sqleng/sql_engine_test.go +++ b/pkg/tsdb/sqleng/sql_engine_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/util" + "github.com/grafana/grafana/pkg/tsdb/sqleng/util" ) func TestSQLEngine(t *testing.T) { diff --git a/pkg/tsdb/sqleng/util/util.go b/pkg/tsdb/sqleng/util/util.go new file mode 100644 index 00000000000..f6b5d330c17 --- /dev/null +++ b/pkg/tsdb/sqleng/util/util.go @@ -0,0 +1,3 @@ +package util + +func Pointer[T any](v T) *T { return &v }