fluent-plugin-redshift-out 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/fluent/plugin/{out_redshift.rb → out_redshift-out.rb}

@@ -25,7 +25,7 @@ class RedshiftOutput < BufferedOutput
   config_param :aws_key_id, :string
   config_param :aws_sec_key, :string
   config_param :s3_bucket, :string
-  config_param :s3_endpoint, :string, :default => nil
+  config_param :s3_region, :string, :default => nil
   config_param :path, :string, :default => ""
   config_param :timestamp_key_format, :string, :default => 'year=%Y/month=%m/day=%d/hour=%H/%Y%m%d-%H%M'
   config_param :utc, :bool, :default => false
@@ -61,17 +61,17 @@ class RedshiftOutput < BufferedOutput
     }
     @delimiter = determine_delimiter(@file_type) if @delimiter.nil? or @delimiter.empty?
     $log.debug format_log("redshift file_type:#{@file_type} delimiter:'#{@delimiter}'")
-    @copy_sql_template = "copy #{table_name_with_schema} from '%s' CREDENTIALS 'aws_access_key_id=#{@aws_key_id};aws_secret_access_key=%s' delimiter '#{@delimiter}' GZIP ESCAPE #{@redshift_copy_base_options} #{@redshift_copy_options};"
   end
 
   def start
     super
     # init s3 conf
-    options = {
-      :access_key_id     => @aws_key_id,
-      :secret_access_key => @aws_sec_key
-    }
-    options[:s3_endpoint] = @s3_endpoint if @s3_endpoint
+    options = {}
+    if @aws_key_id && @aws_sec_key
+      options[:access_key_id] = @aws_key_id
+      options[:secret_access_key] = @aws_sec_key
+    end
+    options[:region] = @s3_region if @s3_region
     @s3 = AWS::S3.new(options)
     @bucket = @s3.buckets[@s3_bucket]
   end
@@ -116,7 +116,12 @@ class RedshiftOutput < BufferedOutput
 
     # copy gz on s3 to redshift
     s3_uri = "s3://#{@s3_bucket}/#{s3path}"
-    sql = @copy_sql_template % [s3_uri, @aws_sec_key]
+    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};"
+
     $log.debug format_log("start copying. s3_uri=#{s3_uri}")
 
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redshift-out
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -152,7 +152,7 @@ files:
 - Rakefile
 - VERSION
 - fluent-plugin-redshift-out.gemspec
-- lib/fluent/plugin/out_redshift.rb
+- lib/fluent/plugin/out_redshift-out.rb
 - test/plugin/test_out_redshift.rb
 - test/test_helper.rb
 homepage: https://github.com/sakuma/fluent-plugin-redshift-out