refactor: improve testeability of context construction

teoincontatto · teoincontatto · commit 98e8f0da67fd · 2025-02-27T10:03:25.000+01:00
diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebUtil.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebUtil.java
@@ -62,7 +62,7 @@ static Optional<Exception> checkUnsecureUri(String uri, Map<String, Object> head
             .buildGet()
             .invoke();
         return Optional.of(response.getStatus())
-            .filter(statusCode -> statusCode.intValue() < BAD_REQUEST_STATUS_CODE)
+            .filter(statusCode -> statusCode.intValue() >= BAD_REQUEST_STATUS_CODE)
             .map(status -> new Exception("Invalid status code " + status));
       }
     } catch (IOException | IllegalArgumentException | ProcessingException
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceKey.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceKey.java
@@ -5,8 +5,6 @@
 
 package io.stackgres.operator.conciliation;
 
-import java.util.Objects;
-
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public record ResourceKey(String apiVersion, String kind, String namespace, String name) {
@@ -23,22 +21,4 @@ public static boolean same(HasMetadata resource1, HasMetadata resource2) {
     return ResourceKey.create(resource1).equals(ResourceKey.create(resource2));
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(apiVersion, kind, name, namespace);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
-    if (!(obj instanceof ResourceKey)) {
-      return false;
-    }
-    ResourceKey other = (ResourceKey) obj;
-    return Objects.equals(apiVersion, other.apiVersion) && Objects.equals(kind, other.kind)
-        && Objects.equals(name, other.name) && Objects.equals(namespace, other.namespace);
-  }
-
 }
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultInstanceProfile.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultInstanceProfile.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.cluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -37,6 +40,15 @@ public Stream<HasMetadata> generateResource(StackGresClusterContext context) {
         .of(true)
         .filter(ignored -> context.getProfile().isEmpty()
             || context.getProfile()
+            .filter(instanceProfile -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(instanceProfile.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(instanceProfile -> instanceProfile.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultPostgresConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultPostgresConfig.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.cluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -37,6 +40,15 @@ public Stream<HasMetadata> generateResource(StackGresClusterContext context) {
         .of(true)
         .filter(ignored -> context.getPostgresConfig().isEmpty()
             || context.getPostgresConfig()
+            .filter(postgresConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(postgresConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerDefaultPoolingConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerDefaultPoolingConfig.java
@@ -6,7 +6,9 @@
 package io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -42,7 +44,16 @@ public Stream<HasMetadata> generateResource(StackGresClusterContext context) {
         .filter(disabled -> !disabled)
         .filter(ignored -> context.getPoolingConfig().isEmpty()
             || context.getPoolingConfig()
-            .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
+            .filter(poolingConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(poolingConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
+            .map(poolingConfig -> poolingConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
             .anyMatch(ResourceUtil.getControllerOwnerReference(context.getSource())::equals))
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsDefaultInstanceProfile.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsDefaultInstanceProfile.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.distributedlogs;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -37,6 +40,15 @@ public Stream<HasMetadata> generateResource(StackGresDistributedLogsContext cont
         .of(true)
         .filter(ignored -> context.getProfile().isEmpty()
             || context.getProfile()
+            .filter(instanceProfile -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(instanceProfile.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(instanceProfile -> instanceProfile.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsDefaultPostgresConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsDefaultPostgresConfig.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.distributedlogs;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -38,6 +41,15 @@ public Stream<HasMetadata> generateResource(StackGresDistributedLogsContext cont
         .of(true)
         .filter(ignored -> context.getPostgresConfig().isEmpty()
             || context.getPostgresConfig()
+            .filter(postgresConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(postgresConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
@@ -51,7 +63,7 @@ private StackGresPostgresConfig getDefaultConfig(StackGresDistributedLogsContext
         .withNewMetadata()
         .withNamespace(cluster.getMetadata().getNamespace())
         .withName(cluster.getSpec().getConfigurations().getSgPostgresConfig())
-        .withLabels(labelFactory.genericLabels(cluster))
+        .withLabels(labelFactory.defaultConfigLabels(cluster))
         .endMetadata()
         .withNewSpec()
         .withPostgresVersion(getPostgresMajorVersion(context))
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorDefaultInstanceProfile.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorDefaultInstanceProfile.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -38,6 +41,15 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .of(true)
         .filter(ignored -> context.getCoordinatorProfile().isEmpty()
             || context.getCoordinatorProfile()
+            .filter(instanceProfile -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(instanceProfile.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(instanceProfile -> instanceProfile.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorDefaultPostgresConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorDefaultPostgresConfig.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -38,6 +41,15 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .of(true)
         .filter(ignored -> context.getCoordinatorPostgresConfig().isEmpty()
             || context.getCoordinatorPostgresConfig()
+            .filter(postgresConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(postgresConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorPgBouncerDefaultPoolingConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterCoordinatorPgBouncerDefaultPoolingConfig.java
@@ -6,7 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -43,7 +45,16 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .filter(disabled -> !disabled)
         .filter(ignored -> context.getCoordinatorPoolingConfig().isEmpty()
             || context.getCoordinatorPoolingConfig()
-            .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
+            .filter(poolingConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(poolingConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
+            .map(poolingConfig -> poolingConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
             .anyMatch(ResourceUtil.getControllerOwnerReference(context.getSource())::equals))
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsDefaultInstanceProfile.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsDefaultInstanceProfile.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -38,6 +41,15 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .of(true)
         .filter(ignored -> context.getShardsProfile().isEmpty()
             || context.getShardsProfile()
+            .filter(instanceProfile -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(instanceProfile.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(instanceProfile -> instanceProfile.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsDefaultPostgresConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsDefaultPostgresConfig.java
@@ -6,6 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -38,6 +41,15 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .of(true)
         .filter(ignored -> context.getShardsPostgresConfig().isEmpty()
             || context.getShardsPostgresConfig()
+            .filter(postgresConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(postgresConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsPgBouncerDefaultPoolingConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterShardsPgBouncerDefaultPoolingConfig.java
@@ -6,7 +6,9 @@
 package io.stackgres.operator.conciliation.factory.shardedcluster;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -43,6 +45,15 @@ public Stream<HasMetadata> generateResource(StackGresShardedClusterContext conte
         .filter(disabled -> !disabled)
         .filter(ignored -> context.getShardsPoolingConfig().isEmpty()
             || context.getShardsPoolingConfig()
+            .filter(poolingConfig -> labelFactory.defaultConfigLabels(context.getSource())
+                .entrySet()
+                .stream()
+                .allMatch(label -> Optional
+                    .ofNullable(poolingConfig.getMetadata().getLabels())
+                    .stream()
+                    .map(Map::entrySet)
+                    .flatMap(Set::stream)
+                    .anyMatch(label::equals)))
             .map(postgresConfig -> postgresConfig.getMetadata().getOwnerReferences())
             .stream()
             .flatMap(List::stream)
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/config/ConfigReconciliatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/config/ConfigReconciliatorTest.java
@@ -22,6 +22,7 @@
 import io.stackgres.operator.conciliation.AbstractConciliator;
 import io.stackgres.operator.conciliation.DeployedResourcesCache;
 import io.stackgres.operator.conciliation.HandlerDelegator;
+import io.stackgres.operator.conciliation.Metrics;
 import io.stackgres.operator.conciliation.ReconciliationResult;
 import io.stackgres.operator.conciliation.StatusManager;
 import io.stackgres.operator.conciliation.factory.cluster.KubernetessMockResourceGenerationUtil;
@@ -50,6 +51,8 @@ class ConfigReconciliatorTest {
   StatusManager<StackGresConfig, Condition> statusManager;
   @Mock
   EventEmitter<StackGresConfig> eventController;
+  @Mock
+  Metrics metrics;
 
   private ConfigReconciliator reconciliator;
 
@@ -63,6 +66,7 @@ void setUp() {
     parameters.handlerDelegator = handlerDelegator;
     parameters.eventController = eventController;
     parameters.statusManager = statusManager;
+    parameters.metrics = metrics;
     reconciliator = new ConfigReconciliator(parameters);
   }
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliatorTest.java
@@ -55,8 +55,6 @@ class DistributedLogsReconciliatorTest {
   @Mock
   CustomResourceScheduler<StackGresDistributedLogs> distributedlogsScheduler;
   @Mock
-  ConnectedClustersScanner connectedClustersScanner;
-  @Mock
   Metrics metrics;
 
   private DistributedLogsReconciliator reconciliator;
@@ -72,7 +70,6 @@ void setUp() {
     parameters.eventController = eventController;
     parameters.statusManager = statusManager;
     parameters.distributedLogsScheduler = distributedlogsScheduler;
-    parameters.connectedClustersScanner = connectedClustersScanner;
     parameters.metrics = metrics;
     reconciliator = new DistributedLogsReconciliator(parameters);
   }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static Optional<Exception> checkUnsecureUri(String uri, Map<String, Object> head`
`62`	`62`	`.buildGet()`
`63`	`63`	`.invoke();`
`64`	`64`	`return Optional.of(response.getStatus())`
`65`		`- .filter(statusCode -> statusCode.intValue() < BAD_REQUEST_STATUS_CODE)`
	`65`	`+ .filter(statusCode -> statusCode.intValue() >= BAD_REQUEST_STATUS_CODE)`
`66`	`66`	`.map(status -> new Exception("Invalid status code " + status));`
`67`	`67`	`}`
`68`	`68`	`} catch (IOException \| IllegalArgumentException \| ProcessingException`