Merge branch '3.5.x'

Author: mhalbritter

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/ssl/SslMeterBinderTests.java

@@ -20,8 +20,6 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.util.Collections;
-import java.util.List;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -36,10 +34,6 @@
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link SslMeterBinder}.
@@ -52,7 +46,8 @@ class SslMeterBinderTests {
 
 	@Test
 	void shouldRegisterChainExpiryMetrics() {
-		MeterRegistry meterRegistry = bindToRegistry();
+		DefaultSslBundleRegistry sslBundleRegistry = createSslBundleRegistry("classpath:certificates/chains.p12");
+		MeterRegistry meterRegistry = bindToRegistry(sslBundleRegistry);
 		assertThat(Duration.ofSeconds(findExpiryGauge(meterRegistry, "ca", "419224ce190242b2c44069dd3c560192b3b669f3")))
 			.hasDays(1095);
 		assertThat(Duration
@@ -72,39 +67,30 @@ void shouldRegisterChainExpiryMetrics() {
 	@Test
 	void shouldWatchUpdatesForBundlesRegisteredAfterConstruction() {
 		DefaultSslBundleRegistry sslBundleRegistry = new DefaultSslBundleRegistry();
-		SslInfo sslInfo = mock(SslInfo.class);
-		given(sslInfo.getBundles()).willReturn(Collections.emptyList());
-
-		SslInfo.BundleInfo bundleInfo = mock(SslInfo.BundleInfo.class);
-		SslInfo.CertificateChainInfo chainInfo = mock(SslInfo.CertificateChainInfo.class);
-		SslInfo.CertificateInfo certificateInfo = mock(SslInfo.CertificateInfo.class);
-		SslInfo.CertificateValidityInfo validityInfo = mock(SslInfo.CertificateValidityInfo.class);
-
-		given(sslInfo.getBundle("dynamic")).willReturn(bundleInfo);
-		given(bundleInfo.getName()).willReturn("dynamic");
-		given(bundleInfo.getCertificateChains()).willReturn(List.of(chainInfo));
-		given(chainInfo.getAlias()).willReturn("server");
-		given(chainInfo.getCertificates()).willReturn(List.of(certificateInfo));
-		given(certificateInfo.getSerialNumber()).willReturn("serial");
-
-		Instant expiry = CLOCK.instant().plus(Duration.ofDays(365));
-		given(certificateInfo.getValidityEnds()).willReturn(expiry);
-		given(certificateInfo.getValidity()).willReturn(validityInfo);
-		given(validityInfo.getStatus()).willReturn(SslInfo.CertificateValidityInfo.Status.VALID);
-		given(validityInfo.getMessage()).willReturn(null);
-
-		SslMeterBinder binder = new SslMeterBinder(sslInfo, sslBundleRegistry, CLOCK);
-		SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry();
-		binder.bindTo(meterRegistry);
-
-		SslBundle bundle = mock(SslBundle.class);
-		sslBundleRegistry.registerBundle("dynamic", bundle);
-		sslBundleRegistry.updateBundle("dynamic", bundle);
-
-		then(sslInfo).should(atLeast(2)).getBundle("dynamic");
+		sslBundleRegistry.registerBundle("dummy",
+				SslBundle.of(createSslStoreBundle("classpath:certificates/chains2.p12")));
+		MeterRegistry meterRegistry = bindToRegistry(sslBundleRegistry);
+		sslBundleRegistry.registerBundle("test-0",
+				SslBundle.of(createSslStoreBundle("classpath:certificates/chains2.p12")));
+		sslBundleRegistry.updateBundle("test-0",
+				SslBundle.of(createSslStoreBundle("classpath:certificates/chains.p12")));
+		assertThat(Duration.ofSeconds(findExpiryGauge(meterRegistry, "ca", "419224ce190242b2c44069dd3c560192b3b669f3")))
+			.hasDays(1095);
+		assertThat(Duration
+			.ofSeconds(findExpiryGauge(meterRegistry, "intermediary", "60f79365fc46bf69149754d377680192b3b6bcf5")))
+			.hasDays(730);
+		assertThat(Duration
+			.ofSeconds(findExpiryGauge(meterRegistry, "server", "504c45129526ac050abb11459b1f0192b3b70fe9")))
+			.hasDays(365);
+		assertThat(Duration
+			.ofSeconds(findExpiryGauge(meterRegistry, "expired", "562bc5dcf4f26bb179abb13068180192b3bb53dc")))
+			.hasDays(-386);
+		assertThat(Duration
+			.ofSeconds(findExpiryGauge(meterRegistry, "not-yet-valid", "7df79335f274e2cfa7467fd5f9ce0192b3bcf4aa")))
+			.hasDays(36889);
 	}
 
-	private static long findExpiryGauge(MeterRegistry meterRegistry, String chain, String certificateSerialNumber) {
+	private long findExpiryGauge(MeterRegistry meterRegistry, String chain, String certificateSerialNumber) {
 		return (long) meterRegistry.get("ssl.chain.expiry")
 			.tag("bundle", "test-0")
 			.tag("chain", chain)
@@ -113,27 +99,26 @@ private static long findExpiryGauge(MeterRegistry meterRegistry, String chain, S
 			.value();
 	}
 
-	private SimpleMeterRegistry bindToRegistry() {
-		SslBundles sslBundles = createSslBundles("classpath:certificates/chains.p12");
-		SslInfo sslInfo = createSslInfo(sslBundles);
+	private SimpleMeterRegistry bindToRegistry(SslBundles sslBundles) {
+		SslInfo sslInfo = new SslInfo(sslBundles);
 		SslMeterBinder binder = new SslMeterBinder(sslInfo, sslBundles, CLOCK);
 		SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry();
 		binder.bindTo(meterRegistry);
 		return meterRegistry;
 	}
 
-	private SslBundles createSslBundles(String... locations) {
+	private SslStoreBundle createSslStoreBundle(String location) {
+		JksSslStoreDetails keyStoreDetails = JksSslStoreDetails.forLocation(location).withPassword("secret");
+		return new JksSslStoreBundle(keyStoreDetails, null);
+	}
+
+	private DefaultSslBundleRegistry createSslBundleRegistry(String... locations) {
 		DefaultSslBundleRegistry sslBundleRegistry = new DefaultSslBundleRegistry();
 		for (int i = 0; i < locations.length; i++) {
-			JksSslStoreDetails keyStoreDetails = JksSslStoreDetails.forLocation(locations[i]).withPassword("secret");
-			SslStoreBundle sslStoreBundle = new JksSslStoreBundle(keyStoreDetails, null);
+			SslStoreBundle sslStoreBundle = createSslStoreBundle(locations[i]);
 			sslBundleRegistry.registerBundle("test-%d".formatted(i), SslBundle.of(sslStoreBundle));
 		}
 		return sslBundleRegistry;
 	}
 
-	private SslInfo createSslInfo(SslBundles sslBundles) {
-		return new SslInfo(sslBundles);
-	}
-
 }