From d16279ef5b3f6cc9a9be8ac81c614964922c44df Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Fri, 22 May 2020 15:38:45 +0900 Subject: [PATCH] ./gradlew spotlessapply --- .../plugin/ecs_task/command/EcsTaskCommandRunner.scala | 2 +- .../plugin/ecs_task/register/EcsTaskRegisterOperator.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/command/EcsTaskCommandRunner.scala b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/command/EcsTaskCommandRunner.scala index fdc9551..cde05dd 100644 --- a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/command/EcsTaskCommandRunner.scala +++ b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/command/EcsTaskCommandRunner.scala @@ -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. diff --git a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/register/EcsTaskRegisterOperator.scala b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/register/EcsTaskRegisterOperator.scala index d9adb8d..8c6369f 100644 --- a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/register/EcsTaskRegisterOperator.scala +++ b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/register/EcsTaskRegisterOperator.scala @@ -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 @@ -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()