AB-449 Fix flaky tests and properly clean up resources

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
   build-and-release:
     needs: test
     runs-on: ubuntu-24.04
-    timeout-minutes: 15
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v6
         with:

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     name: Tests (PostgreSQL ${{ matrix.postgres-version }})
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ checkstyle = "13.0.0"
 datafaker = "2.5.3"
 errorProne = "2.46.0"
 errorPronePlugin = "4.4.0"
-nullAway = "0.13.0"
+nullAway = "0.13.1"
 
 [plugins]
 # https://github.com/allegro/axion-release-plugin

operator/src/main/java/it/aboutbits/postgresql/core/ClusterReference.java

@@ -13,7 +13,7 @@
 public class ClusterReference {
     @Required
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The ClusterReference name must not be empty."
     )
     private String name = "";

operator/src/main/java/it/aboutbits/postgresql/core/SecretRef.java

@@ -13,7 +13,7 @@
 public class SecretRef {
     @Required
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The SecretRef name must not be empty."
     )
     private String name = "";

operator/src/main/java/it/aboutbits/postgresql/crd/clusterconnection/ClusterConnectionReconciler.java

@@ -26,6 +26,16 @@ public UpdateControl<ClusterConnection> reconcile(
     ) {
         var status = initializeStatus(resource);
 
+        var name = resource.getMetadata().getName();
+        var namespace = resource.getMetadata().getNamespace();
+
+        log.info(
+                "Reconciling ClusterConnection [resource={}/{}, status.phase={}]",
+                namespace,
+                name,
+                status.getPhase()
+        );
+
         try (var dsl = contextFactory.getDSLContext(resource)) {
             var version = dsl.fetchSingle("select version()").into(String.class);
 

operator/src/main/java/it/aboutbits/postgresql/crd/clusterconnection/ClusterConnectionSpec.java

@@ -18,7 +18,7 @@
 public class ClusterConnectionSpec {
     @Required
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The ClusterConnection host must not be empty."
     )
     private String host = "";
@@ -30,7 +30,7 @@ public class ClusterConnectionSpec {
 
     @Required
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The ClusterConnection database must not be empty."
     )
     private String database = "postgres";

operator/src/main/java/it/aboutbits/postgresql/crd/database/DatabaseReconciler.java

@@ -119,7 +119,7 @@ public DeleteControl cleanup(
             context.getClient().resource(resource).patchStatus();
 
             return DeleteControl.noFinalizerRemoval()
-                    .rescheduleAfter(1, TimeUnit.SECONDS);
+                    .rescheduleAfter(100, TimeUnit.MILLISECONDS);
         }
 
         // We do not actually delete the database if the reclaimPolicy is set to RETAIN, we only delete the CR instance

operator/src/main/java/it/aboutbits/postgresql/crd/database/DatabaseSpec.java

@@ -22,7 +22,7 @@ public class DatabaseSpec {
             message = "The Database name is immutable. Allowing to rename the Database name using 'alter database <old_name> rename to <new_name>' would add unwanted side-effects to the Operator."
     )
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The Database name must not be empty."
     )
     private String name = "";

operator/src/main/java/it/aboutbits/postgresql/crd/defaultprivilege/DefaultPrivilegeReconciler.java

@@ -141,7 +141,7 @@ public DeleteControl cleanup(
             context.getClient().resource(resource).patchStatus();
 
             return DeleteControl.noFinalizerRemoval()
-                    .rescheduleAfter(1, TimeUnit.SECONDS);
+                    .rescheduleAfter(100, TimeUnit.MILLISECONDS);
         }
 
         var clusterRef = spec.getClusterRef();
@@ -164,9 +164,10 @@ public DeleteControl cleanup(
                     .rescheduleAfter(60, TimeUnit.SECONDS);
         }
 
+        var database = spec.getDatabase();
         var clusterConnection = clusterConnectionOptional.get();
 
-        try (var dsl = contextFactory.getDSLContext(clusterConnection)) {
+        try (var dsl = contextFactory.getDSLContext(clusterConnection, database)) {
             dsl.transaction(cfg -> {
                 var tx = cfg.dsl();
 

operator/src/main/java/it/aboutbits/postgresql/crd/defaultprivilege/DefaultPrivilegeService.java

@@ -41,6 +41,7 @@ public Set<Privilege> determineCurrentDefaultPrivileges(
             DSLContext tx,
             DefaultPrivilegeSpec spec
     ) {
+        var owner = spec.getOwner();
         var role = spec.getRole();
         var schema = spec.getSchema();
 
@@ -65,6 +66,11 @@ public Set<Privilege> determineCurrentDefaultPrivileges(
                 .from(PG_DEFAULT_ACL)
                 .crossJoin(Routines.aclexplode(PG_DEFAULT_ACL.DEFACLACL))
                 .where(
+                        PG_DEFAULT_ACL.DEFACLROLE.eq(field(
+                                ROLE_OID_SQL,
+                                OID_DATA_TYPE,
+                                val(owner)
+                        )),
                         PG_DEFAULT_ACL.DEFACLOBJTYPE.eq(objectType.objectTypeChar()),
                         objectType == SCHEMA
                                 ? noCondition()

operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantReconciler.java

@@ -146,7 +146,7 @@ public DeleteControl cleanup(
             context.getClient().resource(resource).patchStatus();
 
             return DeleteControl.noFinalizerRemoval()
-                    .rescheduleAfter(1, TimeUnit.SECONDS);
+                    .rescheduleAfter(100, TimeUnit.MILLISECONDS);
         }
 
         var clusterRef = spec.getClusterRef();
@@ -213,7 +213,7 @@ protected CRStatus newStatus() {
         return new CRStatus();
     }
 
-    @SuppressWarnings("java:S3776")
+    @SuppressWarnings({"checkstyle:MethodLength", "java:S3776"})
     private UpdateControl<Grant> reconcileInTransaction(
             DSLContext tx,
             Grant resource,

operator/src/main/java/it/aboutbits/postgresql/crd/role/RoleReconciler.java

@@ -149,7 +149,7 @@ public DeleteControl cleanup(
             context.getClient().resource(resource).patchStatus();
 
             return DeleteControl.noFinalizerRemoval()
-                    .rescheduleAfter(1, TimeUnit.SECONDS);
+                    .rescheduleAfter(100, TimeUnit.MILLISECONDS);
         }
 
         var clusterRef = spec.getClusterRef();

operator/src/main/java/it/aboutbits/postgresql/crd/role/RoleSpec.java

@@ -27,7 +27,7 @@ public class RoleSpec {
             message = "The Role name is immutable. Allowing to rename the Role name using 'alter role <old_name> rename to <new_name>' would add unwanted side-effects to the Operator."
     )
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The Role name must not be empty."
     )
     private String name = "";

operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaReconciler.java

@@ -121,7 +121,7 @@ public DeleteControl cleanup(
             context.getClient().resource(resource).patchStatus();
 
             return DeleteControl.noFinalizerRemoval()
-                    .rescheduleAfter(1, TimeUnit.SECONDS);
+                    .rescheduleAfter(100, TimeUnit.MILLISECONDS);
         }
 
         // We do not actually delete the schema if the reclaimPolicy is set to RETAIN, we only delete the CR instance

operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaSpec.java

@@ -22,7 +22,7 @@ public class SchemaSpec {
             message = "The Schema name is immutable. Allowing to rename the Schema name using 'alter schema <old_name> rename to <new_name>' would add unwanted side-effects to the Operator."
     )
     @ValidationRule(
-            value = "self.size() > 0",
+            value = "self.trim().size() > 0",
             message = "The Schema name must not be empty."
     )
     private String name = "";

operator/src/test/java/it/aboutbits/postgresql/PostgreSQLInstanceReadinessCheckTest.java

@@ -2,8 +2,8 @@
 
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.quarkus.test.junit.QuarkusTest;
+import it.aboutbits.postgresql._support.testdata.base.TestUtil;
 import it.aboutbits.postgresql._support.testdata.persisted.Given;
-import it.aboutbits.postgresql.crd.clusterconnection.ClusterConnection;
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,10 +29,8 @@ class PostgreSQLInstanceReadinessCheckTest {
     KubernetesClient kubernetesClient;
 
     @BeforeEach
-    void cleanUp() {
-        kubernetesClient.resources(ClusterConnection.class)
-                .withTimeout(5, TimeUnit.SECONDS)
-                .delete();
+    void resetEnvironment() {
+        TestUtil.resetEnvironment(kubernetesClient);
     }
 
     @Test

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/base/TestDataCreator.java

@@ -62,7 +62,8 @@ public static String randomKubernetesNameSuffix(String name) {
         }
 
         var separator = "-";
-        var suffixLength = maxLength - name.length() - separator.length();
+        var availableSpace = maxLength - name.length() - separator.length();
+        var suffixLength = Math.min(7, availableSpace);
 
         return name + separator + FAKER.regexify("[a-z0-9]{%d}".formatted(suffixLength));
     }

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/base/TestUtil.java

@@ -0,0 +1,44 @@
+package it.aboutbits.postgresql._support.testdata.base;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import it.aboutbits.postgresql.crd.clusterconnection.ClusterConnection;
+import it.aboutbits.postgresql.crd.database.Database;
+import it.aboutbits.postgresql.crd.defaultprivilege.DefaultPrivilege;
+import it.aboutbits.postgresql.crd.grant.Grant;
+import it.aboutbits.postgresql.crd.role.Role;
+import it.aboutbits.postgresql.crd.schema.Schema;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+
+@NullMarked
+public final class TestUtil {
+    public static void resetEnvironment(KubernetesClient kubernetesClient) {
+        // Reverse Dependency Deletion
+        deleteResource(kubernetesClient, DefaultPrivilege.class);
+        deleteResource(kubernetesClient, Grant.class);
+        deleteResource(kubernetesClient, Schema.class);
+        deleteResource(kubernetesClient, Role.class);
+        deleteResource(kubernetesClient, Database.class);
+        deleteResource(kubernetesClient, ClusterConnection.class);
+    }
+
+    public static void deleteResource(
+            KubernetesClient kubernetesClient,
+            Class<? extends HasMetadata> resourceClass
+    ) {
+        // Async call to the Kubernetes API Server that triggers the Operator Controllers
+        kubernetesClient.resources(resourceClass).delete();
+
+        // Wait for the Operator Controller to finish the CR cleanup
+        await().atMost(5, TimeUnit.SECONDS)
+                .pollInterval(100, TimeUnit.MILLISECONDS)
+                .until(() -> kubernetesClient.resources(resourceClass).list().getItems().isEmpty());
+    }
+
+    private TestUtil() {
+    }
+}

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/Given.java

@@ -99,13 +99,15 @@ public RoleCreate role() {
         public DatabaseCreate database() {
             return new DatabaseCreate(
                     numberOfItems,
+                    given,
                     kubernetesClient
             );
         }
 
         public SchemaCreate schema() {
             return new SchemaCreate(
                     numberOfItems,
+                    given,
                     kubernetesClient
             );
         }

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/creator/ClusterConnectionCreate.java

@@ -100,7 +100,7 @@ protected ClusterConnection create(int index) {
                 .inNamespace(namespace)
                 .withName(name)
                 .waitUntilCondition(
-                        clusterConnection -> clusterConnection.getStatus() != null,
+                        clusterConnection -> clusterConnection != null && clusterConnection.getStatus() != null,
                         5,
                         TimeUnit.SECONDS
                 );
@@ -116,38 +116,48 @@ private String getNamespace() {
             return withNamespace;
         }
 
-        return kubernetesClient.getNamespace();
+        withNamespace = kubernetesClient.getNamespace();
+
+        return withNamespace;
     }
 
     private String getName() {
         if (withName != null) {
             return withName;
         }
 
-        return randomKubernetesNameSuffix("test-cluster-connection");
+        withName = randomKubernetesNameSuffix("test-cluster-connection");
+
+        return withName;
     }
 
     private String getHost() {
         if (withHost != null) {
             return withHost;
         }
 
-        return "localhost";
+        withHost = "localhost";
+
+        return withHost;
     }
 
     private int getPort() {
         if (withPort != null) {
             return withPort;
         }
 
-        return dbConnectionDetails.port();
+        withPort = dbConnectionDetails.port();
+
+        return withPort;
     }
 
     private String getDatabase() {
-        return Objects.requireNonNullElse(
+        withDatabase = Objects.requireNonNullElse(
                 withDatabase,
                 "postgres"
         );
+
+        return withDatabase;
     }
 
     private SecretRef getAdminSecretRef() {