Enable forced deletion of GrafanaFolder

.chainsaw.yaml

@@ -1,9 +1,17 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/configuration-chainsaw-v1alpha1.json
-apiVersion: chainsaw.kyverno.io/v1alpha1
+apiVersion: chainsaw.kyverno.io/v1alpha2
 kind: Configuration
 metadata:
   name: configuration
 spec:
+  error:
+    catch:
+      - describe:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: grafana-operator
+      - podLogs:
+          namespace: grafana-operator-system
+          tail: 100
   timeouts:
     assert: 2m0s
     cleanup: 3m0s

controllers/grafanafolder_controller.go

@@ -113,7 +113,8 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 
 			namespace, name, uid := folder.Split()
 
-			params := folders.NewDeleteFolderParams().WithFolderUID(uid)
+			reftrue := true
+			params := folders.NewDeleteFolderParams().WithFolderUID(uid).WithForceDeleteRules(&reftrue)
 			_, err = grafanaClient.Folders.DeleteFolder(params) //nolint
 			if err != nil {
 				var notFound *folders.DeleteFolderNotFound
@@ -292,7 +293,8 @@ func (r *GrafanaFolderReconciler) onFolderDeleted(ctx context.Context, namespace
 			if err != nil {
 				return err
 			}
-			params := folders.NewDeleteFolderParams().WithFolderUID(*uid)
+			reftrue := true
+			params := folders.NewDeleteFolderParams().WithFolderUID(*uid).WithForceDeleteRules(&reftrue)
 			_, err = grafanaClient.Folders.DeleteFolder(params) //nolint
 			if err != nil {
 				var notFound *folders.DeleteFolderNotFound

tests/e2e/force_delete_folder/chainsaw-test.yaml

@@ -0,0 +1,131 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: force-delete-folders
+spec:
+  concurrent: false
+  bindings:
+    - name: USER
+      value: root
+    - name: PASS
+      value: secret
+  steps:
+    - name: Create Grafana with testdata resources
+      try:
+        - apply:
+            file: ../testdata-resources.yaml
+
+        - assert:
+            resource:
+              apiVersion: v1
+              kind: Pod
+              metadata:
+                (contains(name, 'testdata-deployment')): true
+
+        - wait:
+            apiVersion: v1
+            kind: Pod
+            timeout: 1m
+            for:
+              condition:
+                name: Ready
+                value: 'true'
+
+        - assert:
+            resource:
+              apiVersion: grafana.integreatly.org/v1beta1
+              kind: Grafana
+              metadata:
+                name: testdata
+              status:
+                stage: complete
+                stageStatus: success
+
+        - assert:
+            resource:
+              apiVersion: grafana.integreatly.org/v1beta1
+              kind: GrafanaFolder
+              metadata:
+                name: testdata
+              status:
+                conditions:
+                - reason: ApplySuccessful
+                  status: "True"
+                  type: FolderSynchronized
+
+        - assert:
+            resource:
+              apiVersion: grafana.integreatly.org/v1beta1
+              kind: GrafanaAlertRuleGroup
+              metadata:
+                name: testdata
+              status:
+                conditions:
+                - reason: ApplySuccessful
+                  status: "True"
+                  type: AlertGroupSynchronized
+
+    - name: Ensure folder exists in Grafana
+      try:
+        - apply: &curlJob
+            resource:
+              apiVersion: batch/v1
+              kind: Job
+              metadata:
+                name: folder-curl
+              spec:
+                backoffLimit: 1
+                template:
+                  spec:
+                    restartPolicy: Never
+                    containers:
+                      - name: curl
+                        image: alpine/curl:latest
+                        command: ["ash", "-c"]
+                        args:
+                          - |
+                            curl --fail --silent --show-error \
+                              -u ${BASIC_USER}:${BASIC_PASS} \
+                              "http://testdata-service.${NS}.svc:3000/api/folders/testdata-uid"
+                        env:
+                          - name: BASIC_USER
+                            value: ($USER)
+                          - name: BASIC_PASS
+                            value: ($PASS)
+                          - name: NS
+                            value: ($namespace)
+        - assert:
+            resource:
+              apiVersion: batch/v1
+              kind: Job
+              metadata:
+                name: folder-curl
+              status:
+                (conditions[?type == 'Complete']):
+                  - status: "True"
+        - delete:
+            ref:
+              apiVersion: batch/v1
+              kind: Job
+              name: folder-curl
+
+    - name: Delete Folder and verify it's removed in Grafana
+      try:
+        - delete:
+            ref:
+              apiVersion: grafana.integreatly.org/v1beta1
+              kind: GrafanaFolder
+              name: testdata
+
+        - apply: *curlJob
+
+        - assert:
+            resource:
+              apiVersion: batch/v1
+              kind: Job
+              metadata:
+                name: folder-curl
+              status:
+                (conditions[?type == 'Failed']):
+                  - status: "True"

tests/e2e/immutable_uids/grafanadashboard/chainsaw-test.yaml

@@ -4,6 +4,7 @@ kind: Test
 metadata:
   name: dashboards-uids
 spec:
+  concurrent: false
   bindings:
     - name: dashboardModel
       value: |