embulk-input-rethinkdb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aea1c18ded9bd6128ff2545899f22607399659e
-  data.tar.gz: 9d5b3d65250fc2dd4ea890de07392a46a8befebc
+  metadata.gz: 21aa87211af2414daa21a3b274500095fa379f7a
+  data.tar.gz: 2bca810caf3003b88f593bce79a458cbc000e045
 SHA512:
-  metadata.gz: 88f5d2a5d872d1ff81272a36b2b1c9c2b0dcdb3703caf2d2ee34a4fc6778390b2d04eafbbd6939b226c09935c440e0a9d6a0af88fac6636609121020f418c101
-  data.tar.gz: abd006954caf6c08f065a60e2a5cdd78905c6e0bc3aa824654deb7080b28bc8cdcb67483e1e45488e312a3eca2337e79816ce90cfc43a07dbdfbcdd2588c4ad4
+  metadata.gz: 616d24bc4184ccaa8461a5cf593f6d14f3dda00c6bcdba0c69afeb8af80d4354e67abc977cc358c7b29d11dc39977aa173ae0493310b4729eb9810a9b1a8a083
+  data.tar.gz: 9fe40b9bed815b8b02dc095c8bf42a2f6e83db03a8933b5fc047126d80639e8c3832a3eb07fb1e74309d833685e1b980ac627c8ab4ce8d4fa35610521d146fcd

data/README.md

@@ -1,5 +1,7 @@
 # RethinkDB input plugin for Embulk
 
+[![Gem Version](https://badge.fury.io/rb/embulk-input-rethinkdb.svg)](https://badge.fury.io/rb/embulk-input-rethinkdb)
+
 RethinkDB input plugin for Embulk loads records from RethinkDB.
 
 ## Overview
@@ -16,6 +18,7 @@ RethinkDB input plugin for Embulk loads records from RethinkDB.
 - **database**: database name (string, required)
 - **user**: database login user name (string, required)
 - **password**: database login password (string, required)
+- **cert_file**: path to TLS CA certificate file (string)
 - **query**: ReQL to run (string, required)
 - **column_name**: column name used in outputs (string, default: `"record"`)
 

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/input/rethinkdb/RethinkdbInputPlugin.java

@@ -25,12 +25,19 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.type.Types;
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -81,6 +88,8 @@ public class RethinkdbInputPlugin
         BufferAllocator getBufferAllocator();
     }
 
+    private static final Logger logger = LoggerFactory.getLogger(RethinkdbInputPlugin.class);
+
     @Override
     public ConfigDiff transaction(ConfigSource config,
             InputPlugin.Control control)
@@ -89,9 +98,7 @@ public class RethinkdbInputPlugin
         if (task.getAuthKey().isPresent()) {
             throw new ConfigException("auth_key option is not supported yet");
         }
-        if (task.getCertFile().isPresent()) {
-            throw new ConfigException("cert_file option is not supported yet");
-        }
+
         if (!(task.getUser().isPresent() && task.getPassword().isPresent())) {
             throw new ConfigException("user and password are needed");
         }
@@ -140,12 +147,25 @@ public class RethinkdbInputPlugin
             throw new ConfigException("ReQL compile error");
         }
 
-        Connection conn = r.connection()
+        Connection.Builder builder = r.connection()
                 .hostname(task.getHost())
                 .port(task.getPort())
                 .db(task.getDatabase())
-                .user(task.getUser().get(), task.getPassword().get())
-                .connect();
+                .user(task.getUser().get(), task.getPassword().get());
+
+        Connection conn;
+        if (task.getCertFile().isPresent()) {
+            Path certFilePath = Paths.get(task.getCertFile().get());
+            try (InputStream is = Files.newInputStream(certFilePath)) {
+                builder.certFile(is);
+                conn = builder.connect();
+            } catch (IOException ex) {
+                throw new ConfigException("error reading TLS certificate file");
+            }
+        }
+        else {
+            conn = builder.connect();
+        }
 
         Cursor cursor = ast.run(conn);
         for (Object doc : cursor) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Koji Matsumoto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
-- classpath/embulk-input-rethinkdb-0.1.0.jar
+- classpath/embulk-input-rethinkdb-0.1.1.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/json-simple-1.1.1.jar
 - classpath/junit-4.10.jar