refactor: improve testability of context construction

Author: teoincontatto

stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebUtil.java

@@ -13,7 +13,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Predicate;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -29,6 +28,8 @@
 
 public interface WebUtil {
 
+  int BAD_REQUEST_STATUS_CODE = Integer.valueOf(Response.Status.BAD_REQUEST.getStatusCode()).intValue();
+
   static boolean checkUri(String uri, Map<String, Object> headers) {
     try {
       ClientBuilder clientBuilder = ClientBuilder.newBuilder();
@@ -61,7 +62,7 @@ static Optional<Exception> checkUnsecureUri(String uri, Map<String, Object> head
             .buildGet()
             .invoke();
         return Optional.of(response.getStatus())
-            .filter(Predicate.not(Integer.valueOf(Response.Status.OK.getStatusCode())::equals))
+            .filter(statusCode -> statusCode.intValue() < BAD_REQUEST_STATUS_CODE)
             .map(status -> new Exception("Invalid status code " + status));
       }
     } catch (IOException | IllegalArgumentException | ProcessingException

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/BackupStatus.java

@@ -5,8 +5,10 @@
 
 package io.stackgres.common.crd.sgbackup;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jooq.lambda.Seq;
 
@@ -17,6 +19,8 @@ public enum BackupStatus {
   COMPLETED,
   FAILED;
 
+  private static final List<String> FINISHED_STATUSES = List.of(COMPLETED.status, FAILED.status);
+
   private final String status;
 
   BackupStatus() {
@@ -42,4 +46,31 @@ public static BackupStatus fromStatus(String status) {
                 + Seq.of(values()).map(BackupStatus::status).toString(", ")));
   }
 
+  public static boolean isCompleted(StackGresBackup backup) {
+    return Optional.of(backup)
+        .map(StackGresBackup::getStatus)
+        .map(StackGresBackupStatus::getProcess)
+        .map(StackGresBackupProcess::getStatus)
+        .filter(COMPLETED.status::equals)
+        .isPresent();
+  }
+
+  public static boolean isCompleted(Optional<StackGresBackup> backup) {
+    return backup
+        .map(StackGresBackup::getStatus)
+        .map(StackGresBackupStatus::getProcess)
+        .map(StackGresBackupProcess::getStatus)
+        .filter(COMPLETED.status::equals)
+        .isPresent();
+  }
+
+  public static boolean isFinished(StackGresBackup backup) {
+    return Optional.of(backup)
+        .map(StackGresBackup::getStatus)
+        .map(StackGresBackupStatus::getProcess)
+        .map(StackGresBackupProcess::getStatus)
+        .filter(FINISHED_STATUSES::contains)
+        .isPresent();
+  }
+
 }

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedbackup/ShardedBackupStatus.java

@@ -5,8 +5,10 @@
 
 package io.stackgres.common.crd.sgshardedbackup;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jooq.lambda.Seq;
 
@@ -17,6 +19,8 @@ public enum ShardedBackupStatus {
   COMPLETED,
   FAILED;
 
+  private static final List<String> FINISHED_STATUSES = List.of(COMPLETED.status, FAILED.status);
+
   private final String status;
 
   ShardedBackupStatus() {
@@ -42,4 +46,22 @@ public static ShardedBackupStatus fromStatus(String status) {
                 + Seq.of(values()).map(ShardedBackupStatus::status).toString(", ")));
   }
 
+  public static boolean isFinished(StackGresShardedBackup backup) {
+    return Optional.of(backup)
+        .map(StackGresShardedBackup::getStatus)
+        .map(StackGresShardedBackupStatus::getProcess)
+        .map(StackGresShardedBackupProcess::getStatus)
+        .filter(FINISHED_STATUSES::contains)
+        .isPresent();
+  }
+
+  public static boolean isCompleted(StackGresShardedBackup backup) {
+    return Optional.of(backup)
+        .map(StackGresShardedBackup::getStatus)
+        .map(StackGresShardedBackupStatus::getProcess)
+        .map(StackGresShardedBackupProcess::getStatus)
+        .filter(COMPLETED.status::equals)
+        .isPresent();
+  }
+
 }

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedbackup/StackGresShardedBackupInformation.java

@@ -6,7 +6,9 @@
 package io.stackgres.common.crd.sgshardedbackup;
 
 import java.util.Objects;
+import java.util.Optional;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
@@ -27,6 +29,13 @@ public class StackGresShardedBackupInformation {
   @Valid
   private StackGresShardedBackupSize size;
 
+  @JsonIgnore
+  public String getPostgresMajorVersion() {
+    return Optional.ofNullable(postgresVersion)
+        .map(version -> version.substring(0, 2))
+        .orElse(null);
+  }
+
   public String getPostgresVersion() {
     return postgresVersion;
   }

stackgres-k8s/src/common/src/test/java/io/stackgres/common/fixture/dbops/DbOpsFixture.java

@@ -36,6 +36,11 @@ public DbOpsFixture loadPgbench() {
     return this;
   }
 
+  public DbOpsFixture loadSampling() {
+    fixture = readFromJson(STACKGRES_DB_OPS_SAMPLING_JSON);
+    return this;
+  }
+
   public DbOpsFixture loadBenchmark() {
     fixture = readFromJson(STACKGRES_DB_OPS_BENCHMARK_JSON);
     return this;

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/CertificateInstaller.java

@@ -31,7 +31,6 @@
 import io.stackgres.common.resource.CustomResourceFinder;
 import io.stackgres.common.resource.ResourceFinder;
 import io.stackgres.common.resource.ResourceWriter;
-import io.stackgres.operator.conciliation.config.ImmutableStackGresConfigContext;
 import io.stackgres.operator.conciliation.config.StackGresConfigContext;
 import io.stackgres.operator.conciliation.factory.config.OperatorSecret;
 import io.stackgres.operatorframework.resource.ResourceUtil;
@@ -95,7 +94,7 @@ public void installOrUpdateCertificate() {
     }
     String certSecretName = OperatorSecret.name(config);
     var certSecretFound = secretFinder.findByNameAndNamespace(certSecretName, operatorNamespace);
-    StackGresConfigContext context = ImmutableStackGresConfigContext.builder()
+    StackGresConfigContext context = StackGresConfigContext.builder()
         .source(config)
         .operatorSecret(certSecretFound)
         .isGrafanaEmbedded(false)

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/ObservedClusterContext.java

@@ -7,6 +7,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.Pod;
@@ -50,6 +51,23 @@ public static ObservedClusterContext toObservedClusterContext(
         .toList());
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(cluster, pods);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof ObservedClusterContext)) {
+      return false;
+    }
+    ObservedClusterContext other = (ObservedClusterContext) obj;
+    return Objects.equals(cluster, other.cluster) && Objects.equals(pods, other.pods);
+  }
+
   public static class CollectorPodContext {
 
     private final String namespace;
@@ -83,6 +101,24 @@ public Instant getCreationTimestamp() {
     public String getIp() {
       return ip;
     }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(creationTimestamp, ip, name, namespace);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (!(obj instanceof CollectorPodContext)) {
+        return false;
+      }
+      CollectorPodContext other = (CollectorPodContext) obj;
+      return Objects.equals(creationTimestamp, other.creationTimestamp) && Objects.equals(ip, other.ip)
+          && Objects.equals(name, other.name) && Objects.equals(namespace, other.namespace);
+    }
   }
 
 }

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/PrometheusContext.java

