diff --git a/pkg/registry/apis/provisioning/apifmt/error.go b/apps/provisioning/pkg/apifmt/error.go similarity index 100% rename from pkg/registry/apis/provisioning/apifmt/error.go rename to apps/provisioning/pkg/apifmt/error.go diff --git a/pkg/registry/apis/provisioning/apifmt/error_test.go b/apps/provisioning/pkg/apifmt/error_test.go similarity index 97% rename from pkg/registry/apis/provisioning/apifmt/error_test.go rename to apps/provisioning/pkg/apifmt/error_test.go index b685bcad673..492494a2225 100644 --- a/pkg/registry/apis/provisioning/apifmt/error_test.go +++ b/apps/provisioning/pkg/apifmt/error_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/apifmt" + "github.com/grafana/grafana/apps/provisioning/pkg/apifmt" "github.com/stretchr/testify/assert" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/apis/provisioning/loki/client.go b/apps/provisioning/pkg/loki/client.go similarity index 100% rename from pkg/registry/apis/provisioning/loki/client.go rename to apps/provisioning/pkg/loki/client.go diff --git a/pkg/registry/apis/provisioning/loki/client_test.go b/apps/provisioning/pkg/loki/client_test.go similarity index 100% rename from pkg/registry/apis/provisioning/loki/client_test.go rename to apps/provisioning/pkg/loki/client_test.go diff --git a/pkg/registry/apis/provisioning/safepath/dir.go b/apps/provisioning/pkg/safepath/dir.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/dir.go rename to apps/provisioning/pkg/safepath/dir.go diff --git a/pkg/registry/apis/provisioning/safepath/dir_test.go b/apps/provisioning/pkg/safepath/dir_test.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/dir_test.go rename to apps/provisioning/pkg/safepath/dir_test.go diff --git a/pkg/registry/apis/provisioning/safepath/path.go b/apps/provisioning/pkg/safepath/path.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/path.go rename to apps/provisioning/pkg/safepath/path.go diff --git a/pkg/registry/apis/provisioning/safepath/path_test.go b/apps/provisioning/pkg/safepath/path_test.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/path_test.go rename to apps/provisioning/pkg/safepath/path_test.go diff --git a/pkg/registry/apis/provisioning/safepath/safe.go b/apps/provisioning/pkg/safepath/safe.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/safe.go rename to apps/provisioning/pkg/safepath/safe.go diff --git a/pkg/registry/apis/provisioning/safepath/safe_test.go b/apps/provisioning/pkg/safepath/safe_test.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/safe_test.go rename to apps/provisioning/pkg/safepath/safe_test.go diff --git a/pkg/registry/apis/provisioning/safepath/trie.go b/apps/provisioning/pkg/safepath/trie.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/trie.go rename to apps/provisioning/pkg/safepath/trie.go diff --git a/pkg/registry/apis/provisioning/safepath/trie_test.go b/apps/provisioning/pkg/safepath/trie_test.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/trie_test.go rename to apps/provisioning/pkg/safepath/trie_test.go diff --git a/pkg/registry/apis/provisioning/safepath/walk.go b/apps/provisioning/pkg/safepath/walk.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/walk.go rename to apps/provisioning/pkg/safepath/walk.go diff --git a/pkg/registry/apis/provisioning/safepath/walk_test.go b/apps/provisioning/pkg/safepath/walk_test.go similarity index 100% rename from pkg/registry/apis/provisioning/safepath/walk_test.go rename to apps/provisioning/pkg/safepath/walk_test.go diff --git a/pkg/registry/apis/provisioning/files.go b/pkg/registry/apis/provisioning/files.go index 4ae0c3eaf2d..d863cb55dc4 100644 --- a/pkg/registry/apis/provisioning/files.go +++ b/pkg/registry/apis/provisioning/files.go @@ -13,10 +13,10 @@ import ( authlib "github.com/grafana/authlib/types" "github.com/grafana/grafana-app-sdk/logging" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) const ( diff --git a/pkg/registry/apis/provisioning/history.go b/pkg/registry/apis/provisioning/history.go index bf0bb5b35dc..f1e7b091191 100644 --- a/pkg/registry/apis/provisioning/history.go +++ b/pkg/registry/apis/provisioning/history.go @@ -12,8 +12,8 @@ import ( "github.com/grafana/grafana-app-sdk/logging" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) type historySubresource struct { diff --git a/pkg/registry/apis/provisioning/jobs/driver.go b/pkg/registry/apis/provisioning/jobs/driver.go index cce14f6827f..a53ec54e1cf 100644 --- a/pkg/registry/apis/provisioning/jobs/driver.go +++ b/pkg/registry/apis/provisioning/jobs/driver.go @@ -10,9 +10,9 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/grafana/grafana-app-sdk/logging" + "github.com/grafana/grafana/apps/provisioning/pkg/apifmt" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/apifmt" ) // Store is an abstraction for the storage API. diff --git a/pkg/registry/apis/provisioning/jobs/loki_client_mock.go b/pkg/registry/apis/provisioning/jobs/loki_client_mock.go index 90b89a232ec..9043c329875 100644 --- a/pkg/registry/apis/provisioning/jobs/loki_client_mock.go +++ b/pkg/registry/apis/provisioning/jobs/loki_client_mock.go @@ -1,11 +1,11 @@ -// Code generated by mockery v2.52.4. DO NOT EDIT. +// Code generated by mockery v2.53.4. DO NOT EDIT. package jobs import ( context "context" - loki "github.com/grafana/grafana/pkg/registry/apis/provisioning/loki" + loki "github.com/grafana/grafana/apps/provisioning/pkg/loki" mock "github.com/stretchr/testify/mock" ) @@ -134,7 +134,8 @@ func (_c *MockLokiClient_RangeQuery_Call) RunAndReturn(run func(context.Context, func NewMockLokiClient(t interface { mock.TestingT Cleanup(func()) -}) *MockLokiClient { +}, +) *MockLokiClient { mock := &MockLokiClient{} mock.Mock.Test(t) diff --git a/pkg/registry/apis/provisioning/jobs/loki_history.go b/pkg/registry/apis/provisioning/jobs/loki_history.go index ad46679b6b9..66bebe4d405 100644 --- a/pkg/registry/apis/provisioning/jobs/loki_history.go +++ b/pkg/registry/apis/provisioning/jobs/loki_history.go @@ -8,7 +8,7 @@ import ( "time" "github.com/grafana/grafana-app-sdk/logging" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/loki" + "github.com/grafana/grafana/apps/provisioning/pkg/loki" apierrors "k8s.io/apimachinery/pkg/api/errors" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" diff --git a/pkg/registry/apis/provisioning/jobs/loki_history_test.go b/pkg/registry/apis/provisioning/jobs/loki_history_test.go index 5cb4205a715..026e889431d 100644 --- a/pkg/registry/apis/provisioning/jobs/loki_history_test.go +++ b/pkg/registry/apis/provisioning/jobs/loki_history_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/loki" + "github.com/grafana/grafana/apps/provisioning/pkg/loki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/registry/apis/provisioning/jobs/move/worker.go b/pkg/registry/apis/provisioning/jobs/move/worker.go index 5e409db7e4b..1136c9f880f 100644 --- a/pkg/registry/apis/provisioning/jobs/move/worker.go +++ b/pkg/registry/apis/provisioning/jobs/move/worker.go @@ -10,10 +10,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) type Worker struct { diff --git a/pkg/registry/apis/provisioning/jobs/move/worker_test.go b/pkg/registry/apis/provisioning/jobs/move/worker_test.go index a728bd5d9f0..8c86d5d12dc 100644 --- a/pkg/registry/apis/provisioning/jobs/move/worker_test.go +++ b/pkg/registry/apis/provisioning/jobs/move/worker_test.go @@ -12,10 +12,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/pkg/registry/apis/provisioning/jobs/persistentstore.go b/pkg/registry/apis/provisioning/jobs/persistentstore.go index bac3bd92441..5604e7bff0c 100644 --- a/pkg/registry/apis/provisioning/jobs/persistentstore.go +++ b/pkg/registry/apis/provisioning/jobs/persistentstore.go @@ -14,10 +14,10 @@ import ( "k8s.io/apimachinery/pkg/selection" "github.com/grafana/grafana-app-sdk/logging" + "github.com/grafana/grafana/apps/provisioning/pkg/apifmt" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" client "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/apifmt" ) const ( diff --git a/pkg/registry/apis/provisioning/jobs/sync/changes.go b/pkg/registry/apis/provisioning/jobs/sync/changes.go index 4555e670a47..79cb38c42dd 100644 --- a/pkg/registry/apis/provisioning/jobs/sync/changes.go +++ b/pkg/registry/apis/provisioning/jobs/sync/changes.go @@ -6,9 +6,9 @@ import ( "strings" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) type ResourceFileChange struct { diff --git a/pkg/registry/apis/provisioning/jobs/sync/full.go b/pkg/registry/apis/provisioning/jobs/sync/full.go index 4912abe2606..673a3eab525 100644 --- a/pkg/registry/apis/provisioning/jobs/sync/full.go +++ b/pkg/registry/apis/provisioning/jobs/sync/full.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/registry/apis/provisioning/jobs/sync/incremental.go b/pkg/registry/apis/provisioning/jobs/sync/incremental.go index fcd3023a7da..a1140ff5a92 100644 --- a/pkg/registry/apis/provisioning/jobs/sync/incremental.go +++ b/pkg/registry/apis/provisioning/jobs/sync/incremental.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) // Convert git changes into resource file changes diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go index 061cdf3e5c6..3ff5316a9c5 100644 --- a/pkg/registry/apis/provisioning/register.go +++ b/pkg/registry/apis/provisioning/register.go @@ -42,13 +42,13 @@ import ( "github.com/grafana/grafana/pkg/registry/apis/provisioning/controller" appcontroller "github.com/grafana/grafana/apps/provisioning/pkg/controller" + "github.com/grafana/grafana/apps/provisioning/pkg/loki" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs" deletepkg "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs/delete" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs/export" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs/migrate" movepkg "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs/move" "github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs/sync" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/loki" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources" "github.com/grafana/grafana/pkg/registry/apis/provisioning/resources/signature" diff --git a/pkg/registry/apis/provisioning/repository/git/repository.go b/pkg/registry/apis/provisioning/repository/git/repository.go index 0d749b3673c..c9f25845778 100644 --- a/pkg/registry/apis/provisioning/repository/git/repository.go +++ b/pkg/registry/apis/provisioning/repository/git/repository.go @@ -17,9 +17,9 @@ import ( "github.com/grafana/grafana-app-sdk/logging" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" "github.com/grafana/nanogit" "github.com/grafana/nanogit/log" "github.com/grafana/nanogit/options" diff --git a/pkg/registry/apis/provisioning/repository/git/staged.go b/pkg/registry/apis/provisioning/repository/git/staged.go index 01a375ce7f4..28d79a687ae 100644 --- a/pkg/registry/apis/provisioning/repository/git/staged.go +++ b/pkg/registry/apis/provisioning/repository/git/staged.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" "github.com/grafana/nanogit" ) diff --git a/pkg/registry/apis/provisioning/repository/github/repository.go b/pkg/registry/apis/provisioning/repository/github/repository.go index 74584bc8dad..7a69af6af3a 100644 --- a/pkg/registry/apis/provisioning/repository/github/repository.go +++ b/pkg/registry/apis/provisioning/repository/github/repository.go @@ -10,10 +10,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository/git" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) // Make sure all public functions of this struct call the (*githubRepository).logger function, to ensure the GH repo details are included. diff --git a/pkg/registry/apis/provisioning/repository/local/extra.go b/pkg/registry/apis/provisioning/repository/local/extra.go index 3209a8e3bc1..1698ae976ed 100644 --- a/pkg/registry/apis/provisioning/repository/local/extra.go +++ b/pkg/registry/apis/provisioning/repository/local/extra.go @@ -4,8 +4,8 @@ import ( "context" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" "github.com/grafana/grafana/pkg/setting" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/registry/apis/provisioning/repository/local/local.go b/pkg/registry/apis/provisioning/repository/local/local.go index f5833f2fa2c..c70cefe5b29 100644 --- a/pkg/registry/apis/provisioning/repository/local/local.go +++ b/pkg/registry/apis/provisioning/repository/local/local.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) type LocalFolderResolver struct { diff --git a/pkg/registry/apis/provisioning/resources/dualwriter.go b/pkg/registry/apis/provisioning/resources/dualwriter.go index 24e605847e2..cd5f4625ff3 100644 --- a/pkg/registry/apis/provisioning/resources/dualwriter.go +++ b/pkg/registry/apis/provisioning/resources/dualwriter.go @@ -11,11 +11,11 @@ import ( authlib "github.com/grafana/authlib/types" "github.com/grafana/grafana-app-sdk/logging" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) // DualReadWriter is a wrapper around a repository that can read and write resources diff --git a/pkg/registry/apis/provisioning/resources/dualwriter_test.go b/pkg/registry/apis/provisioning/resources/dualwriter_test.go index 10ec8270655..1e1145705ff 100644 --- a/pkg/registry/apis/provisioning/resources/dualwriter_test.go +++ b/pkg/registry/apis/provisioning/resources/dualwriter_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" ) func TestGetPathType(t *testing.T) { diff --git a/pkg/registry/apis/provisioning/resources/filepath.go b/pkg/registry/apis/provisioning/resources/filepath.go index ca592904363..f8dbb8caebc 100644 --- a/pkg/registry/apis/provisioning/resources/filepath.go +++ b/pkg/registry/apis/provisioning/resources/filepath.go @@ -4,7 +4,7 @@ import ( "errors" "path" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" ) var ( diff --git a/pkg/registry/apis/provisioning/resources/filepath_test.go b/pkg/registry/apis/provisioning/resources/filepath_test.go index 89cf98180fa..2ca5ee5da09 100644 --- a/pkg/registry/apis/provisioning/resources/filepath_test.go +++ b/pkg/registry/apis/provisioning/resources/filepath_test.go @@ -3,7 +3,7 @@ package resources import ( "testing" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/stretchr/testify/require" ) diff --git a/pkg/registry/apis/provisioning/resources/folders.go b/pkg/registry/apis/provisioning/resources/folders.go index 598c73007ab..f62d6a0db4f 100644 --- a/pkg/registry/apis/provisioning/resources/folders.go +++ b/pkg/registry/apis/provisioning/resources/folders.go @@ -11,10 +11,10 @@ import ( "k8s.io/client-go/dynamic" folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) const MaxNumberOfFolders = 10000 diff --git a/pkg/registry/apis/provisioning/resources/id.go b/pkg/registry/apis/provisioning/resources/id.go index 2ffaa0cc5bc..45d9aa752a4 100644 --- a/pkg/registry/apis/provisioning/resources/id.go +++ b/pkg/registry/apis/provisioning/resources/id.go @@ -6,7 +6,7 @@ import ( "strings" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" ) // sanitiseKubeName removes all characters that don't fulfil the DNS subdomain name rules: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-subdomain-names diff --git a/pkg/registry/apis/provisioning/resources/parser.go b/pkg/registry/apis/provisioning/resources/parser.go index 447fb3eda11..81917afad81 100644 --- a/pkg/registry/apis/provisioning/resources/parser.go +++ b/pkg/registry/apis/provisioning/resources/parser.go @@ -17,11 +17,11 @@ import ( "github.com/grafana/grafana-app-sdk/logging" dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" "github.com/grafana/grafana/pkg/util" ) diff --git a/pkg/registry/apis/provisioning/resources/repository.go b/pkg/registry/apis/provisioning/resources/repository.go index 12747b9834d..1574e9848b0 100644 --- a/pkg/registry/apis/provisioning/resources/repository.go +++ b/pkg/registry/apis/provisioning/resources/repository.go @@ -10,9 +10,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) //go:generate mockery --name RepositoryResourcesFactory --structname MockRepositoryResourcesFactory --inpackage --filename repository_resources_factory_mock.go --with-expecter diff --git a/pkg/registry/apis/provisioning/resources/resources.go b/pkg/registry/apis/provisioning/resources/resources.go index cbd5cb120c6..14a947f5065 100644 --- a/pkg/registry/apis/provisioning/resources/resources.go +++ b/pkg/registry/apis/provisioning/resources/resources.go @@ -13,10 +13,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/infra/slugify" "github.com/grafana/grafana/pkg/registry/apis/provisioning/repository" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) var ( diff --git a/pkg/registry/apis/provisioning/resources/tree.go b/pkg/registry/apis/provisioning/resources/tree.go index ce92f104b8b..77d97573a5f 100644 --- a/pkg/registry/apis/provisioning/resources/tree.go +++ b/pkg/registry/apis/provisioning/resources/tree.go @@ -8,8 +8,8 @@ import ( folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1" provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1" + "github.com/grafana/grafana/apps/provisioning/pkg/safepath" "github.com/grafana/grafana/pkg/apimachinery/utils" - "github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath" ) // FolderTree contains the entire set of folders (at a given snapshot in time) of the Grafana instance.