fabric8 fix and tests

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryClientAutoConfiguration.java

@@ -24,6 +24,7 @@
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
@@ -77,6 +78,16 @@ Fabric8ReactiveDiscoveryClient fabric8ReactiveDiscoveryClient(KubernetesClient c
 		return new Fabric8ReactiveDiscoveryClient(fabric8DiscoveryClient);
 	}
 
+	@Bean
+	@ConditionalOnBean(Fabric8ReactiveDiscoveryClient.class)
+	@ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer
+	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
+		Fabric8ReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) {
+		return new ReactiveDiscoveryClientHealthIndicator(client, properties);
+	}
+
+	// Above two beans are created when cacheable is disabled
+
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnDiscoveryCacheableReactiveEnabled
@@ -89,23 +100,41 @@ Fabric8CacheableReactiveDiscoveryClient fabric8CacheableReactiveDiscoveryClient(
 		return new Fabric8CacheableReactiveDiscoveryClient(fabric8DiscoveryClient);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean(Fabric8ReactiveDiscoveryClient.class)
+	@ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer
+	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveClientHealthIndicator(
+		KubernetesClient client, KubernetesDiscoveryProperties kubernetesDiscoveryProperties,
+		Predicate<Service> predicate, DiscoveryClientHealthIndicatorProperties properties, Environment environment) {
+
+		KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(environment);
+		ServicePortSecureResolver servicePortSecureResolver = new ServicePortSecureResolver(kubernetesDiscoveryProperties);
+		Fabric8DiscoveryClient fabric8DiscoveryClient =
+			new Fabric8DiscoveryClient(client, kubernetesDiscoveryProperties,
+				servicePortSecureResolver, namespaceProvider, predicate);
+
+		Fabric8ReactiveDiscoveryClient fabric8ReactiveDiscoveryClient =
+			new Fabric8ReactiveDiscoveryClient(fabric8DiscoveryClient);
+
+		return new ReactiveDiscoveryClientHealthIndicator(fabric8ReactiveDiscoveryClient, properties);
+	}
+
+	// Above two beans are created when cacheable is enabled. In this case, we can't make
+	// Fabric8DiscoveryClient a @Bean, since blocking discovery might be disabled and we do
+	// not want to allow wiring of it. Nevertheless, we still need an instance of Fabric8DiscoveryClient
+	// in order to create the ReactiveDiscoveryClientHealthIndicator and Fabric8CacheableReactiveDiscoveryClient
+	// As such, we create two of such instances in each bean.
+
 	/**
 	 * Post an event so that health indicator is initialized.
 	 */
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.boot.health.contributor.ReactiveHealthIndicator")
 	@ConditionalOnDiscoveryHealthIndicatorEnabled
 	KubernetesDiscoveryClientHealthIndicatorInitializer reactiveIndicatorInitializer(
-			ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
+		ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
 		LOG.debug(() -> "Will publish InstanceRegisteredEvent from reactive implementation");
 		return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher);
 	}
 
-	@Bean
-	@ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer
-	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
-			Fabric8ReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) {
-		return new ReactiveDiscoveryClientHealthIndicator(client, properties);
-	}
-
 }

spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryClientAutoConfigurationApplicationContextTests.java

@@ -180,10 +180,11 @@ void reactiveCacheableDisabled() {
 	 *     - cacheable in the reactive implementation = true, as such:
 	 *     - Fabric8ReactiveDiscoveryClient is not present
 	 *     - Fabric8CacheableReactiveDiscoveryClient is present
+	 *     - Health indicator is disabled
 	 * </pre>
 	 */
 	@Test
-	void reactiveCacheableEnabled() {
+	void reactiveCacheableEnabledWithoutHealthIndicator() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=true",
 				"spring.cloud.discovery.client.health-indicator.enabled=false");
@@ -193,6 +194,25 @@ void reactiveCacheableEnabled() {
 		});
 	}
 
+	/**
+	 * <pre>
+	 *     - cacheable in the reactive implementation = true, as such:
+	 *     - Fabric8ReactiveDiscoveryClient is not present
+	 *     - Fabric8CacheableReactiveDiscoveryClient is present
+	 *     - Health indicator is enabled
+	 * </pre>
+	 */
+	@Test
+	void reactiveCacheableEnabledWithHealthIndicator() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=true",
+			"spring.cloud.discovery.client.health-indicator.enabled=true");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(Fabric8ReactiveDiscoveryClient.class);
+			assertThat(context).hasSingleBean(Fabric8CacheableReactiveDiscoveryClient.class);
+		});
+	}
+
 	private void setup(String... properties) {
 		applicationContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,