@@ -6,6 +6,7 @@
 package io.stackgres.operator.common;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -78,4 +79,22 @@ public static PrometheusContext toPrometheusContext(
         monitor);
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(matchLabels, monitor, name, namespace);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof PrometheusContext)) {
+      return false;
+    }
+    PrometheusContext other = (PrometheusContext) obj;
+    return Objects.equals(matchLabels, other.matchLabels) && Objects.equals(monitor, other.monitor)
+        && Objects.equals(name, other.name) && Objects.equals(namespace, other.namespace);
+  }
+
 }

…perator/conciliation/ContextFactory.java …erator/conciliation/ContextPipeline.javastackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ContextFactory.java renamed to stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ContextPipeline.java stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ContextFactory.java renamed to stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ContextPipeline.java

@@ -10,17 +10,17 @@
 import io.stackgres.common.CdiUtil;
 import jakarta.enterprise.inject.Instance;
 
-public abstract class ContextFactory<C, B> {
+public abstract class ContextPipeline<C, B> {
 
   private final List<ContextAppender<C, B>> contextAppenders;
 
-  protected ContextFactory(Instance<ContextAppender<C, B>> contextAppenders) {
+  protected ContextPipeline(Instance<ContextAppender<C, B>> contextAppenders) {
     this.contextAppenders = contextAppenders
         .stream()
         .toList();
   }
 
-  protected ContextFactory() {
+  protected ContextPipeline() {
     CdiUtil.checkPublicNoArgsConstructorIsCalledToCreateProxy(getClass());
     this.contextAppenders = null;
   }

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobReconciliationHandler.java

@@ -5,15 +5,11 @@
 
 package io.stackgres.operator.conciliation.backup;
 
-import java.util.Optional;
-
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.stackgres.common.crd.sgbackup.BackupStatus;
 import io.stackgres.common.crd.sgbackup.StackGresBackup;
-import io.stackgres.common.crd.sgbackup.StackGresBackupProcess;
-import io.stackgres.common.crd.sgbackup.StackGresBackupStatus;
 import io.stackgres.common.resource.ResourceFinder;
 import io.stackgres.common.resource.ResourceScanner;
 import io.stackgres.operator.conciliation.FireAndForgetJobReconciliationHandler;
@@ -38,13 +34,7 @@ public BackupJobReconciliationHandler(
 
   @Override
   protected boolean canForget(StackGresBackup context, HasMetadata resource) {
-    return Optional.of(context)
-        .map(StackGresBackup::getStatus)
-        .map(StackGresBackupStatus::getProcess)
-        .map(StackGresBackupProcess::getStatus)
-        .filter(status -> BackupStatus.COMPLETED.status().equals(status)
-            || BackupStatus.FAILED.status().equals(status))
-        .isPresent();
+    return BackupStatus.isFinished(context);
   }
 
 }