From 01759aae05d6c157da07dd67172b153f93d606de Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Fri, 10 May 2019 15:21:45 -0400 Subject: [PATCH] fix(ldap): Disable the broken LdapHealthIndicatorAutoConfiguration We can reenable it once we upgrade to a version of spring-boot with the fix for spring-projects/spring-ldap#473 --- .../src/main/groovy/com/netflix/spinnaker/gate/Main.groovy | 3 ++- .../groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy index a39c39802c..415b985cb6 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy @@ -17,6 +17,7 @@ package com.netflix.spinnaker.gate import com.netflix.spinnaker.hystrix.spectator.HystrixSpectatorConfig +import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthIndicatorAutoConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration @@ -32,7 +33,7 @@ import org.springframework.scheduling.annotation.EnableAsync @EnableConfigurationProperties @Import([HystrixSpectatorConfig]) @ComponentScan(["com.netflix.spinnaker.gate", "com.netflix.spinnaker.config"]) -@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration]) +@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration, LdapHealthIndicatorAutoConfiguration]) class Main { static final Map DEFAULT_PROPS = [ diff --git a/gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy b/gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy index 612f1ba960..b8cdd94507 100644 --- a/gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy +++ b/gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy @@ -41,6 +41,7 @@ import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService import com.netflix.spinnaker.kork.dynamicconfig.SpringDynamicConfigService import com.netflix.spinnaker.kork.web.exceptions.GenericExceptionHandlers import org.springframework.boot.SpringApplication +import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthIndicatorAutoConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration @@ -253,7 +254,7 @@ class FunctionalSpec extends Specification { } @Order(10) - @EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration]) + @EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration, LdapHealthIndicatorAutoConfiguration]) private static class FunctionalConfiguration extends WebSecurityConfigurerAdapter { @Bean