Move tenant package within internal (#697)

wbrowne · web-flow · commit f35bb5e5add7 · 2023-06-01T16:18:53.000+02:00
* move tenant to internal package

* fix import
diff --git a/backend/app/instance_provider.go b/backend/app/instance_provider.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 // InstanceFactoryFunc factory method for creating app instances.
diff --git a/backend/common.go b/backend/common.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 const dataCustomOptionsKey = "grafanaData"
diff --git a/backend/data_adapter_test.go b/backend/data_adapter_test.go
@@ -13,8 +13,8 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 type fakeDataHandlerWithOAuth struct {
diff --git a/backend/datasource/instance_provider.go b/backend/datasource/instance_provider.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 // InstanceFactoryFunc factory method for creating data source instances.
diff --git a/backend/diagnostics_adapter_test.go b/backend/diagnostics_adapter_test.go
@@ -12,8 +12,8 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 func TestCollectMetrcis(t *testing.T) {
diff --git a/backend/resource_adapter_test.go b/backend/resource_adapter_test.go
@@ -11,8 +11,8 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 func TestCallResource(t *testing.T) {
diff --git a/backend/stream_adapter_test.go b/backend/stream_adapter_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 func TestSubscribeStream(t *testing.T) {
diff --git a/internal/tenant/tenant.go b/internal/tenant/tenant.go
diff --git a/internal/tenant/tenanttest/tenant_test.go b/internal/tenant/tenanttest/tenant_test.go
@@ -16,10 +16,10 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tenant"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
 	"github.com/grafana/grafana-plugin-sdk-go/internal/automanagement"
 	"github.com/grafana/grafana-plugin-sdk-go/internal/standalone"
+	"github.com/grafana/grafana-plugin-sdk-go/internal/tenant"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/grafana/grafana-plugin-sdk-go/backend"`
`8`	`8`	`"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"`
`9`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
	`9`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// InstanceFactoryFunc factory method for creating app instances.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"time"`
`7`	`7`
`8`	`8`	`"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"`
`9`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
	`9`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`const dataCustomOptionsKey = "grafanaData"`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"google.golang.org/grpc/metadata"`
`14`	`14`
`15`	`15`	`"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"`
`16`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
`17`	`16`	`"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"`
	`17`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`type fakeDataHandlerWithOAuth struct {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"google.golang.org/grpc/metadata"`
`13`	`13`
`14`	`14`	`"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"`
`15`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
`16`	`15`	`"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"`
	`16`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func TestCollectMetrcis(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"google.golang.org/grpc/metadata"`
`12`	`12`
`13`	`13`	`"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"`
`14`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
`15`	`14`	`"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"`
	`15`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestCallResource(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"github.com/stretchr/testify/require"`
`8`	`8`	`"google.golang.org/grpc/metadata"`
`9`	`9`
`10`		`- "github.com/grafana/grafana-plugin-sdk-go/backend/tenant"`
`11`	`10`	`"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"`
	`11`	`+ "github.com/grafana/grafana-plugin-sdk-go/internal/tenant"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestSubscribeStream(t *testing.T) {`