Skip to content

Commit 23edf22

Browse files
committed
Adding gems conditionally
1 parent 281ee18 commit 23edf22

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Gemfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@ source 'https://rubygems.org'
33
# Specify your gem's dependencies in fluent-plugin-kafka.gemspec
44
gemspec
55

6-
gem 'json', '2.7.3' # override of 2.7.4 version
7-
gem 'rdkafka', ENV['RDKAFKA_VERSION_MIN_RANGE'], ENV['RDKAFKA_VERSION_MAX_RANGE'] if ENV['USE_RDKAFKA']
6+
if ENV['USE_RDKAFKA']
7+
gem 'rdkafka', ENV['RDKAFKA_VERSION_MIN_RANGE'], ENV['RDKAFKA_VERSION_MAX_RANGE']
8+
min_version = Gem::Version.new('0.16.0')
9+
min_range_version = Gem::Version.new(ENV['RDKAFKA_VERSION_MIN_RANGE'].split(' ').last)
10+
if min_range_version >= min_version
11+
gem 'aws-msk-iam-sasl-signer'
12+
gem 'json', '2.7.3' # override of 2.7.4 version
13+
end
14+
end

fluent-plugin-kafka.gemspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Gem::Specification.new do |gem|
1919
gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
2020
gem.add_dependency 'ltsv'
2121
gem.add_dependency 'ruby-kafka', '>= 1.5.0', '< 2'
22-
gem.add_dependency 'rdkafka'
23-
gem.add_dependency 'aws-msk-iam-sasl-signer'
2422
gem.add_development_dependency "rake", ">= 0.9.2"
2523
gem.add_development_dependency "test-unit", ">= 3.0.8"
2624
gem.add_development_dependency "test-unit-rr", "~> 1.0"

lib/fluent/plugin/out_rdkafka2.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
require 'fluent/plugin/kafka_plugin_util'
55

66
require 'rdkafka'
7-
require 'aws_msk_iam_sasl_signer'
87

98
begin
109
rdkafka_version = Gem::Version::create(Rdkafka::VERSION)
@@ -16,6 +15,7 @@
1615
require_relative 'rdkafka_patch/0_14_0'
1716
elsif rdkafka_version >= Gem::Version.create('0.16.0')
1817
require_relative 'rdkafka_patch/0_16_0'
18+
require 'aws_msk_iam_sasl_signer'
1919
end
2020
rescue LoadError, NameError
2121
raise "unable to patch rdkafka."
@@ -208,7 +208,6 @@ def add(level, message = nil)
208208
end
209209
end
210210
}
211-
# HERE -----------------
212211
Rdkafka::Config.logger = log
213212
config = build_config
214213
@rdkafka = Rdkafka::Config.new(config)
@@ -217,7 +216,6 @@ def add(level, message = nil)
217216
if config[:"security.protocol"] == "sasl_ssl" && config[:"sasl.mechanisms"] == "OAUTHBEARER"
218217
Rdkafka::Config.oauthbearer_token_refresh_callback = method(:refresh_token)
219218
end
220-
# HERE -----------------
221219

222220
if @default_topic.nil?
223221
if @use_default_for_unknown_topic || @use_default_for_unknown_partition_error

0 commit comments

Comments
 (0)