Provisioning: Move provisioning extras to OSS extensions (#108167)

* Move provisioning extensions to OSS

* Fix the wire stuff

* Move it to extras packages

* Add hack to assert test differently for enterprise

pkg/registry/apis/provisioning/extras/register.go

@@ -0,0 +1,13 @@
+package extras
+
+import (
+	"github.com/grafana/grafana/pkg/registry/apis/provisioning"
+	"github.com/grafana/grafana/pkg/registry/apis/provisioning/webhooks"
+)
+
+// HACK: This is a hack so that wire can uniquely identify dependencies
+func ProvideProvisioningOSSExtras(webhook webhooks.WebhookExtraBuilder) []provisioning.ExtraBuilder {
+	return []provisioning.ExtraBuilder{
+		webhook.ExtraBuilder,
+	}
+}

pkg/registry/apis/wireset.go

@@ -13,7 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/registry/apis/ofrep"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/secrets"
-	"github.com/grafana/grafana/pkg/registry/apis/provisioning/webhooks"
 	"github.com/grafana/grafana/pkg/registry/apis/query"
 	"github.com/grafana/grafana/pkg/registry/apis/secret"
 	"github.com/grafana/grafana/pkg/registry/apis/service"
@@ -21,18 +20,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 )
 
-// HACK: This is a hack so that wire can uniquely identify dependencies
-func MergeProvisioningExtras(webhook webhooks.WebhookExtraBuilder) []provisioning.ExtraBuilder {
-	return []provisioning.ExtraBuilder{
-		webhook.ExtraBuilder,
-	}
-}
-
-var ProvisioningExtras = wire.NewSet(
-	webhooks.ProvideWebhooks,
-	MergeProvisioningExtras,
-)
-
 // WireSetExts is a set of providers that can be overridden by enterprise implementations.
 var WireSetExts = wire.NewSet(
 	noopstorage.ProvideStorageBackend,
@@ -57,7 +44,6 @@ var WireSet = wire.NewSet(
 	datasource.RegisterAPIService,
 	folders.RegisterAPIService,
 	iam.RegisterAPIService,
-	ProvisioningExtras,
 	secrets.ProvideRepositorySecrets,
 	provisioning.RegisterAPIService,
 	service.RegisterAPIService,