Skip to content

Commit

Permalink
Ship v0.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
civitaspo committed Nov 5, 2018
1 parent 80362a6 commit f55b9a8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
0.0.4 (2018-11-06)
==================

* [Experimental] Implement `ecs_task.embulk>` operator.
* [Enhancement] Write README for scripting operators.
* [Enhancement] Make family name more configuable for scripting operators.

0.0.3 (2018-10-30)
======================
==================

* [Breaking Change] Do not use enum parameter directory because the enums require upper camel case ( `ecs_task.{py,register,run}>` operator)
* [Enhancement] Rename the configuration key: `additional_containers` to `sidecars` ( `ecs_task.py>` operator)
Expand All @@ -16,7 +23,7 @@
0.0.2 (2018-10-29)
==================

* [Experimental] Implement ecs_task.py> operator. (No document yet)
* [Experimental] Implement `ecs_task.py>` operator. (No document yet)
* [Fix] Stop correctly after task run to shutdown TransferManager after processing.

0.0.1 (2018-10-23)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _export:
repositories:
- https://jitpack.io
dependencies:
- pro.civitaspo:digdag-operator-ecs_task:0.0.3
- pro.civitaspo:digdag-operator-ecs_task:0.0.4
ecs_task:
auth_method: profile

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = 'pro.civitaspo'
version = '0.0.3'
version = '0.0.4'

def digdagVersion = '0.9.31'
def scalaSemanticVersion = "2.12.6"
Expand Down
2 changes: 1 addition & 1 deletion example/example.dig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _export:
- file://${repos}
# - https://jitpack.io
dependencies:
- pro.civitaspo:digdag-operator-ecs_task:0.0.3
- pro.civitaspo:digdag-operator-ecs_task:0.0.4
ecs_task:
auth_method: profile

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ import pro.civitaspo.digdag.plugin.ecs_task.aws.AwsConf

import scala.collection.JavaConverters._

case class EcsTaskCommandRunner(scriptsLocationPrefix: AmazonS3URI, script: String, params: Config, environments: Map[String, String], awsConf: AwsConf, logger: Logger) {
case class EcsTaskCommandRunner(
scriptsLocationPrefix: AmazonS3URI,
script: String,
params: Config,
environments: Map[String, String],
awsConf: AwsConf,
logger: Logger
) {

val cf: ConfigFactory = params.getFactory

Expand Down Expand Up @@ -183,7 +190,7 @@ case class EcsTaskCommandRunner(scriptsLocationPrefix: AmazonS3URI, script: Stri
c.setOptional("disable_networking", disableNetworking)
c.set("dns_search_domains", dnsSearchDomains.asJava)
c.set("dns_servers", dnsServers.asJava)
val additionalLabels: Map[String, String] = Map("pro.civitaspo.digdag.plugin.ecs_task.version" -> "0.0.3")
val additionalLabels: Map[String, String] = Map("pro.civitaspo.digdag.plugin.ecs_task.version" -> "0.0.4")
c.set("docker_labels", (dockerLabels ++ additionalLabels).asJava)
c.set("entry_point", entryPoint.asJava)
c.set("environment", (configEnvironment ++ environments).asJava)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class EcsTaskEmbulkOperator(operatorName: String, context: OperatorContext, syst
override def additionalEnvironments(): Map[String, String] = {
val vars = context.getPrivilegedVariables
val builder = Map.newBuilder[String, String]
vars.getKeys.asScala.foreach { k => builder += (k -> vars.get(k))
vars.getKeys.asScala.foreach { k =>
builder += (k -> vars.get(k))
}
builder.result()
}
Expand Down Expand Up @@ -118,7 +119,8 @@ class EcsTaskEmbulkOperator(operatorName: String, context: OperatorContext, syst

protected def writeFile(file: Path, content: String): Unit = {
logger.info(s"Write into ${file.toString}")
TryWithResource(workspace.newBufferedWriter(file.toString, UTF_8)) { writer => writer.write(content)
TryWithResource(workspace.newBufferedWriter(file.toString, UTF_8)) { writer =>
writer.write(content)
}
}
}

0 comments on commit f55b9a8

Please sign in to comment.