fluent-plugin-redshift-out 0.2.0 → 0.3.0

data/README.md

@@ -80,9 +80,9 @@ Example (watch and upload json formatted apache log):
 
 + `type` (required) : The value must be `redshift-out`.
 
-+ `aws_key_id` (required) : AWS access key id to access s3 bucket.
++ `aws_key_id` : AWS access key id to access s3 bucket.
 
-+ `aws_sec_key` (required) : AWS securet key id to access s3 bucket.
++ `aws_sec_key` : AWS securet key id to access s3 bucket.
 
 + `s3_bucket` (required) : s3 bucket name. S3 bucket must be same as the region of your Redshift cluster.
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/fluent-plugin-redshift-out.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluentd", "~> 0.10.0"
   gem.add_dependency "aws-sdk", "~> 1.60"
   gem.add_dependency "multi_json", "~> 1.10"
-  gem.add_dependency "oj", "~> 2.11"
+  gem.add_dependency "yajl-ruby", "~> 1.2"
   gem.add_dependency "pg", "~> 0.17.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "simplecov", ">= 0.5.4"

data/lib/fluent/plugin/out_redshift-out.rb

@@ -16,14 +16,14 @@ class RedshiftOutput < BufferedOutput
     require 'pg'
     require 'csv'
     require 'multi_json'
-    require 'oj'
-    ::MultiJson.use(:oj)
+    require 'yajl'
+    ::MultiJson.use(:yajl)
   end
 
   config_param :record_log_tag, :string, :default => 'log'
   # s3
-  config_param :aws_key_id, :string
-  config_param :aws_sec_key, :string
+  config_param :aws_key_id, :string, :default => nil
+  config_param :aws_sec_key, :string, :default => nil
   config_param :s3_bucket, :string
   config_param :s3_region, :string, :default => nil
   config_param :path, :string, :default => ""
@@ -118,9 +118,9 @@ class RedshiftOutput < BufferedOutput
     s3_uri = "s3://#{@s3_bucket}/#{s3path}"
     credentials = @s3.client.credential_provider.credentials
     sql = "copy #{table_name_with_schema} from '#{s3_uri}'"
-    sql += " CREDENTIALS 'aws_access_key_id=#{credentials[:access_key_id]}; aws_secret_access_key=#{credentials[:secret_access_key]};"
-    sql += " token=#{credentials[:session_token]};" if credentials[:session_token]
-    sql += " delimiter '#{@delimiter}' GZIP ESCAPE #{@redshift_copy_base_options} #{@redshift_copy_options};"
+    sql += " CREDENTIALS 'aws_access_key_id=#{credentials[:access_key_id]};aws_secret_access_key=#{credentials[:secret_access_key]}"
+    sql += ";token=#{credentials[:session_token]}" if credentials[:session_token]
+    sql += "' delimiter '#{@delimiter}' GZIP ESCAPE #{@redshift_copy_base_options} #{@redshift_copy_options};"
 
     $log.debug format_log("start copying. s3_uri=#{s3_uri}")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redshift-out
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement