Skip to content

Commit 201e592

Browse files
committed
reformat
1 parent c691e1c commit 201e592

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

docker-controller-scala-localstack/src/main/scala/com/github/j5ik2o/dockerController/localstack/LocalStackController.scala

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
package com.github.j5ik2o.dockerController.localstack
22

33
import com.github.dockerjava.api.DockerClient
4-
import com.github.dockerjava.api.command.{CreateContainerCmd, RemoveContainerCmd}
4+
import com.github.dockerjava.api.command.CreateContainerCmd
55
import com.github.dockerjava.api.model.HostConfig.newHostConfig
6-
import com.github.dockerjava.api.model.{ExposedPort, Ports}
6+
import com.github.dockerjava.api.model.{ ExposedPort, Ports }
77
import com.github.j5ik2o.dockerController.DockerControllerImpl
88
import com.github.j5ik2o.dockerController.localstack.LocalStackController._
99

10-
import scala.concurrent.duration.{DurationInt, FiniteDuration}
10+
import scala.concurrent.duration.{ DurationInt, FiniteDuration }
1111

1212
object LocalStackController {
13-
final val DefaultImageName = "localstack/localstack"
13+
final val DefaultImageName = "localstack/localstack"
1414
final val DefaultImageTag: Some[String] = Some("latest")
1515

1616
def apply(
17-
dockerClient: DockerClient,
18-
outputFrameInterval: FiniteDuration = 500.millis,
19-
imageName: String = DefaultImageName,
20-
imageTag: Option[String] = DefaultImageTag,
21-
envVars: Map[String, String] = Map.empty
22-
)(
23-
services: Set[Service],
24-
edgeHostPort: Int,
25-
hostPorts: Map[Service, Int] = Map.empty,
26-
hostName: Option[String] = None,
27-
hostNameExternal: Option[String] = None,
28-
defaultRegion: Option[String] = None
29-
): LocalStackController =
17+
dockerClient: DockerClient,
18+
outputFrameInterval: FiniteDuration = 500.millis,
19+
imageName: String = DefaultImageName,
20+
imageTag: Option[String] = DefaultImageTag,
21+
envVars: Map[String, String] = Map.empty
22+
)(
23+
services: Set[Service],
24+
edgeHostPort: Int,
25+
hostPorts: Map[Service, Int] = Map.empty,
26+
hostName: Option[String] = None,
27+
hostNameExternal: Option[String] = None,
28+
defaultRegion: Option[String] = None
29+
): LocalStackController =
3030
new LocalStackController(dockerClient, outputFrameInterval, imageName, imageTag, envVars)(
3131
services,
3232
edgeHostPort,
@@ -94,23 +94,23 @@ object Service {
9494
}
9595

9696
class LocalStackController(
97-
dockerClient: DockerClient,
98-
outputFrameInterval: FiniteDuration = 500.millis,
99-
imageName: String = DefaultImageName,
100-
imageTag: Option[String] = DefaultImageTag,
101-
envVars: Map[String, String] = Map.empty
102-
)(
103-
services: Set[Service],
104-
edgeHostPort: Int,
105-
hostPorts: Map[Service, Int],
106-
edgeBindHost: Option[String] = None,
107-
hostName: Option[String] = None,
108-
hostNameExternal: Option[String] = None,
109-
defaultRegion: Option[String] = None
110-
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
97+
dockerClient: DockerClient,
98+
outputFrameInterval: FiniteDuration = 500.millis,
99+
imageName: String = DefaultImageName,
100+
imageTag: Option[String] = DefaultImageTag,
101+
envVars: Map[String, String] = Map.empty
102+
)(
103+
services: Set[Service],
104+
edgeHostPort: Int,
105+
hostPorts: Map[Service, Int],
106+
edgeBindHost: Option[String] = None,
107+
hostName: Option[String] = None,
108+
hostNameExternal: Option[String] = None,
109+
defaultRegion: Option[String] = None
110+
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
111111

112112
private val environmentVariables: Map[String, String] = Map(
113-
"SERVICES" -> services.map(_.entryName).mkString(","),
113+
"SERVICES" -> services.map(_.entryName).mkString(",")
114114
) ++
115115
edgeBindHost.fold(Map.empty[String, String]) { e => Map("EDGE_BIND_HOST" -> e) } ++
116116
hostName.fold(Map.empty[String, String]) { h => Map("HOSTNAME" -> h) } ++

docker-controller-scala-localstack/src/test/scala/com/github/j5ik2o/dockerController/localstack/LocalStackControllerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import scala.jdk.CollectionConverters._
2727
class LocalStackControllerSpec extends AnyFreeSpec with DockerControllerSpecSupport {
2828
val accessKeyId: String = "AKIAIOSFODNN7EXAMPLE"
2929
val secretAccessKey: String = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
30-
val hostPort: Int = temporaryServerPort()
30+
val hostPort: Int = temporaryServerPort()
3131
val endpointForS3: String = s"http://$dockerHost:$hostPort"
3232
val endpointForDynamoDB: String = s"http://$dockerHost:$hostPort"
3333
val region: Regions = Regions.AP_NORTHEAST_1

0 commit comments

Comments
 (0)