POC/Provisioning: Remove hello world resource (#97717)

It feels like it's time to get rid of this. It has been useful for testing, but ultimately replaced by proper
subresources in their own paths and files.

pkg/registry/apis/provisioning/hello.go

@@ -1,142 +0,0 @@
-package provisioning
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"net/http"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/registry/rest"
-
-	"github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1"
-)
-
-type helloWorldSubresource struct {
-	getter        rest.Getter
-	statusUpdater rest.Updater
-	// for our hacky test access right now
-	parent *ProvisioningAPIBuilder
-	logger *slog.Logger
-}
-
-func (*helloWorldSubresource) New() runtime.Object {
-	// This is added as the "ResponseType" regardless what ProducesObject() returns
-	return &v0alpha1.HelloWorld{}
-}
-
-func (*helloWorldSubresource) Destroy() {}
-
-func (*helloWorldSubresource) NamespaceScoped() bool {
-	return true
-}
-
-func (*helloWorldSubresource) GetSingularName() string {
-	return "HelloWorld"
-}
-
-func (*helloWorldSubresource) ProducesMIMETypes(verb string) []string {
-	return []string{"application/json"}
-}
-
-func (*helloWorldSubresource) ProducesObject(verb string) any {
-	return &v0alpha1.HelloWorld{}
-}
-
-func (*helloWorldSubresource) ConnectMethods() []string {
-	return []string{http.MethodGet}
-}
-
-func (*helloWorldSubresource) NewConnectOptions() (runtime.Object, bool, string) {
-	return nil, false, ""
-}
-
-func (s *helloWorldSubresource) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
-	logger := s.logger.With("repository_name", name)
-	obj, err := s.getter.Get(ctx, name, &metav1.GetOptions{})
-	if err != nil {
-		return nil, err
-	}
-	repo, ok := obj.(*v0alpha1.Repository)
-	if !ok {
-		return nil, fmt.Errorf("expected repository, but got %t", obj)
-	}
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		whom := r.URL.Query().Get("whom")
-		if whom == "" {
-			whom = "World"
-		}
-		logger := logger.With("whom", whom)
-
-		// Exercise rendering
-		renderPath := r.URL.Query().Get("render")
-		if renderPath != "" {
-			if !s.parent.renderer.IsAvailable(ctx) {
-				responder.Error(fmt.Errorf("render not available"))
-				return
-			}
-
-			ref := r.URL.Query().Get("ref")
-			r, err := s.parent.GetRepository(ctx, name)
-			if err != nil {
-				responder.Error(err)
-				return
-			}
-
-			path, err := s.parent.renderer.RenderDashboardPreview(ctx, r, renderPath, ref)
-			if err != nil {
-				responder.Error(err)
-				return
-			}
-
-			// Show the result
-			_, err = w.Write([]byte(path))
-			if err != nil {
-				responder.Error(err)
-				return
-			}
-			return
-		}
-
-		newCommit := r.URL.Query().Get("commit")
-		if newCommit != "" {
-			repo.Status.CurrentGitCommit = newCommit
-			obj, _, err := s.statusUpdater.Update(
-				ctx,
-				name, // resource name
-				rest.DefaultUpdatedObjectInfo(obj, func(ctx context.Context, newObj, oldObj runtime.Object) (transformedNewObj runtime.Object, err error) {
-					newObj.(*v0alpha1.Repository).Status.CurrentGitCommit = newCommit
-					return newObj, nil
-				}),
-				func(ctx context.Context, obj runtime.Object) error { return nil },      // createValidation
-				func(ctx context.Context, obj, old runtime.Object) error { return nil }, // updateValidation
-				false,                   // forceAllowCreate
-				&metav1.UpdateOptions{}, // options
-			)
-			if err != nil {
-				responder.Error(err)
-				return
-			}
-			repo = obj.(*v0alpha1.Repository)
-		}
-
-		logger.InfoContext(ctx, "Got a repository",
-			"name", repo.Name,
-			"type", repo.Spec.Type,
-			"status", repo.Status,
-			"local", repo.Spec.Local,
-			"github", repo.Spec.GitHub,
-			"s3", repo.Spec.S3)
-
-		responder.Object(http.StatusOK, &v0alpha1.HelloWorld{Whom: whom})
-	}), nil
-}
-
-var (
-	_ rest.Storage              = (*helloWorldSubresource)(nil)
-	_ rest.Connecter            = (*helloWorldSubresource)(nil)
-	_ rest.Scoper               = (*helloWorldSubresource)(nil)
-	_ rest.SingularNameProvider = (*helloWorldSubresource)(nil)
-	_ rest.StorageMetadata      = (*helloWorldSubresource)(nil)
-)

pkg/registry/apis/provisioning/register.go

@@ -190,12 +190,6 @@ func (b *ProvisioningAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserv
 	storage[provisioning.RepositoryResourceInfo.StoragePath()] = repositoryStorage
 	// Can be used by kubectl: kubectl --kubeconfig grafana.kubeconfig patch Repository local-devenv --type=merge --subresource=status --patch='status: {"currentGitCommit": "hello"}'
 	storage[provisioning.RepositoryResourceInfo.StoragePath("status")] = repositoryStatusStorage
-	storage[provisioning.RepositoryResourceInfo.StoragePath("hello")] = &helloWorldSubresource{
-		getter:        repositoryStorage,
-		statusUpdater: repositoryStatusStorage,
-		parent:        b,
-		logger:        b.logger.With("connector", "hello_world"),
-	}
 	storage[provisioning.RepositoryResourceInfo.StoragePath("webhook")] = &webhookConnector{
 		getter: b,
 		client: b.identities,

pkg/tests/apis/provisioning/provisioning_test.go

@@ -121,15 +121,6 @@ func TestIntegrationProvisioning(t *testing.T) {
 						"update"
 					]
 				},
-				{
-					"name": "repositories/hello",
-					"singularName": "",
-					"namespaced": true,
-					"kind": "HelloWorld",
-					"verbs": [
-						"get"
-					]
-				},
 				{
 					"name": "repositories/history",
 					"singularName": "",
@@ -286,26 +277,6 @@ func TestIntegrationProvisioning(t *testing.T) {
 		require.Error(t, err)
 	})
 
-	t.Run("basic helloworld subresource", func(t *testing.T) {
-		// Add it if this is the only test that ran
-		_, err := client.Resource.Update(ctx,
-			helper.LoadYAMLOrJSONFile("testdata/github-example.yaml"),
-			metav1.UpdateOptions{},
-		)
-		require.NoError(t, err)
-
-		// "test" is Not found
-		resp, err := client.Resource.Get(ctx, "test", metav1.GetOptions{}, "hello")
-		require.Error(t, err) // "test" not found
-		require.Nil(t, resp)  // "test" not found
-
-		resp, err = client.Resource.Get(ctx, "github-example", metav1.GetOptions{}, "hello")
-		require.NoError(t, err)
-		require.Equal(t,
-			"World",
-			mustNestedString(resp.Object, "whom"))
-	})
-
 	t.Run("creating repository creates folder", func(t *testing.T) {
 		// Just make sure the folder doesn't exist in advance.
 		err := folderClient.Resource.Delete(ctx, "thisisafolderref", metav1.DeleteOptions{})