Skip to content

Commit 8049f0f

Browse files
authored
[chore][chef] Fix lint failures (#6237)
* [chore][chef] Fix lint failures * Upgrade required node version
1 parent 2a8dc5f commit 8049f0f

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

deployments/chef/attributes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
default['splunk_otel_collector']['splunk_api_url'] = "https://api.#{node['splunk_otel_collector']['splunk_realm']}.signalfx.com"
1818
default['splunk_otel_collector']['splunk_ingest_url'] = "https://ingest.#{node['splunk_otel_collector']['splunk_realm']}.signalfx.com"
1919
default['splunk_otel_collector']['splunk_hec_url'] = "#{node['splunk_otel_collector']['splunk_ingest_url']}/v1/log"
20-
default['splunk_otel_collector']['splunk_hec_token'] = "#{node['splunk_otel_collector']['splunk_access_token']}"
20+
default['splunk_otel_collector']['splunk_hec_token'] = node['splunk_otel_collector']['splunk_access_token'].to_s
2121
default['splunk_otel_collector']['splunk_memory_total_mib'] = '512'
2222
default['splunk_otel_collector']['gomemlimit'] = ''
2323
default['splunk_otel_collector']['splunk_listen_interface'] = ''

deployments/chef/kitchen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ suites:
101101
attributes:
102102
nodejs: &nodejs_options
103103
install_method: binary
104-
version: 16.20.2
104+
version: 18.20.8
105105
binary:
106106
append_env_path: false # required for idempotence
107107
checksum: c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665

deployments/chef/recipes/auto_instrumentation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
options '--allow-downgrades' if platform_family?('debian') \
6363
&& node['packages'] \
6464
&& node['packages']['apt'] \
65-
&& Gem::Version.new(node['packages']['apt']['version'].split('~')[0]) >= Gem::Version.new('1.1.0')
65+
&& Gem::Version.new(node['packages']['apt']['version'].split('~').first) >= Gem::Version.new('1.1.0')
6666
allow_downgrade true if platform_family?('amazon', 'rhel', 'suse')
6767
notifies :reload, 'ohai[reload packages]', :immediately
6868
notifies :run, 'ruby_block[install splunk-otel-js]', :immediately

deployments/chef/recipes/default.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
end
3030

3131
remote_file node['splunk_otel_collector']['collector_config_dest'] do
32-
source "#{node['splunk_otel_collector']['collector_config_source']}"
32+
source node['splunk_otel_collector']['collector_config_source'].to_s
3333
only_if { ::File.exist?(node['splunk_otel_collector']['collector_config_source']) && node['splunk_otel_collector']['collector_config'] == {} }
3434
notifies :restart, 'windows_service[splunk-otel-collector]', :delayed
3535
end
@@ -61,7 +61,7 @@
6161
options '--allow-downgrades' if platform_family?('debian') \
6262
&& node['packages'] \
6363
&& node['packages']['apt'] \
64-
&& Gem::Version.new(node['packages']['apt']['version'].split('~')[0]) >= Gem::Version.new('1.1.0')
64+
&& Gem::Version.new(node['packages']['apt']['version'].split('~').first) >= Gem::Version.new('1.1.0')
6565
allow_downgrade true if platform_family?('amazon', 'rhel', 'suse')
6666
notifies :restart, 'service[splunk-otel-collector]', :delayed
6767
end
@@ -82,7 +82,7 @@
8282
end
8383

8484
remote_file node['splunk_otel_collector']['collector_config_dest'] do
85-
source "#{node['splunk_otel_collector']['collector_config_source']}"
85+
source node['splunk_otel_collector']['collector_config_source'].to_s
8686
owner node['splunk_otel_collector']['user']
8787
group node['splunk_otel_collector']['group']
8888
mode '0600'

deployments/chef/recipes/fluentd_deb_repo.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cookbook:: splunk_otel_collector
22
# Recipe:: fluentd_deb_repo
33

4-
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.')[0]
4+
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.').first
55
codename = node['lsb']['codename']
66
distro = node['platform']
77

deployments/chef/recipes/fluentd_linux_install.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
options '--allow-downgrades' if platform_family?('debian') \
99
&& node['packages'] \
1010
&& node['packages']['apt'] \
11-
&& Gem::Version.new(node['packages']['apt']['version'].split('~')[0]) >= Gem::Version.new('1.1.0')
11+
&& Gem::Version.new(node['packages']['apt']['version'].split('~').first) >= Gem::Version.new('1.1.0')
1212

1313
allow_downgrade true if platform_family?('rhel', 'amazon')
1414
notifies :restart, 'service[td-agent]', :delayed
@@ -64,7 +64,7 @@
6464
end
6565

6666
remote_file node['splunk_otel_collector']['fluentd_config_dest'] do
67-
source "#{node['splunk_otel_collector']['fluentd_config_source']}"
67+
source node['splunk_otel_collector']['fluentd_config_source'].to_s
6868
owner 'td-agent'
6969
group 'td-agent'
7070
mode '0644'

deployments/chef/recipes/fluentd_win_install.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cookbook:: splunk_otel_collector
22
# Recipe:: fluentd_win_install
33

4-
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.')[0]
4+
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.').first
55

66
remote_file "#{ENV['TEMP']}\\td-agent-#{node['splunk_otel_collector']['fluentd_version']}-x64.msi" do
77
source "#{node['splunk_otel_collector']['fluentd_base_url']}/#{td_agent_major_version}/windows/td-agent-#{node['splunk_otel_collector']['fluentd_version']}-x64.msi"
@@ -30,7 +30,7 @@
3030
end
3131

3232
remote_file node['splunk_otel_collector']['fluentd_config_dest'] do
33-
source "#{node['splunk_otel_collector']['fluentd_config_source']}"
33+
source node['splunk_otel_collector']['fluentd_config_source'].to_s
3434
notifies :restart, 'windows_service[td-agent]', :delayed
3535
end
3636

deployments/chef/recipes/fluentd_yum_repo.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cookbook:: splunk_otel_collector
22
# Recipe:: collector_yum_repo
33

4-
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.')[0]
4+
td_agent_major_version = node['splunk_otel_collector']['fluentd_version'].split('.').first
55

66
distro = if platform_family?('amazon')
77
'amazon'

0 commit comments

Comments
 (0)