Merge pull request #58 from civitaspo/develop

v0.0.13
civitaspo · Jul 30, 2019 · 8b663eb · 8b663eb
2 parents bae3eb4 + 53e2af2
commit 8b663eb
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.0.13 (2019-07-30)
+===================
+* [Fix] Fix environments bug: no environments in scripting operators
+* [Fix] Catch any initialization exception and re-throw as `ConfigException`
+
 0.0.12 (2019-05-23)
 ===================
 * [Enhancement] Follow latest python runner script used by `ecs_task.py>`. The changes resolve the same issues that the bellow p-rs resolve.

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ _export:
     repositories:
       - https://jitpack.io
     dependencies:
-      - pro.civitaspo:digdag-operator-ecs_task:0.0.12
+      - pro.civitaspo:digdag-operator-ecs_task:0.0.13
   ecs_task:
     auth_method: profile
     tmp_storage:

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'pro.civitaspo'
-version = '0.0.12'
+version = '0.0.13'
 
 def digdagVersion = '0.9.31'
 def scalaSemanticVersion = "2.12.6"

diff --git a/example/ecs_task.sh/example.dig b/example/ecs_task.sh/example.dig
@@ -3,6 +3,9 @@
   +step0:
     ecs_task.sh>: env
     image: civitaspo/digdag-awscli:latest
+    environments:
+      hoge: fuga
+      fugo: hogo
     _export:
       message:
         message: 'hello ecs_task.sh'

diff --git a/example/example.dig b/example/example.dig
@@ -4,7 +4,7 @@ _export:
       - file://${repos}
       # - https://jitpack.io
     dependencies:
-      - pro.civitaspo:digdag-operator-ecs_task:0.0.12
+      - pro.civitaspo:digdag-operator-ecs_task:0.0.13
   ecs_task:
     auth_method: profile
     tmp_storage:

diff --git a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/EcsTaskPlugin.scala b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/EcsTaskPlugin.scala
@@ -3,7 +3,7 @@ package pro.civitaspo.digdag.plugin.ecs_task
 import java.lang.reflect.Constructor
 import java.util.{Arrays => JArrays, List => JList}
 
-import io.digdag.client.config.Config
+import io.digdag.client.config.{Config, ConfigException}
 import io.digdag.spi.{Operator, OperatorContext, OperatorFactory, OperatorProvider, Plugin, TemplateEngine}
 import javax.inject.Inject
 import pro.civitaspo.digdag.plugin.ecs_task.command.{EcsTaskCallInternalOperator, EcsTaskCommandResultInternalOperator}
@@ -44,7 +44,12 @@ object EcsTaskPlugin {
         override def getType: String = operatorName
         override def newOperator(context: OperatorContext): Operator = {
           val constructor: Constructor[T] = klass.getConstructor(classOf[String], classOf[OperatorContext], classOf[Config], classOf[TemplateEngine])
-          constructor.newInstance(operatorName, context, systemConfig, templateEngine)
+          try {
+            constructor.newInstance(operatorName, context, systemConfig, templateEngine)
+          }
+          catch {
+            case e: Throwable => throw new ConfigException(e)
+          }
         }
       }
     }

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
@@ -249,7 +249,7 @@ case class EcsTaskCommandRunner(
     val additionalLabels: Map[String, String] = Map("pro.civitaspo.digdag.plugin.ecs_task.version" -> VERSION)
     c.set("docker_labels", (dockerLabels ++ additionalLabels).asJava)
     c.set("entry_point", entryPoint.asJava)
-    c.set("environment", (configEnvironment ++ environments).asJava)
+    c.set("environments", (configEnvironment ++ environments).asJava)
     c.set("essential", true)
     c.set("extra_hosts", extraHosts.asJava)
     c.setOptional("health_check", healthCheck)

diff --git a/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/package.scala b/src/main/scala/pro/civitaspo/digdag/plugin/ecs_task/package.scala
@@ -2,6 +2,6 @@ package pro.civitaspo.digdag.plugin
 
 package object ecs_task {
 
-  val VERSION: String = "0.0.12"
+  val VERSION: String = "0.0.13"
 
 }