Skip to content

Commit

Permalink
Merge pull request #3 from civitaspo/rel/v0.0.1
Browse files Browse the repository at this point in the history
v0.0.1
  • Loading branch information
civitaspo authored Oct 22, 2018
2 parents 8f6c063 + 2e6851e commit e79ad90
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.0.1 (yyyy-mm-dd)
0.0.1 (2018-10-23)
==================

* First Release
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# digdag-operator-ecs_task
[![Jitpack](https://jitpack.io/v/pro.civitaspo/digdag-operator-ecs_task.svg)](https://jitpack.io/#pro.civitaspo/digdag-operator-ecs_task) [![CircleCI](https://circleci.com/gh/civitaspo/digdag-operator-ecs_task.svg?style=shield)](https://circleci.com/gh/civitaspo/digdag-operator-ecs_task) [![Digdag](https://img.shields.io/badge/digdag-v0.9.27-brightgreen.svg)](https://github.com/treasure-data/digdag/releases/tag/v0.9.31)
[![Jitpack](https://jitpack.io/v/pro.civitaspo/digdag-operator-ecs_task.svg)](https://jitpack.io/#pro.civitaspo/digdag-operator-ecs_task) [![CircleCI](https://circleci.com/gh/civitaspo/digdag-operator-ecs_task.svg?style=shield)](https://circleci.com/gh/civitaspo/digdag-operator-ecs_task) [![Digdag](https://img.shields.io/badge/digdag-v0.9.31-brightgreen.svg)](https://github.com/treasure-data/digdag/releases/tag/v0.9.31)

digdag plugin for AWS ECS Task.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ abstract class AbstractEcsTaskOperator(operatorName: String, context: OperatorCo
protected val params: Config = {
val elems: Seq[String] = operatorName.split("\\.")
elems.indices.foldLeft(request.getConfig) { (p: Config, idx: Int) =>
p.mergeDefault((0 to idx).foldLeft(request.getConfig) { (nestedParam: Config, keyIdx: Int) => nestedParam.getNestedOrGetEmpty(elems(keyIdx))
p.mergeDefault((0 to idx).foldLeft(request.getConfig) { (nestedParam: Config, keyIdx: Int) =>
nestedParam.getNestedOrGetEmpty(elems(keyIdx))
})
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ class EcsTaskWaitOperator(operatorName: String, context: OperatorContext, system
val ignoreFailure: Boolean = params.get("ignore_failure", classOf[Boolean], false)

override def runTask(): TaskResult = {
val req: DescribeTasksRequest = new DescribeTasksRequest().withCluster(cluster)
val req: DescribeTasksRequest = new DescribeTasksRequest()
.withCluster(cluster)
.withTasks(tasks: _*)

aws.withEcs { ecs =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ case class EcsTaskWaiter(
override def matches(output: DescribeTasksResult): Boolean = {
val waitingMillis: Long = System.currentTimeMillis() - startAt
logger.info(
s"Waiting ${waitingMillis}ms for that $condition tasks [${output.getTasks.asScala.map(t => s"${t.getTaskArn}:${t.getLastStatus}").mkString(",")}] become $status.")
s"Waiting ${waitingMillis}ms for that $condition tasks [${output.getTasks.asScala.map(t => s"${t.getTaskArn}:${t.getLastStatus}").mkString(",")}] become $status."
)
if (waitingMillis > timeout.getDuration.toMillis) {
throw new WaiterTimedOutException(s"Reached timeout ${timeout.getDuration.toMillis}ms without transitioning to the desired state")
}
Expand Down

0 comments on commit e79ad90

Please sign in to comment.