logstash-filter-http 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4938972c776b2007e275e78c0dae1494ce21bc60ca4106972a7dc8501aa813
-  data.tar.gz: c491efcaad17a7a926e1befd2bbc0ea01951a9d8fea989580a3ae0f1ab68a517
+  metadata.gz: 67615a61b9a26c149b07069dd2ebad2a1961ee8af6827e7dcbc0edf4e3b46341
+  data.tar.gz: ee9cff1c3372f69d8e3f41491f4e2d9f5a5ad41bf23c8976d143daf47307ba00
 SHA512:
-  metadata.gz: cef735dd36b419dbbaa8aba20f0843db1c0bc97e4ca9c226410fd75e5bb033a4e100e3ab8bdff499c63832aedba959a0117d05db938f1c7935abb38d20f08fb3
-  data.tar.gz: 0a376d1ce19dc7107abf07a89531dd2614b3ff25f4a573f20c5e01bdde95f926933e844c0190effa61c47f933b3ad086a6035f471efd82dffbc6c9359f8a46fe
+  metadata.gz: 7498c0f10356e10d499d175d7ace1ec18784db3eef2474a78c348caf89da56e0339708c76b9d1eb5e9a90dcf4a97561a1960f4ddba8a37f799ae1400ae417a1c
+  data.tar.gz: 964a464363ce043060639cef7cba71bf1c4400289cffd8c58cbea7fc2085c745d638efc76359449835c2bebfb2b5b4f44edd468435552198cf76e30be03246e4

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.0.0
+  - SSL settings that were marked deprecated in version `1.6.0` are now marked obsolete, and will prevent the plugin from starting.
+    - These settings are:
+    - `cacert`, which should be replaced by `ssl_certificate_authorities`
+    - `client_cert`, which should be replaced by `ssl_certificate`
+    - `client_key`, which should be replaced by `ssl_key`
+    - `keystore`, which should be replaced by `ssl_keystore_path`
+    - `keystore_password`, which should be replaced by `ssl_keystore_password`
+    - `keystore_type`, which should be replaced by `ssl_keystore_type`
+    - `truststore`, which should be replaced by `ssl_truststore_path>`
+    - `truststore_password`, which should be replaced by `ssl_truststore_password`
+    - `truststore_type`, which should be replaced by `ssl_truststore_type`
+    - [#54](https://github.com/logstash-plugins/logstash-filter-http/pull/54)
+
+
 ## 1.6.0
   - Added new `ssl_enabled` setting for enabling/disabling the SSL configurations [#52](https://github.com/logstash-plugins/logstash-filter-http/pull/52)
 

data/lib/logstash/filters/http.rb

@@ -16,7 +16,7 @@ class LogStash::Filters::Http < LogStash::Filters::Base
 
   extend LogStash::PluginMixins::ValidatorSupport::FieldReferenceValidationAdapter
 
-  include LogStash::PluginMixins::HttpClient[:with_deprecated => true]
+  include LogStash::PluginMixins::HttpClient[:with_obsolete => true]
 
   config_name 'http'
 

data/logstash-filter-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-http'
-  s.version = '1.6.0'
+  s.version = '2.0.0'
   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'
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
   s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.2'
-  s.add_runtime_dependency "logstash-mixin-http_client", ">= 7.4.0", "< 8.0.0"
+  s.add_runtime_dependency "logstash-mixin-http_client", ">= 7.5.0", "< 8.0.0"
   s.add_runtime_dependency 'logstash-mixin-validator_support', '~> 1.0'
 
   s.add_development_dependency 'logstash-devutils'

data/spec/filters/http_spec.rb

@@ -361,6 +361,31 @@ describe LogStash::Filters::Http do
   end
 end
 
+describe "obsolete settings" do
+  let(:url) { 'https://a-non-existent.url1' }
+  let(:config) { { "url" => url, 'target_body' => '[the][body]' } }
+
+  [{:name => 'cacert', :canonical_name => 'ssl_certificate_authorities'},
+   {:name => 'client_cert', :canonical_name => 'ssl_certificate'},
+   {:name => 'client_key', :canonical_name => 'ssl_key'},
+   {:name => "keystore", :canonical_name => 'ssl_keystore_path'},
+   {:name => 'truststore', :canonical_name => 'ssl_truststore_path'},
+   {:name => "keystore_password", :canonical_name => "ssl_keystore_password"},
+   {:name => 'truststore_password', :canonical_name => "ssl_truststore_password"},
+   {:name => "keystore_type", :canonical_name => "ssl_keystore_type"},
+   {:name => 'truststore_type', :canonical_name => 'ssl_truststore_type'}
+  ].each do |settings|
+    context "with option #{settings[:name]}" do
+      let(:obsolete_config) { config.merge(settings[:name] => 'test_value') }
+
+      it "emits an error about the setting `#{settings[:name]}` now being obsolete and provides guidance to use `#{settings[:canonical_name]}`" do
+        error_text = /The setting `#{settings[:name]}` in plugin `http` is obsolete and is no longer available. Use `#{settings[:canonical_name]}` instead/i
+        expect { LogStash::Filters::Http.new(obsolete_config) }.to raise_error LogStash::ConfigurationError, error_text
+      end
+
+    end
+  end
+end
 =begin
   # TODO refactor remaning tests to avoid whole pipeline instantiation
   describe 'empty response' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-http
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
   name: logstash-mixin-ecs_compatibility_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -49,18 +49,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.4.0
+        version: 7.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
   name: logstash-mixin-http_client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.4.0
+        version: 7.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
@@ -71,8 +71,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-validator_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -85,8 +85,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: This filter requests data from a RESTful Web Service.