Merge pull request #69 from civitaspo/develop

v0.2.5
civitaspo · Jul 29, 2019 · 5e88785 · 5e88785
2 parents c280ef6 + 5bc5f1e
commit 5e88785
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.2.5 (2019-07-29)
+==================
+
+* [Fix] Catch any initialization exception and re-throw as `ConfigException`
+
 0.2.4 (2019-07-29)
 ==================
 

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ _export:
     repositories:
       - https://jitpack.io
     dependencies:
-      - pro.civitaspo:digdag-operator-athena:0.2.4
+      - pro.civitaspo:digdag-operator-athena:0.2.5
   athena:
     auth_method: profile
 

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'pro.civitaspo'
-version = '0.2.4'
+version = '0.2.5'
 
 def digdagVersion = '0.9.37'
 def awsSdkVersion = "1.11.587"

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-athena:0.2.4
+      - pro.civitaspo:digdag-operator-athena:0.2.5
   athena:
     auth_method: profile
     value: 5

diff --git a/src/main/scala/pro/civitaspo/digdag/plugin/athena/AthenaPlugin.scala b/src/main/scala/pro/civitaspo/digdag/plugin/athena/AthenaPlugin.scala
@@ -4,7 +4,7 @@ package pro.civitaspo.digdag.plugin.athena
 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.athena.add_partition.AthenaAddPartitionOperator
@@ -62,7 +62,12 @@ object AthenaPlugin
                                                                            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)
+                    }
                 }
             }
         }