logstash-input-azure_event_hubs 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180938c864f4ab3d685ee1780acae884dec1041b1c950b935b12d5a48bf14667
-  data.tar.gz: 2c411191905591ab555c6dfce60900c27b417bd6832fc72a909a88327d8f926b
+  metadata.gz: 534090e6c5ff8c6f47ce9b358069e9ee456b182c12a5bd29e91c7b4afd61bbbf
+  data.tar.gz: f2b13ba670593366c8d07fd22175752c954fd26cd5570fc759b9791df83a2e90
 SHA512:
-  metadata.gz: c95ed7f2d117194bd58d3ad64dc94e4ec1abe8e5e9bbd9c0baf7d55cabb46be3ee516fc5a17d49e86c8039216d12b97beafcd4adfb6040b42367019f431bc0d8
-  data.tar.gz: 6d0ef1ef16d8da554cf4caaf1285474015c2e47a51c1afec77fda85c1fb8e568ddaec43a539c658d3614d7916abc0f847419d664df6a3dfb0d967e78ce634ca8
+  metadata.gz: 06ca7c423993f970ab2b0e7bdabb6664a2c118189747382beac9dae5a8a9191bdc3d477bc02ea81fc16fd8d8edf95ab5c26ebe40ee0fc004ce9734ab5cd28621
+  data.tar.gz: 8b7106c47551404b8d70c499537eee339ffd6fe364c1db124fafe68c2bd0c495b7c1cc4bb07ec7590bfe85452c120c69f8dbafff5acac3826318d9cfc8c21f88

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.4.8
+  - Fixed connection placeholder replacements errors with Logstash `8.15.1` and `8.15.2` [#92](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/92)
+
 ## 1.4.7
   - [DOCS] Clarify examples for single and multiple event hubs [#90](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/90)
 

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/lib/logstash/inputs/azure_event_hubs.rb

@@ -332,8 +332,7 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
         connections = *params['event_hub_connections'] # ensure array
         connections.each.with_index do |_connection, i|
           begin
-            connection = self.class.replace_placeholders(_connection) if self.class.respond_to? 'replace_placeholders' # 6.x
-            connection = self.class.replace_env_placeholders(_connection) if self.class.respond_to? 'replace_env_placeholders' # 5.x
+            connection = replace_connection_placeholders(_connection)
             event_hub_name = ConnectionStringBuilder.new(connection).getEventHubName
             redacted_connection = connection.gsub(/(SharedAccessKey=)([0-9a-zA-Z=+]*)([;]*)(.*)/, '\\1<redacted>\\3\\4')
             params['event_hub_connections'][i] = redacted_connection # protect from leaking logs
@@ -361,6 +360,25 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
 
   attr_reader :event_hubs_exploded
 
+  def replace_connection_placeholders(value)
+    connection = value
+    if self.class.respond_to? :replace_placeholders
+      # Logstash 6.x
+      if self.class.method(:replace_placeholders).arity == 1
+        connection = self.class.replace_placeholders(connection)
+      else
+        # Logstash 8.15.1 and 8.15.2 changed the method arity including a new boolean parameter `refine`.
+        # This was fixed in 8.15.3. see https://github.com/elastic/logstash/pull/16485
+        connection = self.class.replace_placeholders(connection, false)
+      end
+    end
+
+    # Logstash 5.x
+    connection = self.class.replace_env_placeholders(connection) if self.class.respond_to? :replace_env_placeholders
+
+    connection
+  end
+
   def register
     # augment the exploded config with the defaults
     @event_hubs_exploded.each do |event_hub|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azure_event_hubs
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.22
   name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,7 +131,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: Consumes events from Azure Event Hubs for use with Logstash