chore: add more tests

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -60,9 +60,9 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
   public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
     this.kubernetesClient =
         kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build();
-    ConfigurationServiceProvider.set(configurationService);
-    ConfigurationServiceProvider.instance().getLeaderElectionConfiguration()
+    configurationService.getLeaderElectionConfiguration()
         .ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
+    ConfigurationServiceProvider.set(configurationService);
   }
 
   /** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/OperatorTest.java

@@ -11,6 +11,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.config.AbstractConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
+import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -74,6 +75,15 @@ void shouldBePossibleToRetrieveRegisteredControllerByName() {
     assertEquals(maybeController.get(), registeredControllers.stream().findFirst().orElseThrow());
   }
 
+  @Test
+  void shouldBeAbleToProvideLeaderElectionConfiguration() {
+    assertTrue(ConfigurationServiceProvider.instance().getLeaderElectionConfiguration().isEmpty());
+    new Operator(kubernetesClient, c -> c.withLeaderElectionConfiguration(
+        new LeaderElectionConfiguration("leader-election-test", "namespace", "identity")));
+    assertEquals("identity", ConfigurationServiceProvider.instance()
+        .getLeaderElectionConfiguration().orElseThrow().getIdentity().orElseThrow());
+  }
+
   @ControllerConfiguration
   private static class FooReconciler implements Reconciler<ConfigMap> {
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java

@@ -0,0 +1,132 @@
+package io.javaoperatorsdk.operator.api.config;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
+import io.javaoperatorsdk.operator.api.monitoring.Metrics;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ConfigurationServiceOverriderTest {
+
+  private static final Metrics METRICS = new Metrics() {};
+  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+  private static final LeaderElectionConfiguration LEADER_ELECTION_CONFIGURATION =
+      new LeaderElectionConfiguration("foo", "fooNS");
+  private static final DependentResourceFactory FACTORY = new DependentResourceFactory() {
+    @Override
+    public <T extends DependentResource<?, ?>> T createFrom(DependentResourceSpec<T, ?> spec) {
+      return DependentResourceFactory.super.createFrom(spec);
+    }
+  };
+
+  private static final Cloner CLONER = new Cloner() {
+    @Override
+    public <R extends HasMetadata> R clone(R object) {
+      return null;
+    }
+  };
+
+  @Test
+  void overrideShouldWork() {
+    final var config = new BaseConfigurationService(null) {
+      @Override
+      public boolean checkCRDAndValidateLocalModel() {
+        return false;
+      }
+
+      @Override
+      public Config getClientConfiguration() {
+        return new ConfigBuilder().withNamespace("namespace").build();
+      }
+
+      @Override
+      public int concurrentReconciliationThreads() {
+        return -1;
+      }
+
+      @Override
+      public int getTerminationTimeoutSeconds() {
+        return -1;
+      }
+
+      @Override
+      public Metrics getMetrics() {
+        return METRICS;
+      }
+
+      @Override
+      public ExecutorService getExecutorService() {
+        return null;
+      }
+
+      @Override
+      public boolean closeClientOnStop() {
+        return true;
+      }
+
+      @Override
+      public ObjectMapper getObjectMapper() {
+        return OBJECT_MAPPER;
+      }
+
+      @Override
+      public Cloner getResourceCloner() {
+        return CLONER;
+      }
+
+      @Override
+      public DependentResourceFactory dependentResourceFactory() {
+        return FACTORY;
+      }
+
+      @Override
+      public Optional<LeaderElectionConfiguration> getLeaderElectionConfiguration() {
+        return Optional.of(LEADER_ELECTION_CONFIGURATION);
+      }
+    };
+    final var overridden = new ConfigurationServiceOverrider(config)
+        .withClientConfiguration(new ConfigBuilder().withNamespace("newNS").build())
+        .checkingCRDAndValidateLocalModel(true)
+        .withExecutorService(Executors.newSingleThreadExecutor())
+        .withCloseClientOnStop(false)
+        .withObjectMapper(new ObjectMapper())
+        .withResourceCloner(new Cloner() {
+          @Override
+          public <R extends HasMetadata> R clone(R object) {
+            return null;
+          }
+        })
+        .withConcurrentReconciliationThreads(25)
+        .withTerminationTimeoutSeconds(100)
+        .withMetrics(new Metrics() {})
+        .withLeaderElectionConfiguration(new LeaderElectionConfiguration("newLease", "newLeaseNS"))
+        .build();
+
+    assertNotEquals(config.closeClientOnStop(), overridden.closeClientOnStop());
+    assertNotEquals(config.checkCRDAndValidateLocalModel(),
+        overridden.checkCRDAndValidateLocalModel());
+    assertNotEquals(config.concurrentReconciliationThreads(),
+        overridden.concurrentReconciliationThreads());
+    assertNotEquals(config.getTerminationTimeoutSeconds(),
+        overridden.getTerminationTimeoutSeconds());
+    assertNotEquals(config.dependentResourceFactory(), overridden.dependentResourceFactory());
+    assertNotEquals(config.getClientConfiguration(), overridden.getClientConfiguration());
+    assertNotEquals(config.getExecutorService(), overridden.getExecutorService());
+    assertNotEquals(config.getMetrics(), overridden.getMetrics());
+    assertNotEquals(config.getObjectMapper(), overridden.getObjectMapper());
+    assertNotEquals(config.getLeaderElectionConfiguration(),
+        overridden.getLeaderElectionConfiguration());
+  }
+}