docs: update docs

internal/baseController/controller.go

@@ -1,4 +1,4 @@
-package controllers
+package baseController
 
 import (
 	"context"

internal/baseController/controller_test.go

@@ -1,5 +1,5 @@
 // AI generated tests and not yet reviewed.
-package controllers
+package baseController
 
 import (
 	"context"

pkg/controllers/application/controller.go

@@ -37,8 +37,8 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
+	"gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/internal/baseController"
 	v1alpha1 "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/apis/application/v1alpha1"
-	controllers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/controllers"
 	clientset "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned"
 	operatorscheme "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned/scheme"
 	informers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/informers/externalversions/application/v1alpha1"
@@ -68,7 +68,7 @@ type ApplicationController struct {
 
 	applicationListener listers.ApplicationLister
 
-	controller *controllers.Controller
+	controller *baseController.Controller
 }
 
 func NewController(
@@ -98,7 +98,7 @@ func NewController(
 		authentik:            authentik,
 		applicationListener:  applicationInformer.Lister(),
 	}
-	c.controller = controllers.NewController(
+	c.controller = baseController.NewController(
 		ctx,
 		workqueue.NewTypedRateLimitingQueue(ratelimiter),
 		recorder,
@@ -160,7 +160,7 @@ func (c *ApplicationController) ensureFinalizers(ctx context.Context, app *v1alp
 }
 
 func (c *ApplicationController) reconcileDelete(ctx context.Context, app *v1alpha1.Application) error {
-	r, err := c.authentik.CoreApi.CoreApplicationsDestroy(ctx, app.Status.PK).Execute()
+	r, err := c.authentik.CoreApi.CoreApplicationsDestroy(ctx, app.Spec.Slug).Execute()
 	if err != nil {
 		// This handles an edge-case, where when the Application on Authentik has already been deleted, but the finalizer is still present. We just remove the finalizer and return.
 		if r != nil && r.StatusCode != http.StatusNotFound {

pkg/controllers/application/controller_test.go

@@ -130,7 +130,7 @@ func TestController_syncHandler_delete(t *testing.T) {
 
 	var destroyCalled bool
 	server := newAuthentikTestServer(t, authentikTestHandlers{
-		proxyDestroy: func(w http.ResponseWriter, r *http.Request) {
+		applicationDestroy: func(w http.ResponseWriter, r *http.Request) {
 			destroyCalled = true
 			if r.Method != http.MethodDelete {
 				t.Errorf("destroy method = %s, want DELETE", r.Method)
@@ -165,7 +165,7 @@ func TestController_syncHandler_delete_providerAlreadyGone(t *testing.T) {
 	app.Finalizers = []string{DeleteAuthentikApplicationFinalizer}
 
 	server := newAuthentikTestServer(t, authentikTestHandlers{
-		proxyDestroy: func(w http.ResponseWriter, _ *http.Request) {
+		applicationDestroy: func(w http.ResponseWriter, _ *http.Request) {
 			http.NotFound(w, nil)
 		},
 	})
@@ -198,25 +198,31 @@ func TestController_syncHandler_notFound(t *testing.T) {
 	}
 }
 
-func TestController_syncHandler_invalidPK(t *testing.T) {
+func TestController_syncHandler_delete_usesSlugNotPK(t *testing.T) {
 	now := metav1.Now()
 	app := testApplication()
 	app.Status.PK = "not-a-number"
 	app.DeletionTimestamp = &now
 	app.Finalizers = []string{DeleteAuthentikApplicationFinalizer}
 
-	server := newAuthentikTestServer(t, authentikTestHandlers{})
+	var destroySlug string
+	server := newAuthentikTestServer(t, authentikTestHandlers{
+		applicationDestroy: func(w http.ResponseWriter, r *http.Request) {
+			destroySlug = strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, "/api/v3/core/applications/"), "/")
+			w.WriteHeader(http.StatusNoContent)
+		},
+	})
 	t.Cleanup(server.Close)
 
 	ctrl, ctx, cancel := newTestController(t, app, server.URL)
 	t.Cleanup(cancel)
 
 	err := ctrl.syncHandler(ctx, cache.ObjectName{Namespace: app.Namespace, Name: app.Name})
-	if err == nil {
+	if err != nil {
-		t.Fatal("syncHandler() error = nil, want parse error")
+		t.Fatalf("syncHandler() error = %v", err)
 	}
-	if !strings.Contains(err.Error(), "error parsing PK") {
+	if destroySlug != app.Spec.Slug {
-		t.Fatalf("syncHandler() error = %v, want PK parse error", err)
+		t.Fatalf("destroy slug = %q, want %q (delete must use spec.slug, not status.pk)", destroySlug, app.Spec.Slug)
 	}
 }
 
@@ -295,7 +301,7 @@ type authentikTestHandlers struct {
 	applicationCreate        http.HandlerFunc
 	applicationRetrieve      http.HandlerFunc
 	applicationPartialUpdate http.HandlerFunc
-	proxyDestroy             http.HandlerFunc
+	applicationDestroy       http.HandlerFunc
 }
 
 func newAuthentikTestServer(t *testing.T, handlers authentikTestHandlers) *httptest.Server {
@@ -331,25 +337,15 @@ func newAuthentikTestServer(t *testing.T, handlers authentikTestHandlers) *httpt
 					return
 				}
 				http.NotFound(w, r)
-			default:
+			case http.MethodDelete:
-				http.Error(w, "unexpected method on application instance", http.StatusMethodNotAllowed)
+				if handlers.applicationDestroy != nil {
-			}
+					handlers.applicationDestroy(w, r)
-
-		case strings.HasPrefix(path, "/api/v3/providers/proxy/") && strings.HasSuffix(path, "/"):
-			idPath := strings.TrimPrefix(path, "/api/v3/providers/proxy/")
-			if idPath == "" {
-				http.NotFound(w, r)
-				return
-			}
-			if r.Method == http.MethodDelete {
-				if handlers.proxyDestroy != nil {
-					handlers.proxyDestroy(w, r)
 					return
 				}
 				http.NotFound(w, r)
-				return
+			default:
+				http.Error(w, "unexpected method on application instance", http.StatusMethodNotAllowed)
 			}
-			http.Error(w, "unexpected method on proxy instance", http.StatusMethodNotAllowed)
 
 		default:
 			http.NotFound(w, r)

pkg/controllers/policybinding/controller.go

@@ -37,8 +37,8 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
+	"gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/internal/baseController"
 	v1alpha1 "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/apis/policybinding/v1alpha1"
-	controllers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/controllers"
 	clientset "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned"
 	operatorscheme "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned/scheme"
 	informers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/informers/externalversions/policybinding/v1alpha1"
@@ -68,7 +68,7 @@ type PolicyBindingController struct {
 
 	policyBindingListener listers.PolicyBindingLister
 
-	controller *controllers.Controller
+	controller *baseController.Controller
 }
 
 func NewController(
@@ -98,7 +98,7 @@ func NewController(
 		authentik:              authentik,
 		policyBindingListener:  policyBindingInformer.Lister(),
 	}
-	c.controller = controllers.NewController(
+	c.controller = baseController.NewController(
 		ctx,
 		workqueue.NewTypedRateLimitingQueue(ratelimiter),
 		recorder,

pkg/controllers/proxyprovider/controller.go

@@ -38,8 +38,8 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
+	"gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/internal/baseController"
 	v1alpha1 "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/apis/proxyprovider/v1alpha1"
-	controllers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/controllers"
 	clientset "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned"
 	operatorscheme "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/clientset/versioned/scheme"
 	informers "gitea.t000-n.de/t.behrendt/authentik-kubernetes-operator/pkg/generated/informers/externalversions/proxyprovider/v1alpha1"
@@ -69,7 +69,7 @@ type ProxyProviderController struct {
 
 	proxyLister listers.ProxyProviderLister
 
-	controller *controllers.Controller
+	controller *baseController.Controller
 }
 
 func NewController(
@@ -99,7 +99,7 @@ func NewController(
 		authentik:              authentik,
 		proxyLister:            proxyInformer.Lister(),
 	}
-	c.controller = controllers.NewController(
+	c.controller = baseController.NewController(
 		ctx,
 		workqueue.NewTypedRateLimitingQueue(ratelimiter),
 		recorder,