From 97ef44907b5741f7d51ca1be96e9e36b045a0317 Mon Sep 17 00:00:00 2001
From: Paul Cleary <pauljamescleary@gmail.com>
Date: Sat, 10 Oct 2020 10:53:34 -0400
Subject: [PATCH] Include r53 in docker build (#1005)

* Include r53 in docker build

* Removing unnecessary config file

* Decrease coverage min for route 53
---
 build.sbt                                     | 12 ++++++----
 .../domain/zone/ZoneConnectionValidator.scala |  4 +++-
 modules/r53/src/it/resources/application.conf | 22 -------------------
 .../Route53BackendProviderLoader.scala        |  2 +-
 4 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 modules/r53/src/it/resources/application.conf

diff --git a/build.sbt b/build.sbt
index 6af99eaee..61969adbb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -192,10 +192,13 @@ lazy val api = (project in file("modules/api"))
   .settings(allApiSettings)
   .settings(headerSettings(IntegrationTest))
   .settings(inConfig(IntegrationTest)(scalafmtConfigSettings))
-  .dependsOn(core % "compile->compile;test->test",
+  .dependsOn(
+    core % "compile->compile;test->test",
     dynamodb % "compile->compile;it->it",
-    mysql % "compile->compile;it->it")
-  .dependsOn(sqs % "compile->compile;it->it")
+    mysql % "compile->compile;it->it",
+    sqs % "compile->compile;it->it",
+    r53 % "compile->compile;it->it"
+  )
 
 val killDocker = TaskKey[Unit]("killDocker", "Kills all vinyldns docker containers")
 lazy val root = (project in file(".")).enablePlugins(DockerComposePlugin, AutomateHeaderPlugin)
@@ -209,7 +212,7 @@ lazy val root = (project in file(".")).enablePlugins(DockerComposePlugin, Automa
       "./bin/remove-vinyl-containers.sh" !
     },
   )
-  .aggregate(core, api, portal, dynamodb, mysql, sqs)
+  .aggregate(core, api, portal, dynamodb, mysql, sqs, r53)
 
 lazy val coreBuildSettings = Seq(
   name := "core",
@@ -313,6 +316,7 @@ lazy val r53 = (project in file("modules/r53"))
   .settings(libraryDependencies ++= r53Dependencies ++ commonTestDependencies.map(_ % "test, it"))
   .settings(
     organization := "io.vinyldns",
+    coverageMinimum := 65,
   ).dependsOn(core % "compile->compile;test->test")
   .settings(name := "r53")
 
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneConnectionValidator.scala b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneConnectionValidator.scala
index 52c2ea2ff..67abfd18d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneConnectionValidator.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneConnectionValidator.scala
@@ -77,7 +77,9 @@ class ZoneConnectionValidator(backendResolver: BackendResolver)
       .zoneExists(zone)
       .ifM(
         IO(Right(())),
-        IO(Left(ConnectionFailed(zone, s"Unable to find zone ${zone.name} in backend ${backend.id}")))
+        IO(
+          Left(ConnectionFailed(zone, s"Unable to find zone ${zone.name} in backend ${backend.id}"))
+        )
       )
       .toResult
 
diff --git a/modules/r53/src/it/resources/application.conf b/modules/r53/src/it/resources/application.conf
deleted file mode 100644
index 418102027..000000000
--- a/modules/r53/src/it/resources/application.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-vinyldns {
-  backend {
-    default-backend-id = "r53"
-
-    backend-providers = [
-      {
-        class-name = "vinyldns.route53.backend.Route53BackendProviderLoader"
-        settings = {
-          backends = [
-            {
-              id = "test"
-              access-key = "vinyldnsTest"
-              secret-key = "notNeededForSnsLocal"
-              service-endpoint = "http://127.0.0.1:19009"
-              signing-region = "us-east-1"
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
diff --git a/modules/r53/src/main/scala/vinyldns/route53/backend/Route53BackendProviderLoader.scala b/modules/r53/src/main/scala/vinyldns/route53/backend/Route53BackendProviderLoader.scala
index db92e7b5e..22c93c5c7 100644
--- a/modules/r53/src/main/scala/vinyldns/route53/backend/Route53BackendProviderLoader.scala
+++ b/modules/r53/src/main/scala/vinyldns/route53/backend/Route53BackendProviderLoader.scala
@@ -18,7 +18,7 @@ package vinyldns.route53.backend
 
 import cats.implicits._
 import cats.effect.{ContextShift, IO}
-import vinyldns.core.domain.backend.{BackendProviderConfig, BackendProvider, BackendProviderLoader}
+import vinyldns.core.domain.backend.{BackendProvider, BackendProviderConfig, BackendProviderLoader}
 
 class Route53BackendProviderLoader extends BackendProviderLoader {