chore(params): map to actual object (#128)

spinnaker · Oct 26, 2018 · 75566b7 · 75566b7
1 parent 8cd496e
commit 75566b7
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 142 deletions.
diff --git a/...tlin/com/netflix/spinnaker/swabbie/aws/autoscalinggroups/AmazonAutoScalingGroupHandler.kt b/...tlin/com/netflix/spinnaker/swabbie/aws/autoscalinggroups/AmazonAutoScalingGroupHandler.kt
@@ -125,11 +125,9 @@ class AmazonAutoScalingGroupHandler(
 
   override fun getCandidates(workConfiguration: WorkConfiguration): List<AmazonAutoScalingGroup>? {
     val params = Parameters(
-      mapOf(
-        "account" to workConfiguration.account.accountId!!,
-        "region" to workConfiguration.location,
-        "environment" to workConfiguration.account.environment
-      )
+      account = workConfiguration.account.accountId!!,
+      region = workConfiguration.location,
+      environment = workConfiguration.account.environment
     )
 
     return serverGroupProvider.getAll(params).also { serverGroups ->
@@ -144,11 +142,9 @@ class AmazonAutoScalingGroupHandler(
     checkReferences(
       serverGroups = candidates,
       params = Parameters(
-        mapOf(
-          "account" to workConfiguration.account.accountId!!,
-          "region" to workConfiguration.location,
-          "environment" to workConfiguration.account.environment
-        )
+        account = workConfiguration.account.accountId!!,
+        region = workConfiguration.location,
+        environment = workConfiguration.account.environment
       )
     )
 
@@ -183,12 +179,10 @@ class AmazonAutoScalingGroupHandler(
     workConfiguration: WorkConfiguration
   ): AmazonAutoScalingGroup? {
     val params = Parameters(
-      mapOf(
-        "autoScalingGroupName" to resourceId,
-        "account" to workConfiguration.account.accountId!!,
-        "region" to workConfiguration.location,
-        "environment" to workConfiguration.account.environment
-      )
+      id = resourceId,
+      account = workConfiguration.account.accountId!!,
+      region = workConfiguration.location,
+      environment = workConfiguration.account.environment
     )
 
     return serverGroupProvider.getOne(params)

diff --git a/...com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonElasticLoadBalancerProvider.kt b/...com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonElasticLoadBalancerProvider.kt
@@ -39,9 +39,9 @@ open class EddaAmazonElasticLoadBalancerProvider(
 
   override fun getAll(params: Parameters): List<AmazonElasticLoadBalancer>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getELBs()
     }
@@ -51,11 +51,11 @@ open class EddaAmazonElasticLoadBalancerProvider(
 
   override fun getOne(params: Parameters): AmazonElasticLoadBalancer? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getELB(params["loadBalancerName"] as String)
+      return getELB(params.id)
     }
 
     return null

diff --git a/...c/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonImageProvider.kt b/...c/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonImageProvider.kt
@@ -39,9 +39,9 @@ open class EddaAmazonImageProvider(
 
   override fun getAll(params: Parameters): List<AmazonImage>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getAmis()
     }
@@ -51,11 +51,11 @@ open class EddaAmazonImageProvider(
 
   override fun getOne(params: Parameters): AmazonImage? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getAmi(params["imageId"] as String)
+      return getAmi(params.id)
     }
 
     return null

diff --git a/...otlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonSecurityGroupProvider.kt b/...otlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAmazonSecurityGroupProvider.kt
@@ -33,9 +33,9 @@ open class EddaAmazonSecurityGroupProvider(
   private val log: Logger = LoggerFactory.getLogger(javaClass)
   override fun getAll(params: Parameters): List<AmazonSecurityGroup>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getSecurityGroups()
     }
@@ -45,11 +45,11 @@ open class EddaAmazonSecurityGroupProvider(
 
   override fun getOne(params: Parameters): AmazonSecurityGroup? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getSecurityGroup(params["groupId"] as String)
+      return getSecurityGroup(params.id)
     }
 
     return null

diff --git a/...n/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAutoScalingGroupProvider.kt b/...n/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaAutoScalingGroupProvider.kt
@@ -38,9 +38,9 @@ open class EddaAutoScalingGroupProvider(
   private val log: Logger = LoggerFactory.getLogger(javaClass)
   override fun getAll(params: Parameters): List<AmazonAutoScalingGroup>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getServerGroups()
     }
@@ -50,11 +50,11 @@ open class EddaAutoScalingGroupProvider(
 
   override fun getOne(params: Parameters): AmazonAutoScalingGroup? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getServerGroup(params["autoScalingGroupName"] as String)
+      return getServerGroup(params.id)
     }
 
     return null

diff --git a/...lin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaImagesUsedByInstancesProvider.kt b/...lin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaImagesUsedByInstancesProvider.kt
@@ -39,8 +39,8 @@ open class EddaImagesUsedByInstancesProvider(
    * currently referenced by running EC2 instances in the region
    */
   override fun getAll(params: Parameters): Set<String> {
-    if (params.containsKey("region")) {
-      return imagesUsedByInstancesCache.get().elementAt(0).refdAmisByRegion[params["region"]] ?: emptySet()
+    if (params.region != "") {
+      return imagesUsedByInstancesCache.get().elementAt(0).refdAmisByRegion[params.region] ?: emptySet()
     } else {
       throw IllegalArgumentException("Missing required region parameter")
     }
@@ -66,11 +66,9 @@ open class EddaImagesUsedByInstancesProvider(
         .flatMap { edda ->
           instanceProvider.getAll(
             Parameters(
-              mapOf(
-                "region" to region,
-                "account" to edda.account.accountId!!,
-                "environment" to edda.account.environment
-              )
+              region = region,
+              account = edda.account.accountId!!,
+              environment = edda.account.environment
             )
           ) ?: emptyList()
         }

diff --git a/.../src/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaInstanceProvider.kt b/.../src/main/kotlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaInstanceProvider.kt
@@ -38,9 +38,9 @@ open class EddaInstanceProvider(
   private val log: Logger = LoggerFactory.getLogger(javaClass)
   override fun getAll(params: Parameters): List<AmazonInstance>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getNonTerminatedInstances()
     }
@@ -50,11 +50,11 @@ open class EddaInstanceProvider(
 
   override fun getOne(params: Parameters): AmazonInstance? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getSingleInstance(params["instanceId"] as String)
+      return getSingleInstance(params.id)
     }
 
     return null

diff --git a/.../com/netflix/spinnaker/swabbie/aws/edda/providers/EddaLaunchConfigurationCacheProvider.kt b/.../com/netflix/spinnaker/swabbie/aws/edda/providers/EddaLaunchConfigurationCacheProvider.kt
@@ -38,8 +38,8 @@ open class EddaLaunchConfigurationCacheProvider(
    * @param params["region"]: return a Set<AmazonLaunchConfiguration> across all known accounts in region
    */
   override fun getAll(params: Parameters): Set<AmazonLaunchConfiguration> {
-    if (params.containsKey("region")) {
-      return launchConfigCache.get().elementAt(0).configsByRegion[params["region"]] ?: emptySet()
+    if (params.region != "") {
+      return launchConfigCache.get().elementAt(0).configsByRegion[params.region] ?: emptySet()
     } else {
       throw IllegalArgumentException("Missing required region parameter")
     }
@@ -77,11 +77,9 @@ open class EddaLaunchConfigurationCacheProvider(
         .flatMap { edda ->
           launchConfigurationProvider.getAll(
             Parameters(
-              mapOf(
-                "region" to region,
-                "account" to edda.account.accountId!!,
-                "environment" to edda.account.environment
-              )
+              region = region,
+              account = edda.account.accountId!!,
+              environment = edda.account.environment
             )
           ) ?: emptyList()
         }

diff --git a/...otlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaLaunchConfigurationProvider.kt b/...otlin/com/netflix/spinnaker/swabbie/aws/edda/providers/EddaLaunchConfigurationProvider.kt
@@ -38,9 +38,9 @@ open class EddaLaunchConfigurationProvider(
   private val log: Logger = LoggerFactory.getLogger(javaClass)
   override fun getAll(params: Parameters): List<AmazonLaunchConfiguration>? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
       return getLaunchConfigurations()
     }
@@ -50,11 +50,11 @@ open class EddaLaunchConfigurationProvider(
 
   override fun getOne(params: Parameters): AmazonLaunchConfiguration? {
     withEddaClient(
-      region = params["region"] as String,
-      accountId = params["account"] as String,
-      environment = params["environment"] as String
+      region = params.region,
+      accountId = params.account,
+      environment = params.environment
     )?.run {
-      return getLaunchConfiguration(params["launchConfigurationName"] as String)
+      return getLaunchConfiguration(params.id)
     }
 
     return null

diff --git a/swabbie-aws/src/main/kotlin/com/netflix/spinnaker/swabbie/aws/images/AmazonImageHandler.kt b/swabbie-aws/src/main/kotlin/com/netflix/spinnaker/swabbie/aws/images/AmazonImageHandler.kt
@@ -180,11 +180,9 @@ class AmazonImageHandler(
 
   override fun getCandidates(workConfiguration: WorkConfiguration): List<AmazonImage>? {
     val params = Parameters(
-      mapOf(
-        "account" to workConfiguration.account.accountId!!,
-        "region" to workConfiguration.location,
-        "environment" to workConfiguration.account.environment
-      )
+        account = workConfiguration.account.accountId!!,
+        region = workConfiguration.location,
+        environment = workConfiguration.account.environment
     )
 
     return imageProvider.getAll(params).also { images ->
@@ -199,11 +197,9 @@ class AmazonImageHandler(
     checkReferences(
       images = candidates,
       params = Parameters(
-        mapOf(
-          "account" to workConfiguration.account.accountId!!,
-          "region" to workConfiguration.location,
-          "environment" to workConfiguration.account.environment
-        )
+        account = workConfiguration.account.accountId!!,
+        region = workConfiguration.location,
+        environment = workConfiguration.account.environment
       )
     )
     return candidates
@@ -268,7 +264,7 @@ class AmazonImageHandler(
         ) { usedByResource ->
           image.set(USED_BY_INSTANCES, true)
           resourceUseTrackingRepository.recordUse(image.resourceId, usedByResource)
-          log.debug("Image {} ({}) in {} is USED_BY_INSTANCES", image.imageId, image.name, params["region"])
+          log.debug("Image {} ({}) in {} is USED_BY_INSTANCES", image.imageId, image.name, params.region)
         }
       }
     }
@@ -303,7 +299,7 @@ class AmazonImageHandler(
           },
           image
         ) { usedByResource ->
-          log.debug("Image {} ({}) in {} is USED_BY_LAUNCH_CONFIGURATIONS", image.imageId, image.name, params["region"])
+          log.debug("Image {} ({}) in {} is USED_BY_LAUNCH_CONFIGURATIONS", image.imageId, image.name, params.region)
           resourceUseTrackingRepository.recordUse(image.resourceId, usedByResource)
           image.set(USED_BY_LAUNCH_CONFIGURATIONS, true)
         }
@@ -350,12 +346,12 @@ class AmazonImageHandler(
       if (isAncestor(imageDescrToImageId, image) || isAncestor(otherImageDescrToImageId, image)) {
         image.set(IS_BASE_OR_ANCESTOR, true)
         image.set(NAIVE_EXCLUSION, true)
-        log.debug("Image {} ({}) in {} is IS_BASE_OR_ANCESTOR", image.imageId, image.name, params["region"])
+        log.debug("Image {} ({}) in {} is IS_BASE_OR_ANCESTOR", image.imageId, image.name, params.region)
       }
 
       if (otherImagesIdToAccount.containsKey(image.imageId)) {
         image.set(HAS_SIBLINGS_IN_OTHER_ACCOUNTS, true)
-        log.debug("Image {} ({}) in {} is HAS_SIBLINGS_IN_OTHER_ACCOUNTS", image.imageId, image.name, params["region"])
+        log.debug("Image {} ({}) in {} is HAS_SIBLINGS_IN_OTHER_ACCOUNTS", image.imageId, image.name, params.region)
       }
     }
   }
@@ -399,14 +395,12 @@ class AmazonImageHandler(
   ): List<Pair<AmazonImage, Account>> {
     val result: MutableList<Pair<AmazonImage, Account>> = mutableListOf()
     accountProvider.getAccounts().filter {
-      it.type == AWS && it.accountId != params["account"]
+      it.type == AWS && it.accountId != params.account
     }.forEach { account ->
       account.regions?.forEach { region ->
         log.info("Looking for other images in {}/{}", account.accountId, region)
         imageProvider.getAll(
-          Parameters(
-            mapOf("account" to account.accountId!!, "region" to region.name, "environment" to account.environment)
-          )
+          Parameters(account = account.accountId!!, region = region.name, environment = account.environment)
         )?.forEach { image ->
           result.add(Pair(image, account))
         }
@@ -426,12 +420,10 @@ class AmazonImageHandler(
 
   override fun getCandidate(resourceId: String, resourceName: String, workConfiguration: WorkConfiguration): AmazonImage? {
     val params = Parameters(
-      mapOf(
-        "imageId" to resourceId,
-        "account" to workConfiguration.account.accountId!!,
-        "region" to workConfiguration.location,
-        "environment" to workConfiguration.account.environment
-      )
+        id = resourceId,
+        account = workConfiguration.account.accountId!!,
+        region = workConfiguration.location,
+        environment = workConfiguration.account.environment
     )
 
     return imageProvider.getOne(params)