logstash-output-s3 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd61ed1556617ad1cc932844c9a0dd25e0378535292960baf7570c1aadd7c6cd
-  data.tar.gz: 395bd1ffb63fb8c97361c28e33e298a29e678a045698bb96ba0f585c2aae4634
+  metadata.gz: 7c2ddd787ca677ba096ca344aaf6f30974ffbddc9ecd5f76c4fe1ac3b3ef2dad
+  data.tar.gz: 16a8637b8cb54b008a303ecf0fa60eb60f27dd5cb7a22c1bb15176b65e965f05
 SHA512:
-  metadata.gz: 4ab2243decd9bdf789f5b8e2fc1efe174c73f91e50ae82d32a8c0ce463b20dc51e77be0c3c75195a6a18661c07e9a9c033a2f6296e4740e5d52809ea3ac41b95
-  data.tar.gz: 1f280daf62b4d4d1e567b8346cb168f83a99e06656d2e0ea83ae5d6c56f9908b1ee518a868493a22c9ed4861cf689eb3ef2069d15f0a752eeccc88e83e0ee2cd
+  metadata.gz: 9cb1fca399cdf70dd0fb319d8402ac5f21ed0dec7cd367c07405be768165980600aee1c8d3e44c4411c302988d4a4bb87986c6d6dc06bd5325bef72d2d71ef8b
+  data.tar.gz: f0856add86126d3f176a61e750a78eb99cb0acfb4dcb229925d75f70ee14a820dc020a74a1bc7250090c36fee658d263b3f0793f8c5cf17c14273aa767e4e12e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.2
+  - Symbolize hash keys for additional_settings hash #179
+
 ## 4.1.1
   - Docs: Set the default_codec doc attribute.
 

data/docs/index.asciidoc

@@ -142,7 +142,7 @@ the connection to S3. See full list in https://docs.aws.amazon.com/sdkforruby/ap
         region => "eu-west-1",
         bucket => "logstash-test",
         additional_settings => {
-          "force_path_style => true,
+          "force_path_style" => true,
           "follow_redirects" => false
         }
       }
@@ -275,7 +275,7 @@ The AWS Secret Access Key
   * Value type is <<boolean,boolean>>
   * Default value is `false`
 
-Specifies wether or not to use S3's server side encryption. Defaults to no encryption.
+Specifies whether or not to use S3's server side encryption. Defaults to no encryption.
 
 [id="plugins-{type}s-{plugin}-server_side_encryption_algorithm"]
 ===== `server_side_encryption_algorithm` 
@@ -382,4 +382,4 @@ In some circonstances you need finer grained permission on subfolder, this allow
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]
 
-:default_codec!:
+:default_codec!:

data/lib/logstash/outputs/s3.rb

@@ -129,7 +129,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
   config :canned_acl, :validate => ["private", "public-read", "public-read-write", "authenticated-read", "aws-exec-read", "bucket-owner-read", "bucket-owner-full-control", "log-delivery-write"],
          :default => "private"
 
-  # Specifies wether or not to use S3's server side encryption. Defaults to no encryption.
+  # Specifies whether or not to use S3's server side encryption. Defaults to no encryption.
   config :server_side_encryption, :validate => :boolean, :default => false
 
   # Specifies what type of encryption to use when SSE is enabled.
@@ -271,9 +271,21 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
   def full_options
     options = aws_options_hash || {}
     options[:signature_version] = @signature_version if @signature_version
-    @additional_settings.merge(options)
+    symbolized_settings.merge(options)
   end
 
+  def symbolized_settings
+    @symbolized_settings ||= symbolize_keys(@additional_settings)
+  end
+
+  def symbolize_keys(hash)
+    return hash unless hash.is_a?(Hash)
+    symbolized = {}
+    hash.each { |key, value| symbolized[key.to_sym] = symbolize_keys(value) }
+    symbolized
+  end
+
+
   def normalize_key(prefix_key)
     prefix_key.gsub(PathValidator.matches_re, PREFIX_KEY_NORMALIZE_CHARACTER)
   end

data/logstash-output-s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-s3'
-  s.version         = '4.1.1'
+  s.version         = '4.1.2'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Sends Logstash events to the Amazon Simple Storage Service"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/s3_spec.rb

@@ -149,7 +149,7 @@ describe LogStash::Outputs::S3 do
         end
 
         it "validates the prefix" do
-          expect(Aws::S3::Bucket).to receive(:new).twice.with(anything, hash_including("force_path_style" => true)).and_call_original
+          expect(Aws::S3::Bucket).to receive(:new).twice.with(anything, hash_including(:force_path_style => true)).and_call_original
           described_class.new(options.merge(additional_settings)).register
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-s3
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Sends Logstash events to the Amazon Simple Storage Service