lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.0.0.rc8 vs lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.0.0

- old
+ new

@@ -86,10 +86,18 @@ config_param :reduced_redundancy, :bool, default: false, deprecated: "Use storage_class parameter instead." desc "The type of storage to use for the object(STANDARD,REDUCED_REDUNDANCY,STANDARD_IA)" config_param :storage_class, :string, default: "STANDARD" desc "Permission for the object in S3" config_param :acl, :string, default: nil + desc "Allows grantee READ, READ_ACP, and WRITE_ACP permissions on the object" + config_param :grant_full_control, :string, default: nil + desc "Allows grantee to read the object data and its metadata" + config_param :grant_read, :string, default: nil + desc "Allows grantee to read the object ACL" + config_param :grant_read_acp, :string, default: nil + desc "Allows grantee to write the ACL for the applicable object" + config_param :grant_write_acp, :string, default: nil desc "The length of `%{hex_random}` placeholder(4-16)" config_param :hex_random_length, :integer, default: 4 desc "Overwrite already existing path" config_param :overwrite, :bool, default: false desc "Check bucket if exists or not" @@ -284,9 +292,13 @@ put_options[:ssekms_key_id] = @ssekms_key_id if @ssekms_key_id put_options[:sse_customer_algorithm] = @sse_customer_algorithm if @sse_customer_algorithm put_options[:sse_customer_key] = @sse_customer_key if @sse_customer_key put_options[:sse_customer_key_md5] = @sse_customer_key_md5 if @sse_customer_key_md5 put_options[:acl] = @acl if @acl + put_options[:grant_full_control] = @grant_full_control if @grant_full_control + put_options[:grant_read] = @grant_read if @grant_read + put_options[:grant_read_acp] = @grant_read_acp if @grant_read_acp + put_options[:grant_write_acp] = @grant_write_acp if @grant_write_acp if @s3_metadata put_options[:metadata] = {} @s3_metadata.each do |k, v| put_options[:metadata][k] = extract_placeholders(v, metadata).gsub(%r(%{[^}]+}), {"%{index}" => i - 1})