fluent-plugin-s3 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2e2bf9bcf8921a06dac049e573cff83e1b424b
-  data.tar.gz: 4c67b88fd89f1aad339efff5bc07f341b9e02780
+  metadata.gz: 7338db1eaf442db639f0e6fbfb1756b048c943bf
+  data.tar.gz: 2b335117637daa95f7428b2d48984e7ca54874a8
 SHA512:
-  metadata.gz: '0182ff57df3b6548dd59e4d3a01db05b4e89fc2d2799a8ceaa8870a2ff985cc12cec429de8d164eb00a7d23d45eb9ad5824c29b77c069fd054a49b9d0dc78bf7'
-  data.tar.gz: 05f7a10944f6e20a0b395cf25a56010a82e33042f3dd723fcce0229a3bb0df59e3a6350b71c07927a17f364ee87ba277eaf03928695cd887248a1e9cec431b50
+  metadata.gz: e35a7293b090d1e2559f246b1782c953f332e63e6bcb1bd3fcf47e563cc80f29f6db280234f909b728e961126d8877e8b6f33dc2178361dc42641013c0799cb3
+  data.tar.gz: 7b3f913815dc931d4bf1f09e536e42b3038080c2974396abc973c00bdf70a0845910e6da166f556731668ef5ca83915a36f9bc4504634486f00196bda3904072

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.1.1 - 2018/01/10
+
+  * out_s3: Add index_format parameter
+
 Release 1.1.0 - 2017/11/29
 
   * Use aws-sdk-s3 / aws-sdk-sqs gems instead of aws-sdk gem

data/README.md

@@ -406,6 +406,10 @@ The length of `%{hex_random}` placeholder. Default is 4 as written in
 Service](https://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-considerations.html).
 The maximum length is 16.
 
+**index_format**
+
+`%{index}` is formatted by [sprintf](http://ruby-doc.org/core-2.2.0/Kernel.html#method-i-sprintf) using this format_string. Default is '%d'. Zero padding is supported e.g. `%04d` to ensure minimum length four digits. `%{index}` can be in lowercase or uppercase hex using '%x' or '%X'
+
 **overwrite**
 
 Overwrite already existing path. Default is false, which raises an error

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/fluent/plugin/out_s3.rb

@@ -98,6 +98,8 @@ module Fluent::Plugin
     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 "`sprintf` format for `%{index}`"
+    config_param :index_format, :string, default: "%d"
     desc "Overwrite already existing path"
     config_param :overwrite, :bool, default: false
     desc "Check bucket if exists or not"
@@ -162,6 +164,10 @@ module Fluent::Plugin
         raise Fluent::ConfigError, "hex_random_length parameter must be less than or equal to #{MAX_HEX_RANDOM_LENGTH}"
       end
 
+      unless @index_format =~ /^%(0\d*)?[dxX]$/
+        raise Fluent::ConfigError, "index_format parameter should follow `%[flags][width]type`. `0` is the only supported flag, and is mandatory if width is specified. `d`, `x` and `X` are supported types" 
+      end
+
       if @reduced_redundancy
         log.warn "reduced_redundancy parameter is deprecated. Use storage_class parameter instead"
         @storage_class = "REDUCED_REDUNDANCY"
@@ -236,7 +242,7 @@ module Fluent::Plugin
             "%{path}" => @path,
             "%{time_slice}" => time_slice,
             "%{file_extension}" => @compressor.ext,
-            "%{index}" => i,
+            "%{index}" => sprintf(@index_format,i),
           }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
           values_for_s3_object_key["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
 
@@ -302,7 +308,7 @@ module Fluent::Plugin
         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})
+            put_options[:metadata][k] = extract_placeholders(v, metadata).gsub(%r(%{[^}]+}), {"%{index}" => sprintf(@index_format, i - 1)})
           end
         end
         @bucket.object(s3path).put(put_options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd