refactor: improve testability of context construction

Author: teoincontatto

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/ShardedClusterStatusCondition.java

@@ -5,11 +5,14 @@
 
 package io.stackgres.common.crd.sgshardedcluster;
 
+import java.util.Objects;
+
 import io.stackgres.common.crd.Condition;
 
 public enum ShardedClusterStatusCondition {
 
-  CLUSTER_REQUIRES_RESTART(Type.PENDING_RESTART, Status.TRUE, "ClusterRequiresRestart"),
+  SHARDED_CLUSTER_BOOTSTRAPPED(Type.BOOTSTRAPPED, Status.TRUE, "ShardedClusterBootstrapped"),
+  SHARDED_CLUSTER_REQUIRES_RESTART(Type.PENDING_RESTART, Status.TRUE, "ShardedClusterRequiresRestart"),
   FALSE_PENDING_RESTART(Type.PENDING_RESTART, Status.FALSE, "FalsePendingRestart"),
   SHARDED_CLUSTER_REQUIRES_UPGRADE(
       Type.PENDING_UPGRADE, Status.TRUE, "ShardedClusterRequiresUpgrade"),
@@ -31,8 +34,15 @@ public Condition getCondition() {
     return new Condition(type, status, reason);
   }
 
+  public boolean isCondition(Condition condition) {
+    return Objects.equals(condition.getType(), type)
+        && Objects.equals(condition.getStatus(), status)
+        && Objects.equals(condition.getReason(), reason);
+  }
+
   public enum Type {
 
+    BOOTSTRAPPED("Bootstrapped"),
     PENDING_RESTART("PendingRestart"),
     PENDING_UPGRADE("PendingUpgrade"),
     FAILED("Failed");

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/context/ClusterRestoreBackupContextAppender.java

@@ -53,10 +53,6 @@ public ClusterRestoreBackupContextAppender(
 
   @Override
   public void appendContext(StackGresCluster cluster, Builder contextBuilder) {
-    final Optional<StackGresBackup> restoreBackup = findRestoreBackup(
-        cluster,
-        cluster.getMetadata().getNamespace());
-
     if (Optional.of(cluster)
         .map(StackGresCluster::getStatus)
         .map(StackGresClusterStatus::getConditions)
@@ -69,6 +65,10 @@ public void appendContext(StackGresCluster cluster, Builder contextBuilder) {
       return;
     }
 
+    final Optional<StackGresBackup> restoreBackup = findRestoreBackup(
+        cluster,
+        cluster.getMetadata().getNamespace());
+
     final Map<String, Secret> restoreSecrets = restoreBackup
         .map(StackGresBackup::getStatus)
         .map(StackGresBackupStatus::getSgBackupConfig)
@@ -84,7 +84,7 @@ public void appendContext(StackGresCluster cluster, Builder contextBuilder) {
             secretFinder
             .findByNameAndNamespace(
                 entry.getKey(),
-                cluster.getMetadata().getName())
+                cluster.getMetadata().getNamespace())
             .orElseThrow(() -> new IllegalArgumentException(
                 "Secret " + entry.getKey() + " not found for " + StackGresBackup.KIND + " "
                     + restoreBackup.get().getMetadata().getName())),

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterStatusManager.java

@@ -60,8 +60,9 @@ public StackGresShardedCluster refreshCondition(StackGresShardedCluster source)
     }
     source.getStatus().setBinding(new StackGresClusterServiceBindingStatus());
     source.getStatus().getBinding().setName(ServiceBindingSecret.name(source));
-    if (isPendingRestart(source)) {
-      updateCondition(getClusterRequiresRestart(), source);
+    List<StackGresCluster> clusters = getClusters(source);
+    if (isPendingRestart(clusters)) {
+      updateCondition(getShardedClusterRequiresRestart(), source);
     } else {
       updateCondition(getFalsePendingRestart(), source);
     }
@@ -70,14 +71,16 @@ public StackGresShardedCluster refreshCondition(StackGresShardedCluster source)
     } else {
       updateCondition(getFalsePendingUpgrade(), source);
     }
+    if (isBootstrapped(clusters)) {
+      updateCondition(getShardedClusterBootstrapped(), source);
+    }
     return source;
   }
 
   /**
    * Check pending restart status condition.
    */
-  public boolean isPendingRestart(StackGresShardedCluster shardedCluster) {
-    List<StackGresCluster> clusters = getClusters(shardedCluster);
+  public boolean isPendingRestart(List<StackGresCluster> clusters) {
     return clusters.stream()
         .flatMap(cluster -> Optional.of(cluster)
             .map(StackGresCluster::getStatus)
@@ -106,6 +109,19 @@ private boolean isPendingUpgrade(
     return false;
   }
 
+  /**
+   * Check bootstrapped status condition.
+   */
+  public boolean isBootstrapped(List<StackGresCluster> clusters) {
+    return clusters.stream()
+        .flatMap(cluster -> Optional.of(cluster)
+            .map(StackGresCluster::getStatus)
+            .map(StackGresClusterStatus::getConditions)
+            .stream()
+            .flatMap(List::stream))
+        .allMatch(ClusterStatusCondition.CLUSTER_BOOTSTRAPPED::isCondition);
+  }
+
   private List<StackGresCluster> getClusters(StackGresShardedCluster shardedCluster) {
     final Map<String, String> clusterLabels =
         labelFactory.genericLabels(shardedCluster);
@@ -144,8 +160,8 @@ protected Condition getFalsePendingRestart() {
     return ShardedClusterStatusCondition.FALSE_PENDING_RESTART.getCondition();
   }
 
-  protected Condition getClusterRequiresRestart() {
-    return ShardedClusterStatusCondition.CLUSTER_REQUIRES_RESTART.getCondition();
+  protected Condition getShardedClusterRequiresRestart() {
+    return ShardedClusterStatusCondition.SHARDED_CLUSTER_REQUIRES_RESTART.getCondition();
   }
 
   protected Condition getFalsePendingUpgrade() {
@@ -155,4 +171,8 @@ protected Condition getFalsePendingUpgrade() {
   protected Condition getShardedClusterRequiresUpgrade() {
     return ShardedClusterStatusCondition.SHARDED_CLUSTER_REQUIRES_UPGRADE.getCondition();
   }
+
+  protected Condition getShardedClusterBootstrapped() {
+    return ShardedClusterStatusCondition.SHARDED_CLUSTER_BOOTSTRAPPED.getCondition();
+  }
 }

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterRestoreBackupContextAppender.java

@@ -13,6 +13,7 @@
 import io.stackgres.common.crd.sgshardedbackup.ShardedBackupStatus;
 import io.stackgres.common.crd.sgshardedbackup.StackGresShardedBackup;
 import io.stackgres.common.crd.sgshardedbackup.StackGresShardedBackupStatus;
+import io.stackgres.common.crd.sgshardedcluster.ShardedClusterStatusCondition;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterInitialData;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterRestore;
@@ -36,6 +37,15 @@ public ShardedClusterRestoreBackupContextAppender(
 
   @Override
   public void appendContext(StackGresShardedCluster cluster, Builder contextBuilder) {
+    if (Optional.of(cluster)
+        .map(StackGresShardedCluster::getStatus)
+        .map(StackGresShardedClusterStatus::getConditions)
+        .stream()
+        .flatMap(List::stream)
+        .anyMatch(ShardedClusterStatusCondition.SHARDED_CLUSTER_BOOTSTRAPPED::isCondition)) {
+      return;
+    }
+
     findRestoreBackup(
         cluster,
         cluster.getMetadata().getNamespace());

stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/context/ClusterRestoreBackupContextAppenderTest.java

@@ -20,7 +20,9 @@
 import io.stackgres.common.crd.sgbackup.BackupStatus;
 import io.stackgres.common.crd.sgbackup.StackGresBackup;
 import io.stackgres.common.crd.sgbackup.StackGresBackupBuilder;
+import io.stackgres.common.crd.sgcluster.ClusterStatusCondition;
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
+import io.stackgres.common.crd.sgcluster.StackGresClusterStatusBuilder;
 import io.stackgres.common.fixture.Fixtures;
 import io.stackgres.common.resource.CustomResourceFinder;
 import io.stackgres.common.resource.ResourceFinder;
@@ -30,6 +32,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -66,6 +69,18 @@ void givenClusterWithoutBackup_shouldPass() {
     verify(contextBuilder).restoreSecrets(Map.of());
   }
 
+  @Test
+  void givenBootstrappedCluster_shouldPass() {
+    cluster.setStatus(
+        new StackGresClusterStatusBuilder()
+        .addToConditions(ClusterStatusCondition.CLUSTER_BOOTSTRAPPED.getCondition())
+        .build());
+    contextAppender.appendContext(cluster, contextBuilder);
+    verify(backupFinder, Mockito.never()).findByNameAndNamespace(any(), any());
+    verify(contextBuilder).restoreBackup(Optional.empty());
+    verify(contextBuilder).restoreSecrets(Map.of());
+  }
+
   @Test
   void givenClusterWithBackup_shouldPass() {
     final Optional<StackGresBackup> backup = Optional.of(

stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterRestoreBackupContextAppenderTest.java

@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.time.Instant;
@@ -19,15 +20,18 @@
 import io.stackgres.common.crd.sgshardedbackup.ShardedBackupStatus;
 import io.stackgres.common.crd.sgshardedbackup.StackGresShardedBackup;
 import io.stackgres.common.crd.sgshardedbackup.StackGresShardedBackupBuilder;
+import io.stackgres.common.crd.sgshardedcluster.ShardedClusterStatusCondition;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterInitialDataBuilder;
+import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterStatusBuilder;
 import io.stackgres.common.fixture.Fixtures;
 import io.stackgres.common.resource.CustomResourceFinder;
 import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -65,6 +69,16 @@ void givenClusterWithoutBackup_shouldPass() {
     assertNull(cluster.getStatus());
   }
 
+  @Test
+  void givenBootstrappedCluster_shouldPass() {
+    cluster.setStatus(
+        new StackGresShardedClusterStatusBuilder()
+        .addToConditions(ShardedClusterStatusCondition.SHARDED_CLUSTER_BOOTSTRAPPED.getCondition())
+        .build());
+    contextAppender.appendContext(cluster, contextBuilder);
+    verify(backupFinder, Mockito.never()).findByNameAndNamespace(any(), any());
+  }
+
   @Test
   void givenClusterWithBackup_shouldPass() {
     final Optional<StackGresShardedBackup> backup = Optional.of(