mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 02:02:14 +00:00
Code Issues Releases Wiki Activity

Include r53 in docker build (#1005)

Browse Source 
* Include r53 in docker build

* Removing unnecessary config file

* Decrease coverage min for route 53
This commit is contained in:
Paul Cleary 2020-10-10 10:53:34 -04:00 committed by GitHub
parent b4e8f527f3
commit 97ef44907b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sbt
View File

@ -192,10 +192,13 @@ lazy val api = (project in file("modules/api"))
.settings(allApiSettings) .settings(allApiSettings)
.settings(headerSettings(IntegrationTest)) .settings(headerSettings(IntegrationTest))
.settings(inConfig(IntegrationTest)(scalafmtConfigSettings)) .settings(inConfig(IntegrationTest)(scalafmtConfigSettings))
.dependsOn(core % "compile->compile;test->test", .dependsOn(
core % "compile->compile;test->test",
dynamodb % "compile->compile;it->it", dynamodb % "compile->compile;it->it",
mysql % "compile->compile;it->it") mysql % "compile->compile;it->it",
.dependsOn(sqs % "compile->compile;it->it") sqs % "compile->compile;it->it",
r53 % "compile->compile;it->it"
)
val killDocker = TaskKey[Unit]("killDocker", "Kills all vinyldns docker containers") val killDocker = TaskKey[Unit]("killDocker", "Kills all vinyldns docker containers")
lazy val root = (project in file(".")).enablePlugins(DockerComposePlugin, AutomateHeaderPlugin) 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" ! "./bin/remove-vinyl-containers.sh" !
}, },
) )
.aggregate(core, api, portal, dynamodb, mysql, sqs) .aggregate(core, api, portal, dynamodb, mysql, sqs, r53)
lazy val coreBuildSettings = Seq( lazy val coreBuildSettings = Seq(
name := "core", name := "core",
@ -313,6 +316,7 @@ lazy val r53 = (project in file("modules/r53"))
.settings(libraryDependencies ++= r53Dependencies ++ commonTestDependencies.map(_ % "test, it")) .settings(libraryDependencies ++= r53Dependencies ++ commonTestDependencies.map(_ % "test, it"))
.settings( .settings(
organization := "io.vinyldns", organization := "io.vinyldns",
coverageMinimum := 65,
).dependsOn(core % "compile->compile;test->test") ).dependsOn(core % "compile->compile;test->test")
.settings(name := "r53") .settings(name := "r53")

4
modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneConnectionValidator.scala
View File

@ -77,7 +77,9 @@ class ZoneConnectionValidator(backendResolver: BackendResolver)
.zoneExists(zone) .zoneExists(zone)
.ifM( .ifM(
IO(Right(())), 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 .toResult

22
modules/r53/src/it/resources/application.conf
View File

@ -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"
}
]
}
}
]
}
}

2
modules/r53/src/main/scala/vinyldns/route53/backend/Route53BackendProviderLoader.scala
View File

@ -18,7 +18,7 @@ package vinyldns.route53.backend
import cats.implicits._ import cats.implicits._
import cats.effect.{ContextShift, IO} 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 { class Route53BackendProviderLoader extends BackendProviderLoader {