Merge pull request #7 from aboutbits/ab-449-fix-flaky-tests-and-properly-clean-up-resources

AB-449 Fix flaky tests and properly clean up resources

Author: ThoSap

.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();