Remove more references to legacy

apps/provisioning/kinds/manifest.cue

@@ -1,9 +1,10 @@
 package repository
 
 manifest: {
-	appName:		"provisioning"
-	groupOverride:	"provisioning.grafana.app"
-	kinds:			[
+	appName:          "provisioning"
+	groupOverride:    "provisioning.grafana.app"
+	preferredVersion: "v0alpha1"
+	kinds: [
 		repository,
 	]
 } 

apps/provisioning/kinds/repository.cue

@@ -80,7 +80,7 @@ repository: {
 					// Enabled must be saved as true before any sync job will run
 					enabled: bool
 					// Where values should be saved
-					target: "unified" | "legacy"
+					target: "instance" | "folder"
 					// When non-zero, the sync will run periodically
 					intervalSeconds?: int
 				}

apps/provisioning/pkg/apis/manifestdata/provisioning_manifest.go

@@ -0,0 +1,94 @@
+//
+// This file is generated by grafana-app-sdk
+// DO NOT EDIT
+//
+
+package manifestdata
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana-app-sdk/app"
+	"github.com/grafana/grafana-app-sdk/resource"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+var ()
+
+var appManifestData = app.ManifestData{
+	AppName:          "provisioning",
+	Group:            "provisioning.grafana.app",
+	PreferredVersion: "v0alpha1",
+	Versions:         []app.ManifestVersion{},
+}
+
+func LocalManifest() app.Manifest {
+	return app.NewEmbeddedManifest(appManifestData)
+}
+
+func RemoteManifest() app.Manifest {
+	return app.NewAPIServerManifest("provisioning")
+}
+
+var kindVersionToGoType = map[string]resource.Kind{}
+
+// ManifestGoTypeAssociator returns the associated resource.Kind instance for a given Kind and Version, if one exists.
+// If there is no association for the provided Kind and Version, exists will return false.
+func ManifestGoTypeAssociator(kind, version string) (goType resource.Kind, exists bool) {
+	goType, exists = kindVersionToGoType[fmt.Sprintf("%s/%s", kind, version)]
+	return goType, exists
+}
+
+var customRouteToGoResponseType = map[string]any{}
+
+// ManifestCustomRouteResponsesAssociator returns the associated response go type for a given kind, version, custom route path, and method, if one exists.
+// kind may be empty for custom routes which are not kind subroutes. Leading slashes are removed from subroute paths.
+// If there is no association for the provided kind, version, custom route path, and method, exists will return false.
+// Resource routes (those without a kind) should prefix their route with "<namespace>/" if the route is namespaced (otherwise the route is assumed to be cluster-scope)
+func ManifestCustomRouteResponsesAssociator(kind, version, path, verb string) (goType any, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoResponseType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+var customRouteToGoParamsType = map[string]runtime.Object{}
+
+func ManifestCustomRouteQueryAssociator(kind, version, path, verb string) (goType runtime.Object, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoParamsType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+var customRouteToGoRequestBodyType = map[string]any{}
+
+func ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb string) (goType any, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoRequestBodyType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+type GoTypeAssociator struct{}
+
+func NewGoTypeAssociator() *GoTypeAssociator {
+	return &GoTypeAssociator{}
+}
+
+func (g *GoTypeAssociator) KindToGoType(kind, version string) (goType resource.Kind, exists bool) {
+	return ManifestGoTypeAssociator(kind, version)
+}
+func (g *GoTypeAssociator) CustomRouteReturnGoType(kind, version, path, verb string) (goType any, exists bool) {
+	return ManifestCustomRouteResponsesAssociator(kind, version, path, verb)
+}
+func (g *GoTypeAssociator) CustomRouteQueryGoType(kind, version, path, verb string) (goType runtime.Object, exists bool) {
+	return ManifestCustomRouteQueryAssociator(kind, version, path, verb)
+}
+func (g *GoTypeAssociator) CustomRouteRequestBodyGoType(kind, version, path, verb string) (goType any, exists bool) {
+	return ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb)
+}

pkg/registry/apis/provisioning/jobs/migrate/worker_test.go

@@ -67,12 +67,11 @@ func TestMigrationWorker_ProcessNotReaderWriter(t *testing.T) {
 
 func TestMigrationWorker_Process(t *testing.T) {
 	tests := []struct {
-		name           string
-		setupMocks     func(*MockMigrator, *jobs.MockJobProgressRecorder)
-		setupRepo      func(*repository.MockRepository)
-		job            provisioning.Job
-		expectedError  string
-		isLegacyActive bool
+		name          string
+		setupMocks    func(*MockMigrator, *jobs.MockJobProgressRecorder)
+		setupRepo     func(*repository.MockRepository)
+		job           provisioning.Job
+		expectedError string
 	}{
 		{
 			name: "should fail when migrate settings are missing",
@@ -97,7 +96,6 @@ func TestMigrationWorker_Process(t *testing.T) {
 					Migrate: &provisioning.MigrateJobOptions{},
 				},
 			},
-			isLegacyActive: false,
 			setupMocks: func(um *MockMigrator, pr *jobs.MockJobProgressRecorder) {
 				pr.On("SetTotal", mock.Anything, 10).Return()
 				um.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -114,7 +112,6 @@ func TestMigrationWorker_Process(t *testing.T) {
 					Migrate: &provisioning.MigrateJobOptions{},
 				},
 			},
-			isLegacyActive: false,
 			setupMocks: func(um *MockMigrator, pr *jobs.MockJobProgressRecorder) {
 				pr.On("SetTotal", mock.Anything, 10).Return()
 				um.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)