Skip to content

Commit

Permalink
Merge pull request #73 from civitaspo/hotfix/scalafmt
Browse files Browse the repository at this point in the history
Fix the format
  • Loading branch information
civitaspo authored May 22, 2020
2 parents 06f4254 + d16279e commit c7c57ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ case class EcsTaskCommandRunner(
val links: Seq[String] = params.parseListOrGetEmpty("links", classOf[String]).asScala.toSeq
val linuxParameters: Optional[Config] = params.getOptionalNested("linux_parameters")
val logConfiguration: Optional[Config] = params.getOptionalNested("log_configuration")
val firelensConfiguration: Optional[Config] = params.getOptionalNested("firelens_configuration")
val firelensConfiguration: Optional[Config] = params.getOptionalNested("firelens_configuration")
// NOTE: Set in `ecs_task.register>` TaskDefinition Context. If you set it by container level, use the `overrides` option.
// val memory: Optional[Int] = params.getOptional("memory", classOf[Int])
// NOTE: If you set it by container level, use the `overrides` option.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class EcsTaskRegisterOperator(operatorName: String, context: OperatorContext, sy
val links: Seq[String] = c.parseListOrGetEmpty("links", classOf[String]).asScala.toSeq
val linuxParameters: Optional[LinuxParameters] = configureLinuxParameters(c.parseNestedOrGetEmpty("linux_parameters"))
val logConfiguration: Optional[LogConfiguration] = configureLogConfiguration(c.parseNestedOrGetEmpty("log_configuration"))
val firelensConfiguration: Optional[FirelensConfiguration] = configureFirelensConfiguration(c.parseNestedOrGetEmpty("firelens_configuration"))
val firelensConfiguration: Optional[FirelensConfiguration] = configureFirelensConfiguration(c.parseNestedOrGetEmpty("firelens_configuration"))
val memory: Optional[Int] = c.getOptional("memory", classOf[Int])
val memoryReservation: Optional[Int] = c.getOptional("memory_reservation", classOf[Int])
val mountPoints: Seq[MountPoint] = c.parseListOrGetEmpty("mount_points", classOf[Config]).asScala.map(configureMountPoint).map(_.get).toSeq
Expand Down Expand Up @@ -246,7 +246,8 @@ class EcsTaskRegisterOperator(operatorName: String, context: OperatorContext, sy
protected def configureLogConfiguration(c: Config): Optional[LogConfiguration] = {
if (c.isEmpty) return Optional.absent()

val logDriver: String = c.get("log_driver", classOf[String]) // Valid Values: json-file | syslog | journald | gelf | fluentd | awslogs | splunk | awsfirelens
val logDriver
: String = c.get("log_driver", classOf[String]) // Valid Values: json-file | syslog | journald | gelf | fluentd | awslogs | splunk | awsfirelens
val options: Map[String, String] = c.getMapOrEmpty("options", classOf[String], classOf[String]).asScala.toMap

val lc: LogConfiguration = new LogConfiguration()
Expand Down

0 comments on commit c7c57ac

Please sign in to comment.