Fix tls tests (#4348)

spring-cloud · Oct 9, 2024 · 7a7bb2f · 7a7bb2f
1 parent 572b10a
commit 7a7bb2f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 4.1.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 4.1.x ]
 
 jobs:
   build:

diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml
@@ -92,7 +92,17 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-suite-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-suite-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.junit.vintage</groupId>
 			<artifactId>junit-vintage-engine</artifactId>

diff --git a/...lient-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/BaseCertTests.java b/...lient-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/BaseCertTests.java
@@ -158,14 +158,6 @@ void wrongPasswordCauseFailure() {
 		Assertions.assertThrows(BeanCreationException.class, client::start);
 	}
 
-	@Test
-	void nonExistKeyStoreCauseFailure() {
-		EurekaClientRunner client = createEurekaClient();
-		enableTlsClient(client);
-		client.setKeyStore(new File("nonExistFile"));
-		Assertions.assertThrows(BeanCreationException.class, client::start);
-	}
-
 	@Test
 	void wrongTrustStoreCannotWork() {
 		try (EurekaClientRunner client = createEurekaClient()) {

diff --git a/...t-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java b/...t-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java
@@ -16,8 +16,8 @@
 
 package org.springframework.cloud.netflix.eureka;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * We need to use a suite cause we need to first run all the Eureka Servers, then close
@@ -26,8 +26,8 @@
  * That means that when the new context starts we will fail cause the executor service is
  * already shutdown.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ EurekaClientTests.class, RestTemplateEurekaClientTests.class })
+@SelectClasses({ EurekaClientTests.class, RestTemplateEurekaClientTests.class })
+@Suite
 public class EurekaClientSuite {
 
 }
diff --git a/...t-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientTests.java b/...t-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientTests.java
@@ -22,8 +22,12 @@
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
+import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+import org.springframework.context.annotation.Bean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -53,6 +57,19 @@ EurekaClientRunner createEurekaClient() {
 	@EnableAutoConfiguration
 	public static class TestApp {
 
+		@Bean
+		public RestTemplateTransportClientFactories forceRestTemplateTransportClientFactories(
+				DiscoveryClientOptionalArgsConfiguration configuration,
+				RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs) {
+			return configuration.restTemplateTransportClientFactories(discoveryClientOptionalArgs);
+		}
+
+		@Bean
+		public RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
+			return new RestTemplateDiscoveryClientOptionalArgs(
+					new DefaultEurekaClientHttpRequestFactorySupplier(new RestTemplateTimeoutProperties()), null);
+		}
+
 	}
 
 	@SpringBootConfiguration

diff --git a/...src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java b/...src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java
@@ -33,6 +33,7 @@
 import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
 import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 import org.springframework.context.annotation.Bean;
 
@@ -82,6 +83,14 @@ public RestTemplateDiscoveryClientOptionalArgs forceRestTemplateDiscoveryClientO
 					eurekaClientHttpRequestFactorySupplier, new RestTemplateBuilderObjectProvider());
 		}
 
+		// Want to force reusing exactly the same bean as on production without excluding
+		// jersey from the classpath
+		@Bean
+		public RestTemplateTransportClientFactories forceRestTemplateTransportClientFactories(
+				DiscoveryClientOptionalArgsConfiguration configuration,
+				RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs) {
+			return configuration.restTemplateTransportClientFactories(discoveryClientOptionalArgs);
+		}
 	}
 
 	@SpringBootConfiguration