logstash-filter-http 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676e5abcdac3f6a16a8274eb18793cd7d75fe26545f7b2bfee9f707b6cf1fb90
-  data.tar.gz: 3ed6f080ba7323a07621cc69380f693a07b51ab5b374d0172d660a8682396f90
+  metadata.gz: 4d5469fab82031f6b39e205f18142291d9896c97cd4b650c5124ff0f661ca945
+  data.tar.gz: 878169ea102e2c342fabed654cc8d265df31a7a935fbe8dd4260f79c2b393fce
 SHA512:
-  metadata.gz: 76adf00a0498d9f2f1d43b898457d744dce0a8ecef5bc15b559682513e2fc3cf09747925dea0a01b515762cbba9f9e5106ee316ea7c44a420a13b67596c24656
-  data.tar.gz: ceeaadb9afcc5678f87f7b1d3ccf6446d56826db73354655bc5f4976d0bf07698bc061db234fd27cf569de9fd1b467dbb6a75c918a04929918235ef42a08869e
+  metadata.gz: 6f0f5d51f50ec667de851cf7223d004062d3946c1bc0ee4b849edb3de26bc3da5246a168502c3a169023d646772835f79ebf990daf615085e4ce57a8ed5cc2db
+  data.tar.gz: 25d1125226d4c5adbc0bb74bac0ba1d0e7aa02eba55d765e0a15c084638efea664bab10e618eeb80d85e36cc4e94140708c93b26fab6843e3c9a15d13947732a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.1
+  - Fix: do not set content-type if provided by user [#36](https://github.com/logstash-plugins/logstash-filter-http/pull/36)
+
 ## 1.2.0
   - Feat: improve ECS compatibility [#35](https://github.com/logstash-plugins/logstash-filter-http/pull/35)
 

data/lib/logstash/filters/http.rb

@@ -59,10 +59,8 @@ class LogStash::Filters::Http < LogStash::Filters::Base
   def filter(event)
     url_for_event = event.sprintf(@url)
     headers_sprintfed = sprintf_object(event, @headers)
-    if body_format == "json"
-      headers_sprintfed["content-type"] = "application/json"
-    else
-      headers_sprintfed["content-type"] = "text/plain"
+    if !headers_sprintfed.key?('content-type') && !headers_sprintfed.key?('Content-Type')
+      headers_sprintfed['content-type'] = @body_format == "json" ? "application/json" : "text/plain"
     end
     query_sprintfed = sprintf_object(event, @query)
     body_sprintfed = sprintf_object(event, @body)

data/logstash-filter-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-http'
-  s.version = '1.2.0'
+  s.version = '1.2.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This filter requests data from a RESTful Web 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 logstash-filter-http. This gem is not a stand-alone program'

data/spec/filters/http_spec.rb

@@ -209,12 +209,14 @@ describe LogStash::Filters::Http do
           end.and_return(response)
           subject.filter(event)
         end
+
         it "sets content-type to application/json" do
           expect(subject).to receive(:request_http) do |verb, url, options|
             expect(options).to include(:headers => { "content-type" => "application/json"})
           end.and_return(response)
           subject.filter(event)
         end
+
       end
       context "when is text" do
         let(:body_format) { "text" }
@@ -226,12 +228,29 @@ describe LogStash::Filters::Http do
           end.and_return(response)
           subject.filter(event)
         end
+
         it "sets content-type to text/plain" do
           expect(subject).to receive(:request_http) do |verb, url, options|
             expect(options).to include(:headers => { "content-type" => "text/plain"})
           end.and_return(response)
           subject.filter(event)
         end
+
+        context 'content-type header present' do
+
+          let(:config) { super().merge 'headers' => { 'X-UA' => 'FOO', 'Content-Type' => 'application/x-www-form-urlencoded' } }
+
+          it "respects set header and does not add another" do
+            expect(subject).to receive(:request_http) do |verb, url, options|
+              headers = options[:headers]
+              expect(headers).to include("Content-Type" => "application/x-www-form-urlencoded")
+              expect(headers).to_not include("content-type")
+            end.and_return(response)
+            subject.filter(event)
+          end
+
+        end
+
       end
     end
     context "when using field references" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-http
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement