Skip to content

Commit

Permalink
Cleanup uses of FB031
Browse files Browse the repository at this point in the history
Summary:

This has been migrated off foodcritic to rubocop

Differential Revision: D47346023

fbshipit-source-id: 8485a3a3d002311f4dd379ac0b01d2b545c2e9cf
  • Loading branch information
Olivier Raginel authored and facebook-github-bot committed Jul 10, 2023
1 parent 7cbfb03 commit 4e7e6e1
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion cookbooks/fb_choco/resources/fb_choco_bootstrap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def run_bootstrap_script
node['fb_choco']['bootstrap']['use_windows_compression'].to_s,
}

cookbook_file 'chocolatey_install script' do # ~FB031
cookbook_file 'chocolatey_install script' do
path choco_install_ps1
source 'choco_install/install.ps1'
owner 'Administrators'
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/fb_chrony/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
mode '0750'
end

template 'chrony.conf' do # ~FB031
template 'chrony.conf' do
path chrony_conf
source 'chrony.conf.erb'
owner 'root'
Expand Down
6 changes: 3 additions & 3 deletions cookbooks/fb_fluentbit/recipes/fluent-bit_default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
include_recipe 'fb_fluentbit::fluent-bit_rhel' if node.rhel_family?
include_recipe 'fb_fluentbit::fluent-bit_windows' if node.windows?

template 'plugins config' do # ~FB031
template 'plugins config' do
action :create
source 'plugins.conf.erb'
path plugins_file_path
Expand All @@ -89,7 +89,7 @@
end
end

template 'parsers config' do # ~FB031
template 'parsers config' do
action :create
source 'parsers.conf.erb'
path parsers_file_path
Expand Down Expand Up @@ -120,7 +120,7 @@
end
end

template 'local config' do # ~FB031
template 'local config' do
not_if { node['fb_fluentbit']['external_config_url'] }
action :create
source 'conf.erb'
Expand Down
6 changes: 3 additions & 3 deletions cookbooks/fb_fluentbit/recipes/td-agent-bit_default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
include_recipe 'fb_fluentbit::td-agent-bit_rhel' if node.rhel_family?
include_recipe 'fb_fluentbit::td-agent-bit_windows' if node.windows?

template 'plugins config' do # ~FB031
template 'plugins config' do
action :create
source 'plugins.conf.erb'
path plugins_file_path
Expand All @@ -89,7 +89,7 @@
end
end

template 'parsers config' do # ~FB031
template 'parsers config' do
action :create
source 'parsers.conf.erb'
path parsers_file_path
Expand Down Expand Up @@ -120,7 +120,7 @@
end
end

template 'local config' do # ~FB031
template 'local config' do
not_if { node['fb_fluentbit']['external_config_url'] }
action :create
source 'conf.erb'
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/fb_grub/recipes/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
mode '0755'
end

template 'grub_config' do # ~FB031
template 'grub_config' do
only_if do
node['platform_family'] == 'rhel' && node['fb_grub']['kernels'] &&
node['fb_grub']['version'] == 1
Expand Down Expand Up @@ -82,7 +82,7 @@
# to x86_64.
efi_command = type == 'efi' && node.x64?

template "grub2_config_#{type}" do # ~FB031
template "grub2_config_#{type}" do
only_if do
(node['fb_grub']['kernels'] && node['fb_grub']['version'] == 2) &&
(our_type || node['fb_grub']['force_both_efi_and_bios'])
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/fb_kernel/resources/bls_entries.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
bls_entry =
::File.join(bls_root, "#{node['machine_id']}-#{data['version']}.conf")

template bls_entry do # ~FB031
template bls_entry do
source 'bls-entry.conf.erb'
owner 'root'
group 'root'
Expand Down
6 changes: 3 additions & 3 deletions cookbooks/fb_networkd/resources/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
)

# Set up the template for this interface
fb_helpers_gated_template conffile do # ~FB031
fb_helpers_gated_template conffile do
allow_changes node.interface_change_allowed?(conf['name'])
source 'networkd.conf.erb'
owner node.root_user
Expand Down Expand Up @@ -180,7 +180,7 @@
)

# Set up the template for this interface
fb_helpers_gated_template conffile do # ~FB031
fb_helpers_gated_template conffile do
allow_changes node.interface_change_allowed?(conf['name'])
source 'networkd.conf.erb'
owner node.root_user
Expand Down Expand Up @@ -263,7 +263,7 @@
)

# Set up the template for this interface
fb_helpers_gated_template conffile do # ~FB031
fb_helpers_gated_template conffile do
allow_changes node.interface_change_allowed?(conf['name'])
source 'networkd.conf.erb'
owner node.root_user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
install_paths = install_pwsh_path_list(node)
install_paths.each do |install_path|
path = ::File.join(install_path, 'powershell.config.json')
template path do # ~FB031
template path do
only_if { node['fb_powershell']['manage_config'] }
source 'powershell.config.json.erb'
if platform?('windows')
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/fb_stunnel/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
end
end

template sysconfig do # ~FB031
template sysconfig do
source 'sysconfig.erb'
owner 'root'
group 'root'
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/fb_yum_repos/resources/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
group
end

template ::File.join(YUM_REPOS_D, "#{group}.repo") do # ~FB031
template ::File.join(YUM_REPOS_D, "#{group}.repo") do
source 'yum.repo.erb'
owner 'root'
group 'root'
Expand Down

0 comments on commit 4e7e6e1

Please sign in to comment.