From 8229c755e6ec1a9d5ac48a5f5d7374049db19bcd Mon Sep 17 00:00:00 2001 From: Adam Jordens Date: Mon, 25 Jun 2018 15:56:51 -0700 Subject: [PATCH] fix(fiat): Set `@EnableFiatAutoConfig` to avoid unnecessary auth requirements (#286) Original intention was to not require full blown `fiat` to use `FiatStatus` but unfortunately spring security is brought in as a transitive dependency. This PR is a simpler alternative to moving `FiatStatus` and the related configuration properties classes to a new artifact that would not bring in any unnecessary dependencies. fixes spinnaker/spinnaker#2949 --- .../com/netflix/spinnaker/echo/config/ComponentConfig.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/echo-web/src/main/groovy/com/netflix/spinnaker/echo/config/ComponentConfig.groovy b/echo-web/src/main/groovy/com/netflix/spinnaker/echo/config/ComponentConfig.groovy index c1332fb8d..cb9e61414 100644 --- a/echo-web/src/main/groovy/com/netflix/spinnaker/echo/config/ComponentConfig.groovy +++ b/echo-web/src/main/groovy/com/netflix/spinnaker/echo/config/ComponentConfig.groovy @@ -19,6 +19,7 @@ package com.netflix.spinnaker.echo.config import com.google.common.collect.ImmutableList import com.netflix.appinfo.InstanceInfo import com.netflix.spectator.api.Registry +import com.netflix.spinnaker.fiat.shared.EnableFiatAutoConfig import com.netflix.spinnaker.kork.web.interceptors.MetricsInterceptor import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean @@ -34,6 +35,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter * I generally exclude @Configuration's from this scan, as picking those up can affect your tests. */ @Configuration +@EnableFiatAutoConfig @ComponentScan(basePackages = ['com.netflix.spinnaker.echo'], excludeFilters = @ComponentScan.Filter(value = Configuration, type = FilterType.ANNOTATION))