diff --git a/pkg/tsdb/grafana-testdata-datasource/spec.go b/pkg/registry/apis/datasource/hardcoded/testdata.go similarity index 98% rename from pkg/tsdb/grafana-testdata-datasource/spec.go rename to pkg/registry/apis/datasource/hardcoded/testdata.go index 9c1de114746..9d74dbb3e08 100644 --- a/pkg/tsdb/grafana-testdata-datasource/spec.go +++ b/pkg/registry/apis/datasource/hardcoded/testdata.go @@ -1,4 +1,4 @@ -package testdatasource +package hardcoded import ( "k8s.io/kube-openapi/pkg/spec3" @@ -7,7 +7,7 @@ import ( datasourceV0 "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1" ) -func OpenAPIExtension() (*datasourceV0.DataSourceOpenAPIExtension, error) { +func TestdataOpenAPIExtension() (*datasourceV0.DataSourceOpenAPIExtension, error) { oas := &datasourceV0.DataSourceOpenAPIExtension{ SecureValues: []datasourceV0.SecureValueInfo{{ Key: "aaa", diff --git a/pkg/tsdb/grafana-testdata-datasource/spec_test.go b/pkg/registry/apis/datasource/hardcoded/testdata_test.go similarity index 87% rename from pkg/tsdb/grafana-testdata-datasource/spec_test.go rename to pkg/registry/apis/datasource/hardcoded/testdata_test.go index 4cbac1ec35d..5591c7bb793 100644 --- a/pkg/tsdb/grafana-testdata-datasource/spec_test.go +++ b/pkg/registry/apis/datasource/hardcoded/testdata_test.go @@ -1,4 +1,4 @@ -package testdatasource +package hardcoded import ( "encoding/json" @@ -10,7 +10,7 @@ import ( ) func TestSpec(t *testing.T) { - info, err := OpenAPIExtension() + info, err := TestdataOpenAPIExtension() require.NoError(t, err) require.NotNil(t, info) diff --git a/pkg/registry/apis/datasource/register.go b/pkg/registry/apis/datasource/register.go index 95f65214da6..dce60f6528d 100644 --- a/pkg/registry/apis/datasource/register.go +++ b/pkg/registry/apis/datasource/register.go @@ -22,12 +22,12 @@ import ( "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/promlib/models" + "github.com/grafana/grafana/pkg/registry/apis/datasource/hardcoded" "github.com/grafana/grafana/pkg/registry/apis/query/queryschema" "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/apiserver/builder" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" - testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds" ) @@ -100,7 +100,7 @@ func RegisterAPIService( // HARDCODE spec access if ds.ID == "grafana-testdata-datasource" { - builder.specProvider = testdatasource.OpenAPIExtension + builder.specProvider = hardcoded.TestdataOpenAPIExtension } apiRegistrar.RegisterAPI(builder)