revert(edda): revert 48348b due to bean issue (#121)

spinnaker · Oct 19, 2018 · efa00d6 · efa00d6
1 parent d593312
commit efa00d6
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 92 deletions.
diff --git a/swabbie-clouddriver/src/main/kotlin/com/netflix/spinnaker/config/ClouddriverConfiguration.kt b/swabbie-clouddriver/src/main/kotlin/com/netflix/spinnaker/config/ClouddriverConfiguration.kt
@@ -20,7 +20,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor
 import com.netflix.spinnaker.swabbie.clouddriver.CloudDriverService
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
@@ -30,7 +29,6 @@ import retrofit.RestAdapter
 import retrofit.client.Client
 import retrofit.converter.JacksonConverter
 
-@ConditionalOnExpression("!\${eddaEndpoints.enabled:false}")
 @Configuration
 @Import(RetrofitConfiguration::class)
 open class ClouddriverConfiguration {

diff --git a/...r/src/main/kotlin/com/netflix/spinnaker/swabbie/clouddriver/ClouddriverAccountProvider.kt b/...r/src/main/kotlin/com/netflix/spinnaker/swabbie/clouddriver/ClouddriverAccountProvider.kt
@@ -20,18 +20,15 @@ import com.netflix.spinnaker.swabbie.AccountProvider
 import com.netflix.spinnaker.swabbie.InMemoryCache
 import com.netflix.spinnaker.swabbie.model.Account
 import com.netflix.spinnaker.swabbie.model.SpinnakerAccount
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.stereotype.Component
 
-@ConditionalOnBean(CloudDriverService::class)
 @Component
 class ClouddriverAccountProvider(
   private val accountCache: InMemoryCache<SpinnakerAccount>
 ) : AccountProvider {
   override fun getAccounts(): Set<Account> = accountCache.get()
 }
 
-@ConditionalOnBean(CloudDriverService::class)
 @Component
 class ClouddriverAccountCache(
   cloudDriverService: CloudDriverService

diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/Cacheable.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/Cacheable.kt
@@ -39,7 +39,7 @@ open class InMemoryCache<out T : Cacheable>(
 
   private val cache = AtomicReference<Set<T>>()
 
-  @Scheduled(fixedDelay = 15 * 60 * 1000L) //TODO: make configurable
+  @Scheduled(fixedDelay = 60 * 60 * 1000L) //TODO: make configurable
   private fun refresh() {
     try {
       cache.set(source)

diff --git a/swabbie-edda/src/main/kotlin/com/netflix/spinnaker/config/EddaConfiguration.kt b/swabbie-edda/src/main/kotlin/com/netflix/spinnaker/config/EddaConfiguration.kt
@@ -18,17 +18,13 @@ package com.netflix.spinnaker.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.swabbie.AccountProvider
-import com.netflix.spinnaker.swabbie.edda.EddaEndpointsService
 import com.netflix.spinnaker.swabbie.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.Account
 import com.netflix.spinnaker.swabbie.retrofit.SwabbieRetrofitConfiguration
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
-import retrofit.Endpoint
 import retrofit.Endpoints
 import retrofit.RequestInterceptor
 import retrofit.RestAdapter
@@ -63,27 +59,6 @@ open class EddaConfiguration {
       }
     }.flatten()
   }
-
-  @ConditionalOnExpression("\${eddaEndpoints.enabled:false}")
-  @Bean
-  open fun eddaEndpointsEndpoint(@Value("\${eddaEndpoints.baseUrl}") eddaEndpointsBaseUrl: String) : Endpoint {
-    return Endpoints.newFixedEndpoint(eddaEndpointsBaseUrl)!!
-  }
-
-  @ConditionalOnExpression("\${eddaEndpoints.enabled:false}")
-  @Bean
-  open fun eddaEndpointsService(eddaEndpointsEndpoint: Endpoint,
-                                objectMapper: ObjectMapper,
-                                retrofitClient: Client,
-                                spinnakerRequestInterceptor: RequestInterceptor,
-                                retrofitLogLevel: RestAdapter.LogLevel) = RestAdapter.Builder()
-    .setRequestInterceptor(spinnakerRequestInterceptor)
-    .setEndpoint(eddaEndpointsEndpoint)
-    .setClient(retrofitClient)
-    .setLogLevel(retrofitLogLevel)
-    .setConverter(JacksonConverter(objectMapper))
-    .build()
-    .create(EddaEndpointsService::class.java)
 }
 
 data class EddaApiClient(

diff --git a/swabbie-edda/src/main/kotlin/com/netflix/spinnaker/swabbie/edda/EddaEndpointsService.kt b/swabbie-edda/src/main/kotlin/com/netflix/spinnaker/swabbie/edda/EddaEndpointsService.kt
diff --git a/...-edda/src/main/kotlin/com/netflix/spinnaker/swabbie/edda/providers/EddaAccountProvider.kt b/...-edda/src/main/kotlin/com/netflix/spinnaker/swabbie/edda/providers/EddaAccountProvider.kt