Skip to content

Commit

Permalink
Remove default from comma_separated_only argument
Browse files Browse the repository at this point in the history
  • Loading branch information
marcotc committed May 11, 2022
1 parent 3a557ae commit 23af51b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/datadog/core/configuration/settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def initialize(*_)
tags = {}

# Parse tags from environment
env_to_list(Core::Environment::Ext::ENV_TAGS).each do |tag|
env_to_list(Core::Environment::Ext::ENV_TAGS, comma_separated_only: false).each do |tag|
pair = tag.split(':')
tags[pair.first] = pair.last if pair.length == 2
end
Expand Down
4 changes: 2 additions & 2 deletions lib/datadog/core/environment/variable_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ def env_to_float(var, default = nil)
# either trailing or leading are trimmed.
#
# Empty entries, after trimmed, are also removed from the result.
def env_to_list(var, default = [], comma_separated_only: false)
def env_to_list(var, default = [], comma_separated_only:)
var = decode_array(var)
if var && ENV.key?(var)
value = ENV[var]

values = if value.include?(',') || comma_separated_only
value.split(',')
else
value.split # space splitting is the default
value.split(' ') # rubocop:disable Style/RedundantArgument
end

values.map! do |v|
Expand Down
4 changes: 2 additions & 2 deletions spec/datadog/core/environment/variable_helpers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@
end

describe '::env_to_list' do
subject(:env_to_list) { variable_helpers.env_to_list(var) }
subject(:env_to_list) { variable_helpers.env_to_list(var, comma_separated_only: false) }

context 'when env var is not defined' do
context 'and default is not defined' do
it { is_expected.to eq([]) }
end

context 'and default is defined' do
subject(:env_to_list) { variable_helpers.env_to_list(var, default) }
subject(:env_to_list) { variable_helpers.env_to_list(var, default, comma_separated_only: false) }

let(:default) { double }

Expand Down

0 comments on commit 23af51b

Please sign in to comment.