chore(edda): move edda into aws module (#127)

spinnaker · Oct 25, 2018 · 8cd496e · 8cd496e
1 parent 91296bb
commit 8cd496e
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 47 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -25,7 +25,6 @@ include 'swabbie-test',
   'swabbie-orca',
   'swabbie-clouddriver',
   'swabbie-front50',
-  'swabbie-edda',
   'swabbie-web'
 
 def setBuildFile(project) {

diff --git a/...lix/spinnaker/config/EddaConfiguration.kt → ...lix/spinnaker/config/EddaConfiguration.kt b/...lix/spinnaker/config/EddaConfiguration.kt → ...lix/spinnaker/config/EddaConfiguration.kt
@@ -19,14 +19,13 @@ package com.netflix.spinnaker.config
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.swabbie.AccountProvider
 import com.netflix.spinnaker.swabbie.EndpointProvider
-import com.netflix.spinnaker.swabbie.edda.EddaEndpointsService
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaEndpointsService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.Account
 import com.netflix.spinnaker.swabbie.model.Region
 import com.netflix.spinnaker.swabbie.model.SpinnakerAccount
 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
@@ -40,7 +39,6 @@ import retrofit.converter.JacksonConverter
 
 @Configuration
 @ComponentScan(basePackages = arrayOf(
-  "com.netflix.spinnaker.swabbie.edda",
   "com.netflix.spinnaker.swabbie.aws"
 ))
 @Import(SwabbieRetrofitConfiguration::class)

diff --git a/swabbie-aws/src/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/EddaEndpointsService.kt b/swabbie-aws/src/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/EddaEndpointsService.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.swabbie.aws.edda
+
+import retrofit.http.GET
+
+interface EddaEndpointsService {
+  @GET("/api/v1/edda/endpoints.json")
+  fun getEddaEndpoints(): EddaEndpointsContainer
+
+  data class EddaEndpointsContainer(
+    val edda_endpoints: EddaEndpoints
+  ) {
+    data class EddaEndpoints(
+      val by_account: List<String>?,
+      val by_cluster: List<String>?
+    )
+
+    fun get(): List<String> = edda_endpoints.by_account ?: emptyList()
+  }
+}
diff --git a/...lix/spinnaker/swabbie/edda/EddaService.kt → ...spinnaker/swabbie/aws/edda/EddaService.kt b/...lix/spinnaker/swabbie/edda/EddaService.kt → ...spinnaker/swabbie/aws/edda/EddaService.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda
+package com.netflix.spinnaker.swabbie.aws.edda
 
 import com.netflix.spinnaker.swabbie.aws.autoscalinggroups.AmazonAutoScalingGroup
 import com.netflix.spinnaker.swabbie.aws.images.AmazonImage

diff --git a/.../EddaAmazonElasticLoadBalancerProvider.kt → .../EddaAmazonElasticLoadBalancerProvider.kt b/.../EddaAmazonElasticLoadBalancerProvider.kt → .../EddaAmazonElasticLoadBalancerProvider.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.swabbie.Parameters
 import com.netflix.spinnaker.swabbie.ResourceProvider
 import com.netflix.spinnaker.swabbie.aws.loadbalancers.AmazonElasticLoadBalancer
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.LOAD_BALANCER
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/...edda/providers/EddaAmazonImageProvider.kt → ...edda/providers/EddaAmazonImageProvider.kt b/...edda/providers/EddaAmazonImageProvider.kt → ...edda/providers/EddaAmazonImageProvider.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.swabbie.Parameters
 import com.netflix.spinnaker.swabbie.ResourceProvider
 import com.netflix.spinnaker.swabbie.aws.images.AmazonImage
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.IMAGE
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/...viders/EddaAmazonSecurityGroupProvider.kt → ...viders/EddaAmazonSecurityGroupProvider.kt b/...viders/EddaAmazonSecurityGroupProvider.kt → ...viders/EddaAmazonSecurityGroupProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient

diff --git a/.../swabbie/edda/providers/EddaApiSupport.kt → ...bbie/aws/edda/providers/EddaApiSupport.kt b/.../swabbie/edda/providers/EddaApiSupport.kt → ...bbie/aws/edda/providers/EddaApiSupport.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Id
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/...providers/EddaAutoScalingGroupProvider.kt → ...providers/EddaAutoScalingGroupProvider.kt b/...providers/EddaAutoScalingGroupProvider.kt → ...providers/EddaAutoScalingGroupProvider.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.swabbie.Parameters
 import com.netflix.spinnaker.swabbie.ResourceProvider
 import com.netflix.spinnaker.swabbie.aws.autoscalinggroups.AmazonAutoScalingGroup
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.SERVER_GROUP
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/...ie/edda/providers/EddaEndpointProvider.kt → ...ws/edda/providers/EddaEndpointProvider.kt b/...ie/edda/providers/EddaEndpointProvider.kt → ...ws/edda/providers/EddaEndpointProvider.kt
@@ -1,12 +1,9 @@
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spinnaker.swabbie.EndpointProvider
 import com.netflix.spinnaker.swabbie.InMemoryCache
-import com.netflix.spinnaker.swabbie.edda.EddaEndpointsService
-import com.netflix.spinnaker.swabbie.model.Account
+import com.netflix.spinnaker.swabbie.aws.edda.EddaEndpointsService
 import com.netflix.spinnaker.swabbie.model.EddaEndpoint
-import com.netflix.spinnaker.swabbie.model.Region
-import com.netflix.spinnaker.swabbie.model.SpinnakerAccount
 import org.springframework.context.annotation.Lazy
 import org.springframework.stereotype.Component
 

diff --git a/...ders/EddaImagesUsedByInstancesProvider.kt → ...ders/EddaImagesUsedByInstancesProvider.kt b/...ders/EddaImagesUsedByInstancesProvider.kt → ...ders/EddaImagesUsedByInstancesProvider.kt
@@ -1,4 +1,20 @@
-package com.netflix.spinnaker.swabbie.edda.providers
+/*
+ * Copyright 2018 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.swabbie.*

diff --git a/...ie/edda/providers/EddaInstanceProvider.kt → ...ws/edda/providers/EddaInstanceProvider.kt b/...ie/edda/providers/EddaInstanceProvider.kt → ...ws/edda/providers/EddaInstanceProvider.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.swabbie.Parameters
 import com.netflix.spinnaker.swabbie.ResourceProvider
 import com.netflix.spinnaker.swabbie.aws.instances.AmazonInstance
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.INSTANCE
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/...s/EddaLaunchConfigurationCacheProvider.kt → ...s/EddaLaunchConfigurationCacheProvider.kt b/...s/EddaLaunchConfigurationCacheProvider.kt → ...s/EddaLaunchConfigurationCacheProvider.kt
@@ -1,4 +1,20 @@
-package com.netflix.spinnaker.swabbie.edda.providers
+/*
+ * Copyright 2018 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.swabbie.*

diff --git a/...viders/EddaLaunchConfigurationProvider.kt → ...viders/EddaLaunchConfigurationProvider.kt b/...viders/EddaLaunchConfigurationProvider.kt → ...viders/EddaLaunchConfigurationProvider.kt
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.swabbie.edda.providers
+package com.netflix.spinnaker.swabbie.aws.edda.providers
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.config.EddaApiClient
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.swabbie.Parameters
 import com.netflix.spinnaker.swabbie.ResourceProvider
 import com.netflix.spinnaker.swabbie.aws.launchconfigurations.AmazonLaunchConfiguration
-import com.netflix.spinnaker.swabbie.edda.EddaService
+import com.netflix.spinnaker.swabbie.aws.edda.EddaService
 import com.netflix.spinnaker.swabbie.model.LAUNCH_CONFIGURATION
-import com.netflix.spinnaker.swabbie.model.WorkConfiguration
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component

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/swabbie-web/swabbie-web.gradle b/swabbie-web/swabbie-web.gradle
@@ -39,7 +39,6 @@ dependencies {
   compile project(":swabbie-clouddriver")
   compile project(":swabbie-core")
   compile project(":swabbie-echo")
-  compile project(":swabbie-edda")
   compile project(":swabbie-front50")
   compile project(":swabbie-redis")
 }