logstash-input-elastic_serverless_forwarder 0.1.0-java → 0.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4d67fef66d28e6061c6564ff483239a041daad1d220d19a21767f77fa5a0c5f
-  data.tar.gz: d9711d462cae094b59bf056d485658e04418bea487cd7569c264e1c2b84d297e
+  metadata.gz: 0e68d73969ef8dec415c74ce755da13dfa6bad59c99c239e439b5edafd856ea8
+  data.tar.gz: e3d07f9b40953bf1e44b0f26a63beef226aac28bf03b05286e0e90b67ebe60ce
 SHA512:
-  metadata.gz: 1b68f3edbb97a521f726df53e48f1906b5e5d27e275c03557fe15239246be400a6185de4eccfa85949276b01921a52ba5b022e7e9779284fefb47b834d00602d
-  data.tar.gz: b9f3c4a58eed62050a387f6d5008b74000bd336c0e8f1d76e7c4352d57d48e3b759a85479170d61663e57c7e8d2033441db71cd2f4613445f2e08a1c71660e39
+  metadata.gz: 8ff5d1b69d172f1293db93a316515779dd68875425b514517ae94edb9f807b5705a40cfeff2b4d613e62b497401a074695ca7abbe65ded013906aad1bbbca459
+  data.tar.gz: abf8b62a5135fc746a38709d43252e9447faae8c10d8c8e434bf70034fe9bdc13e76c346046cd58e6a37dc9728a0126c50dbae07c1ec27b245b4b352367ab5e7

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## 0.1.1
+  - Fixes an issue that prevents this prototype from being instantiated in an actual Logstash pipeline [#3](https://github.com/logstash-plugins/logstash-input-elastic_serverless_forwarder/pull/3)
+
 ## 0.1.0
   - Working Prototype: New input to receive events from Elastic Serverless Forwarder (ESF) over HTTP(S) [#1](https://github.com/logstash-plugins/logstash-input-elastic_serverless_forwarder/pull/1)

data/docs/index.asciidoc

@@ -33,25 +33,25 @@ Using this input you can receive events from {esf-name} over http(s) connections
 
 |
 
-[source,subs="+macros,attributes"]
+[source]
 ----
 input {
-  {plugin} {
-    <<plugins-{type}s-{plugin}-port,port>> => 8080
-    <<plugins-{type}s-{plugin}-ssl_certificate,ssl_certificate>> => "/path/to/logstash.crt"
-    <<plugins-{type}s-{plugin}-ssl_key,ssl_key>> => "/path/to/logstash.key"
+  elastic_serverless_forwarder {
+    port => 8080
+    ssl_certificate => "/path/to/logstash.crt"
+    ssl_key => "/path/to/logstash.key"
   }
 }
 ----
 
 |
 
-[source,subs="+macros,attributes"]
+[source]
 ----
 input {
   elastic_serverless_forwarder {
-    <<plugins-{type}s-{plugin}-port,port>> => 8080
-    <<plugins-{type}s-{plugin}-ssl,ssl>> => false
+    port => 8080
+    ssl => false
   }
 }
 ----

data/lib/logstash/inputs/elastic_serverless_forwarder.rb

@@ -12,9 +12,6 @@ class LogStash::Inputs::ElasticServerlessForwarder < LogStash::Inputs::Base
 
   config_name "elastic_serverless_forwarder"
 
-  # no-codec
-  config :codec, obsolete: 'The elastic_serverless_forwarder input does not have an externally-configurable codec'
-
   # bind address
   config :host, :validate => :string, :default => "0.0.0.0"
   config :port, :validate => :number, :required => true
@@ -54,6 +51,11 @@ class LogStash::Inputs::ElasticServerlessForwarder < LogStash::Inputs::Base
 
   def initialize(*a)
     super
+
+    if original_params.include?('codec')
+      fail LogStash::ConfigurationError, 'The `elastic_serverless_forwarder` input does not have an externally-configurable `codec`'
+    end
+
     @internal_http = plugin_factory.input('http').new(inner_http_input_options)
   end
 

data/logstash-input-elastic_serverless_forwarder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'logstash-input-elastic_serverless_forwarder'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Receives events from Elastic Serverless Forwarder over HTTP or HTTPS"
   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/inputs/elastic_serverless_forwarder_spec.rb

@@ -41,6 +41,38 @@ describe LogStash::Inputs::ElasticServerlessForwarder do
       esf_input.stop
     end
 
+
+  end
+
+  context 'no user-defined codec' do
+    let(:config) { super().merge('ssl' => false) } # minimal config
+
+    ##
+    # @codec ivar is required PENDING https://github.com/elastic/logstash/issues/14828
+    context 'codec handling' do
+      it 'has an `@codec` ivar that inherits from `LogStash::Codecs::Base`' do
+        expect(esf_input).to be_instance_variable_defined(:@codec)
+        codec = esf_input.instance_variable_get(:@codec)
+
+        expect(codec).to_not be_nil
+        expect(codec.class).to be < LogStash::Codecs::Base # LogStash::Codecs::Delegator shenanigans
+      end
+    end
+
+    context 'when instantiated with a string codec' do
+      let(:config) { super().merge("codec" => "json_lines") }
+      it 'fails with a helpful configuration error' do
+        expect { described_class.new(config) }.to raise_exception(LogStash::ConfigurationError, a_string_including("codec"))
+      end
+    end
+
+    context 'when instantiated with a codec instance' do
+      let(:codec_instance) { Class.new(LogStash::Codecs::Base) { config_name 'test'}.new("id" => "123") }
+      let(:config) { super().merge("codec" => codec_instance) }
+      it 'fails with a helpful configuration error' do
+        expect { described_class.new(config) }.to raise_exception(LogStash::ConfigurationError, a_string_including("codec"))
+      end
+    end
   end
 
   shared_context "basic request handling" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elastic_serverless_forwarder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement